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

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

Files:

• TEncCu.cpp (modified) (2 diffs)
• TEncSearch.cpp (modified) (1 diff)

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

@@ -2383 +2383 @@
     pDBBPTmpData->auhMergeIndex[uiSegment] = rpcTempCU->getMergeIndex(0);
     
-#if RWTH_H0057_DBBP_NO_SPU
+#if RWTH_DBBP_NO_SPU_H0057
     AOF( rpcTempCU->getSPIVMPFlag(0) == false );
     AOF( rpcTempCU->getVSPFlag(0) == 0 );
@@ -2421 +2421 @@
     rpcTempCU->setMergeIndexSubParts(pDBBPTmpData->auhMergeIndex[uiSegment], uiPartAddr, uiSegment, uhDepth);
     
-#if !RWTH_H0057_DBBP_NO_SPU
+#if !RWTH_DBBP_NO_SPU_H0057
     rpcTempCU->setVSPFlagSubParts(pDBBPTmpData->ahVSPFlag[uiSegment], uiPartAddr, uiSegment, uhDepth);
     rpcTempCU->setDvInfoSubParts(pDBBPTmpData->acDvInfo[uiSegment], uiPartAddr, uiSegment, uhDepth);

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

@@ -3666 +3666 @@
       pcCU->setInterDirSubParts(pDBBPTmpData->auhInterDir[0], 0, 0, pcCU->getDepth(0)); // interprets depth relative to LCU level
       
-#if !RWTH_H0057_DBBP_NO_SPU
+#if !RWTH_DBBP_NO_SPU_H0057
       pcCU->setVSPFlagSubParts(pDBBPTmpData->ahVSPFlag[0], 0, 0, pcCU->getDepth(0));
       pcCU->setDvInfoSubParts(pDBBPTmpData->acDvInfo[0], 0, 0, pcCU->getDepth(0));