Changeset 881 in 3DVCSoftware for branches/HTM-10.1-dev0/source/Lib/TLibEncoder/TEncCu.cpp

Timestamp:

27 Mar 2014, 23:17:21 (10 years ago)

Author:

tech

Message:

Cleanups part 6.

File:

• branches/HTM-10.1-dev0/source/Lib/TLibEncoder/TEncCu.cpp (modified) (5 diffs)

branches/HTM-10.1-dev0/source/Lib/TLibEncoder/TEncCu.cpp

@@ -547 +547 @@
           bTryNx2N  = false;
           bTry2NxN  = false;
-#if MTK_TEX_DEP_PAR_G0055
           if( pcTextureCU->getDepth(uiCUIdx) == uiDepth && pcTextureCU->getPartitionSize(uiCUIdx) != SIZE_2Nx2N)
           {
@@ -555 +554 @@
               bTryNx2N  = true;
           }
-#endif
         }
       }
@@ -1831 +1829 @@
 #endif
 
-#if MTK_DDD_G0063
+#if H_3D_DDD
     Int iDDDCand = rpcTempCU->getUseDDDCandIdx(); 
     UChar ucDDDepth = rpcTempCU->getDDTmpDepth();
@@ -1870 +1868 @@
           rpcTempCU->setDvInfoSubParts(inheritedVSPDisInfo[uiMergeCand].m_acDvInfo, 0, 0, uhDepth );
 #endif
-#if MTK_DDD_G0063
+#if H_3D_DDD
           if( rpcTempCU->getSlice()->getIsDepth() && rpcTempCU->getSlice()->getViewIndex() != 0 && iDDDCand == uiMergeCand )
           {
@@ -2135 +2133 @@
   rpcTempCU->setPartSizeSubParts  ( ePartSize,  0, uhDepth );
   rpcTempCU->setPredModeSubParts  ( MODE_INTER, 0, uhDepth );
-#if MTK_DDD_G0063
+#if H_3D_DDD
   rpcTempCU->setUseDDD( false, 0, uhDepth );
 #endif