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

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/TLibDecoder

Files:

• TDecCu.cpp (modified) (3 diffs)
• TDecEntropy.cpp (modified) (1 diff)

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

@@ -782 +782 @@
     }
     
+#if RWTH_DBBP_NO_SPU_H0057
     AOF( pcCU->getARPW(uiPartAddr) == 0 );
     AOF( pcCU->getICFlag(uiPartAddr) == false );
-    
-#if RWTH_H0057_DBBP_NO_SPU
     AOF( pcCU->getSPIVMPFlag(uiPartAddr) == false );
     AOF( pcCU->getVSPFlag(uiPartAddr) == 0 );
@@ -801 +800 @@
     pcCU->setInterDirSubParts( pDBBPTmpData->auhInterDir[uiSegment], 0, 0, uiDepth );
     
-#if !RWTH_H0057_DBBP_NO_SPU
+#if !RWTH_DBBP_NO_SPU_H0057
     pcCU->setVSPFlagSubParts( pDBBPTmpData->ahVSPFlag[uiSegment], 0, 0, uiDepth );
     pcCU->setDvInfoSubParts( pDBBPTmpData->acDvInfo[uiSegment], 0, 0, uiDepth );
@@ -826 +825 @@
     pcCU->setDBBPFlagSubParts(true, uiPartAddr, uiSegment, uiDepth);
     
-#if !RWTH_H0057_DBBP_NO_SPU
+#if !RWTH_DBBP_NO_SPU_H0057
     pcCU->setVSPFlagSubParts( pDBBPTmpData->ahVSPFlag[uiSegment], uiPartAddr, uiSegment, uiDepth );
     pcCU->setDvInfoSubParts( pDBBPTmpData->acDvInfo[uiSegment], uiPartAddr, uiSegment, uiDepth );

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

@@ -162 +162 @@
       pcCU->setPartSizeSubParts(eVirtualPartSize, uiAbsPartIdx, uiDepth);
       
-#if RWTH_H0057_DBBP_NO_SPU
+#if RWTH_DBBP_NO_SPU_H0057
       // make sure that DBBP flag is set for both segments
       UInt uiPUOffset = ( g_auiPUOffset[UInt( eVirtualPartSize )] << ( ( pcCU->getSlice()->getSPS()->getMaxCUDepth() - uiDepth ) << 1 ) ) >> 4;