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

Timestamp:

13 May 2015, 15:16:14 (10 years ago)

Author:

hhi

Message:

Alignment and reactivation of DMM and depth encoder optimizations:

• new macro NH_3D_DMM for DMM functionality, including several clean-ups.
• new macro NH_3D_SDC for SDC functionality, currently only used for covering common SDC and DMM parts.
• new macro NH_3D_ENC_DEPTH for encoder optimizations related to depth.
• temporary macro TEMP_SDC_CLEANUP for covering several proposed cleanups related to SDC and DMM.

File:

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

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

@@ -733 +733 @@
     }
 #endif
-#if H_3D_DIM_ENC
+#if NH_3D_ENC_DEPTH
     if( rpcBestCU->getSlice()->getIsDepth() && rpcBestCU->getSlice()->isIRAP() )
     {
@@ -1075 +1075 @@
 
         if((rpcBestCU->getSlice()->getSliceType() == I_SLICE)                                     ||
-            ((!m_pcEncCfg->getDisableIntraPUsInInterSlices()) && (
+           ((!m_pcEncCfg->getDisableIntraPUsInInterSlices()) && ( // avoid very complex intra if it is unlikely
            (rpcBestCU->getCbf( 0, COMPONENT_Y  ) != 0)                                            ||
           ((rpcBestCU->getCbf( 0, COMPONENT_Cb ) != 0) && (numberValidComponents > COMPONENT_Cb)) ||
-          ((rpcBestCU->getCbf( 0, COMPONENT_Cr ) != 0) && (numberValidComponents > COMPONENT_Cr))) 
- // avoid very complex intra if it is unlikely
-#if H_3D_DIM_ENC
+          ((rpcBestCU->getCbf( 0, COMPONENT_Cr ) != 0) && (numberValidComponents > COMPONENT_Cr)) 
+ #if NH_3D_ENC_DEPTH
             || rpcBestCU->getSlice()->getIsDepth()
 #endif
-            ))
+            )))
         {
-#if H_3D_DIM
+#if NH_3D_ENC_DEPTH
             Bool bOnlyIVP = false;
             Bool bUseIVP = true;
-            if( rpcBestCU->getSlice()->getIsDepth() && !(rpcBestCU->getSlice()->isIRAP()) && 
-              rpcBestCU->getSlice()->getSliceType() != I_SLICE && 
-              rpcBestCU->getCbf( 0, TEXT_LUMA     ) == 0 &&
-              rpcBestCU->getCbf( 0, TEXT_CHROMA_U ) == 0 &&
-              rpcBestCU->getCbf( 0, TEXT_CHROMA_V ) == 0 
-              )
+            if( (rpcBestCU->getSlice()->getSliceType() != I_SLICE) && 
+                !( (rpcBestCU->getCbf( 0, COMPONENT_Y  ) != 0)                                            ||
+                  ((rpcBestCU->getCbf( 0, COMPONENT_Cb ) != 0) && (numberValidComponents > COMPONENT_Cb)) ||
+                  ((rpcBestCU->getCbf( 0, COMPONENT_Cr ) != 0) && (numberValidComponents > COMPONENT_Cr))   ) &&
+                  (rpcBestCU->getSlice()->getIsDepth() && !(rpcBestCU->getSlice()->isIRAP())) )
             { 
               bOnlyIVP = true;
@@ -1100 +1098 @@
             if( bUseIVP )
             {
-              xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N, bOnlyIVP );
+              xCheckRDCostIntra( rpcBestCU, rpcTempCU, intraCost, SIZE_2Nx2N DEBUG_STRING_PASS_INTO(sDebug), bOnlyIVP );
 #else
           xCheckRDCostIntra( rpcBestCU, rpcTempCU, intraCost, SIZE_2Nx2N DEBUG_STRING_PASS_INTO(sDebug) );
@@ -1122 +1120 @@
             {
               Double tmpIntraCost;
-#if H_3D_DIM
-              xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_NxN, bOnlyIVP );
+#if NH_3D_ENC_DEPTH
+              xCheckRDCostIntra( rpcBestCU, rpcTempCU, tmpIntraCost, SIZE_NxN DEBUG_STRING_PASS_INTO(sDebug), bOnlyIVP );
 #else
               xCheckRDCostIntra( rpcBestCU, rpcTempCU, tmpIntraCost, SIZE_NxN DEBUG_STRING_PASS_INTO(sDebug)   );
@@ -1135 +1133 @@
 #endif
           }
-#if H_3D
+#if NH_3D_ENC_DEPTH
           }
 #endif
@@ -2654 +2652 @@
 #endif
 
-#if H_3D_DIM
-Void TEncCu::xCheckRDCostIntra( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, PartSize eSize, Bool bOnlyIVP )
-#else
 Void TEncCu::xCheckRDCostIntra( TComDataCU *&rpcBestCU,
                                 TComDataCU *&rpcTempCU,
                                 Double      &cost,
                                 PartSize     eSize
-                                DEBUG_STRING_FN_DECLARE(sDebug) )
-#endif
+                                DEBUG_STRING_FN_DECLARE(sDebug)
+#if NH_3D_ENC_DEPTH
+                              , Bool bOnlyIVP
+#endif
+                              )
 {
   DEBUG_STRING_NEW(sTest)
@@ -2690 +2688 @@
   Pel resiLuma[NUMBER_OF_STORED_RESIDUAL_TYPES][MAX_CU_SIZE * MAX_CU_SIZE];
 
-  m_pcPredSearch->estIntraPredLumaQT( rpcTempCU, m_ppcOrigYuv[uiDepth], m_ppcPredYuvTemp[uiDepth], m_ppcResiYuvTemp[uiDepth], m_ppcRecoYuvTemp[uiDepth], resiLuma DEBUG_STRING_PASS_INTO(sTest) );
+  m_pcPredSearch->estIntraPredLumaQT( rpcTempCU, m_ppcOrigYuv[uiDepth], m_ppcPredYuvTemp[uiDepth], m_ppcResiYuvTemp[uiDepth], m_ppcRecoYuvTemp[uiDepth], resiLuma DEBUG_STRING_PASS_INTO(sTest) 
+#if NH_3D_ENC_DEPTH
+                                    , bOnlyIVP
+#endif
+                                    );
 
   m_ppcRecoYuvTemp[uiDepth]->copyToPicComponent(COMPONENT_Y, rpcTempCU->getPic()->getPicYuvRec(), rpcTempCU->getCtuRsAddr(), rpcTempCU->getZorderIdxInCtu() );
@@ -2696 +2698 @@
   if (rpcBestCU->getPic()->getChromaFormat()!=CHROMA_400)
   {
-#if H_3D_DIM
-    m_pcPredSearch->estIntraPredQT      ( rpcTempCU, m_ppcOrigYuv[uiDepth], m_ppcPredYuvTemp[uiDepth], m_ppcResiYuvTemp[uiDepth], m_ppcRecoYuvTemp[uiDepth], uiPreCalcDistC, bSeparateLumaChroma, bOnlyIVP );
-#else
     m_pcPredSearch->estIntraPredChromaQT( rpcTempCU, m_ppcOrigYuv[uiDepth], m_ppcPredYuvTemp[uiDepth], m_ppcResiYuvTemp[uiDepth], m_ppcRecoYuvTemp[uiDepth], resiLuma DEBUG_STRING_PASS_INTO(sTest) );
-#endif
   }
 #if H_3D_DIM_SDC