Changeset 898 in 3DVCSoftware for branches/HTM-10.2-dev2-RWTH


Ignore:
Timestamp:
8 Apr 2014, 10:51:56 (11 years ago)
Author:
rwth
Message:
  • renamed macros
  • all changes are now encapsulated by guard macros
  • H0057 on and H0072 off
Location:
branches/HTM-10.2-dev2-RWTH/source/Lib
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-10.2-dev2-RWTH/source/Lib/TLibCommon/TComDataCU.cpp

    r895 r898  
    39403940      && !bARPFlag
    39413941#endif
    3942 #if RWTH_H0057_DBBP_NO_SPU
     3942#if RWTH_DBBP_NO_SPU_H0057
    39433943      && !bDBBPFlag
    39443944#endif
    … …  
    39663966      && !bARPFlag
    39673967#endif
    3968 #if RWTH_H0057_DBBP_NO_SPU
     3968#if RWTH_DBBP_NO_SPU_H0057
    39693969      && !bDBBPFlag
    39703970#endif
    … …  
    39923992      && !bARPFlag
    39933993#endif
    3994 #if RWTH_H0057_DBBP_NO_SPU
     3994#if RWTH_DBBP_NO_SPU_H0057
    39953995      && !bDBBPFlag
    39963996#endif
    … …  
    40164016      && !bARPFlag
    40174017#endif
    4018 #if RWTH_H0057_DBBP_NO_SPU
     4018#if RWTH_DBBP_NO_SPU_H0057
    40194019      && !bDBBPFlag
    40204020#endif
    … …  
    40424042      && !bARPFlag
    40434043#endif
    4044 #if RWTH_H0057_DBBP_NO_SPU
     4044#if RWTH_DBBP_NO_SPU_H0057
    40454045      && !bDBBPFlag
    40464046#endif
    … …  
    47054705      !bARPFlag &&
    47064706#endif
    4707 #if RWTH_H0057_DBBP_NO_SPU
     4707#if RWTH_DBBP_NO_SPU_H0057
    47084708      !bDBBPFlag &&
    47094709#endif

  • branches/HTM-10.2-dev2-RWTH/source/Lib/TLibCommon/TComDataCU.h

    r895 r898  
    7070  Bool        abMergeFlag[2];       // for two segments
    7171  UChar       auhMergeIndex[2];     // for two segments
    72 #if !RWTH_H0057_DBBP_NO_SPU
     72#if !RWTH_DBBP_NO_SPU_H0057
    7373  Char        ahVSPFlag[2];         // for two segments
    7474  DisInfo     acDvInfo[2];          // for two segments

  • branches/HTM-10.2-dev2-RWTH/source/Lib/TLibCommon/TComPrediction.cpp

    r895 r898  
    639639 
    640640  // start mapping process
    641 #if !MTK_H0072_DBBP_AMP_REM
     641#if !MTK_DBBP_AMP_REM_H0072
    642642  Bool bAMPAvail = uiSize > 8;
    643643  Int matchedPartSum[6][2] = {{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}}; // counter for each part size and boolean option
    … …  
    649649 
    650650  UInt uiHalfSize = uiSize>>1;
    651 #if !MTK_H0072_DBBP_AMP_REM
     651#if !MTK_DBBP_AMP_REM_H0072
    652652  UInt uiQuarterSize = uiSize>>2;
    653653#endif
    … …  
    684684      }
    685685     
    686 #if !MTK_H0072_DBBP_AMP_REM
     686#if !MTK_DBBP_AMP_REM_H0072
    687687      if( bAMPAvail )
    688688      {
    … …  
    737737 
    738738  Int iMaxMatchSum = 0;
    739 #if !MTK_H0072_DBBP_AMP_REM
     739#if !MTK_DBBP_AMP_REM_H0072
    740740  for(Int p=0; p<6; p++)  // loop over partition
    741741#else

  • branches/HTM-10.2-dev2-RWTH/source/Lib/TLibCommon/TypeDef.h

    r895 r898  
    295295#define DBBP_INVALID_SHORT                (-4)
    296296#define RWTH_DBBP_PACK_MODE               SIZE_2NxN
    297 #define MTK_H0072_DBBP_AMP_REM                 1
    298 #define RWTH_H0057_DBBP_NO_SPU                 1
     297#define MTK_DBBP_AMP_REM_H0072                 0
     298#define RWTH_DBBP_NO_SPU_H0057                 1
    299299#endif
    300300

  • branches/HTM-10.2-dev2-RWTH/source/Lib/TLibDecoder/TDecCu.cpp

    r895 r898  
    782782    }
    783783   
     784#if RWTH_DBBP_NO_SPU_H0057
    784785    AOF( pcCU->getARPW(uiPartAddr) == 0 );
    785786    AOF( pcCU->getICFlag(uiPartAddr) == false );
    786    
    787 #if RWTH_H0057_DBBP_NO_SPU
    788787    AOF( pcCU->getSPIVMPFlag(uiPartAddr) == false );
    789788    AOF( pcCU->getVSPFlag(uiPartAddr) == 0 );
    … …  
    801800    pcCU->setInterDirSubParts( pDBBPTmpData->auhInterDir[uiSegment], 0, 0, uiDepth );
    802801   
    803 #if !RWTH_H0057_DBBP_NO_SPU
     802#if !RWTH_DBBP_NO_SPU_H0057
    804803    pcCU->setVSPFlagSubParts( pDBBPTmpData->ahVSPFlag[uiSegment], 0, 0, uiDepth );
    805804    pcCU->setDvInfoSubParts( pDBBPTmpData->acDvInfo[uiSegment], 0, 0, uiDepth );
    … …  
    826825    pcCU->setDBBPFlagSubParts(true, uiPartAddr, uiSegment, uiDepth);
    827826   
    828 #if !RWTH_H0057_DBBP_NO_SPU
     827#if !RWTH_DBBP_NO_SPU_H0057
    829828    pcCU->setVSPFlagSubParts( pDBBPTmpData->ahVSPFlag[uiSegment], uiPartAddr, uiSegment, uiDepth );
    830829    pcCU->setDvInfoSubParts( pDBBPTmpData->acDvInfo[uiSegment], uiPartAddr, uiSegment, uiDepth );

  • branches/HTM-10.2-dev2-RWTH/source/Lib/TLibDecoder/TDecEntropy.cpp

    r895 r898  
    162162      pcCU->setPartSizeSubParts(eVirtualPartSize, uiAbsPartIdx, uiDepth);
    163163     
    164 #if RWTH_H0057_DBBP_NO_SPU
     164#if RWTH_DBBP_NO_SPU_H0057
    165165      // make sure that DBBP flag is set for both segments
    166166      UInt uiPUOffset = ( g_auiPUOffset[UInt( eVirtualPartSize )] << ( ( pcCU->getSlice()->getSPS()->getMaxCUDepth() - uiDepth ) << 1 ) ) >> 4;

  • branches/HTM-10.2-dev2-RWTH/source/Lib/TLibEncoder/TEncCu.cpp

    r895 r898  
    23832383    pDBBPTmpData->auhMergeIndex[uiSegment] = rpcTempCU->getMergeIndex(0);
    23842384   
    2385 #if RWTH_H0057_DBBP_NO_SPU
     2385#if RWTH_DBBP_NO_SPU_H0057
    23862386    AOF( rpcTempCU->getSPIVMPFlag(0) == false );
    23872387    AOF( rpcTempCU->getVSPFlag(0) == 0 );
    … …  
    24212421    rpcTempCU->setMergeIndexSubParts(pDBBPTmpData->auhMergeIndex[uiSegment], uiPartAddr, uiSegment, uhDepth);
    24222422   
    2423 #if !RWTH_H0057_DBBP_NO_SPU
     2423#if !RWTH_DBBP_NO_SPU_H0057
    24242424    rpcTempCU->setVSPFlagSubParts(pDBBPTmpData->ahVSPFlag[uiSegment], uiPartAddr, uiSegment, uhDepth);
    24252425    rpcTempCU->setDvInfoSubParts(pDBBPTmpData->acDvInfo[uiSegment], uiPartAddr, uiSegment, uhDepth);

  • branches/HTM-10.2-dev2-RWTH/source/Lib/TLibEncoder/TEncSearch.cpp

    r895 r898  
    36663666      pcCU->setInterDirSubParts(pDBBPTmpData->auhInterDir[0], 0, 0, pcCU->getDepth(0)); // interprets depth relative to LCU level
    36673667     
    3668 #if !RWTH_H0057_DBBP_NO_SPU
     3668#if !RWTH_DBBP_NO_SPU_H0057
    36693669      pcCU->setVSPFlagSubParts(pDBBPTmpData->ahVSPFlag[0], 0, 0, pcCU->getDepth(0));
    36703670      pcCU->setDvInfoSubParts(pDBBPTmpData->acDvInfo[0], 0, 0, pcCU->getDepth(0));
Note: See TracChangeset for help on using the changeset viewer.