Changeset 1303 in 3DVCSoftware for branches/HTM-14.1-update-dev1-LG/source/Lib/TLibEncoder/TEncCu.cpp

Timestamp:

28 Jul 2015, 03:59:07 (9 years ago)

Author:

lg

Message:

Integration of inter SDC

File:

• branches/HTM-14.1-update-dev1-LG/source/Lib/TLibEncoder/TEncCu.cpp (modified) (8 diffs)

branches/HTM-14.1-update-dev1-LG/source/Lib/TLibEncoder/TEncCu.cpp

@@ -2094 +2094 @@
           }
 #endif
-#if H_3D_INTER_SDC
+#if NH_3D_SDC_INTER
           TComDataCU *rpcTempCUPre = rpcTempCU;
 #endif
@@ -2100 +2100 @@
           xCheckDQP( rpcTempCU );
           xCheckBestMode(rpcBestCU, rpcTempCU, uhDepth DEBUG_STRING_PASS_INTO(bestStr) DEBUG_STRING_PASS_INTO(tmpStr));
-#if H_3D_INTER_SDC
+#if NH_3D_SDC_INTER
           if( rpcTempCU->getSlice()->getInterSdcFlag() && !uiNoResidual )
           {
@@ -2131 +2131 @@
 #endif
               rpcTempCU->setTrIdxSubParts( 0, 0, uhDepth );
-              rpcTempCU->setCbfSubParts( 1, 1, 1, 0, uhDepth );
+              rpcTempCU->setCbfSubParts( 1, COMPONENT_Y, 0, uhDepth );
 #if NH_3D_VSO //M2
               if( m_pcRdCost->getUseRenModel() )
@@ -2173 +2173 @@
           if( m_pcEncCfg->getUseFastDecisionForMerge() && !bestIsSkip )
           {
-#if H_3D_INTER_SDC
+#if NH_3D_SDC_INTER
             if( rpcTempCU->getSlice()->getInterSdcFlag() )
             {
@@ -2182 +2182 @@
 #endif
             bestIsSkip = rpcBestCU->getQtRootCbf(0) == 0;
-#if H_3D_INTER_SDC
+#if NH_3D_SDC_INTER
             }
 #endif
@@ -2377 +2377 @@
   DebugInterPredResiReco(sTest, *(m_ppcPredYuvTemp[uhDepth]), *(m_ppcResiYuvBest[uhDepth]), *(m_ppcRecoYuvTemp[uhDepth]), DebugStringGetPredModeMask(rpcTempCU->getPredictionMode(0)));
 #endif
-#if H_3D_INTER_SDC
+#if NH_3D_SDC_INTER
       TComDataCU *rpcTempCUPre = rpcTempCU;
 #endif
@@ -2383 +2383 @@
   xCheckDQP( rpcTempCU );
   xCheckBestMode(rpcBestCU, rpcTempCU, uhDepth DEBUG_STRING_PASS_INTO(sDebug) DEBUG_STRING_PASS_INTO(sTest));
-#if H_3D_INTER_SDC
+#if NH_3D_SDC_INTER
       if( rpcTempCU->getSlice()->getInterSdcFlag() && ePartSize == SIZE_2Nx2N)
       {
@@ -2416 +2416 @@
 #endif
           rpcTempCU->setTrIdxSubParts( 0, 0, uhDepth );
-          rpcTempCU->setCbfSubParts( 1, 1, 1, 0, uhDepth );
+          rpcTempCU->setCbfSubParts( 1, COMPONENT_Y, 0, uhDepth );
 #if NH_3D_VSO // M3
           if( m_pcRdCost->getUseRenModel() )