Changeset 1248 in 3DVCSoftware

Timestamp:

2 Jun 2015, 19:15:33 (9 years ago)

Author:

rwth

Message:

• bugfix

File:

• branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibEncoder/TEncSearch.cpp (modified) (3 diffs)

branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -2993 +2993 @@
 #endif
 
-#if NH_3D_DMM || NH_3D_ENC_DEPTH
-    const TComRectangle &puRect=tuRecurseWithPU.getRect(COMPONENT_Y);
-    const UInt uiAbsPartIdx=tuRecurseWithPU.GetAbsPartIdxTU();
-    
-    Pel* piOrg         = pcOrgYuv ->getAddr( COMPONENT_Y, uiAbsPartIdx );
-    UInt uiStride      = pcPredYuv->getStride( COMPONENT_Y );
-#endif
 #if NH_3D_DMM
-    Pel* piPred        = pcPredYuv->getAddr( COMPONENT_Y, uiAbsPartIdx );
     if( m_pcEncCfg->getIsDepth() )
     {
+      const TComRectangle &puRect=tuRecurseWithPU.getRect(COMPONENT_Y);
+      const UInt uiAbsPartIdx=tuRecurseWithPU.GetAbsPartIdxTU();
+
+      Pel* piOrg         = pcOrgYuv ->getAddr( COMPONENT_Y, uiAbsPartIdx );
+      Pel* piPred        = pcPredYuv->getAddr( COMPONENT_Y, uiAbsPartIdx );
+      UInt uiStride      = pcPredYuv->getStride( COMPONENT_Y );
+
       if( puRect.width >= DMM_MIN_SIZE && puRect.width <= DMM_MAX_SIZE &&  puRect.width == puRect.height &&
           ((m_pcEncCfg->getUseDMM() &&  pcCU->getSlice()->getIntraSdcWedgeFlag()) || pcCU->getSlice()->getIntraContourFlag()) )
@@ -3096 +3095 @@
 #if NH_3D_ENC_DEPTH
     Double  dBestPUCostConv   = MAX_DOUBLE;
-    UInt varCU      = m_pcRdCost->calcVAR(piOrg, uiStride, puRect.width, puRect.height, pcCU->getDepth(0), pcCU->getSlice()->getSPS()->getMaxCUWidth());
     UInt rdSDC = m_pcEncCfg->getIsDepth() ? numModesForFullRD : 0;
 #endif
@@ -3133 +3131 @@
       else
       {
+        const TComRectangle &puRect=tuRecurseWithPU.getRect(COMPONENT_Y);
+        const UInt uiAbsPartIdx=tuRecurseWithPU.GetAbsPartIdxTU();
+        
+        Pel* piOrg         = pcOrgYuv ->getAddr( COMPONENT_Y, uiAbsPartIdx );
+        UInt uiStride      = pcPredYuv->getStride( COMPONENT_Y );
+        
+        UInt varCU      = m_pcRdCost->calcVAR(piOrg, uiStride, puRect.width, puRect.height, pcCU->getDepth(0), pcCU->getSlice()->getSPS()->getMaxCUWidth());
+        
         uiOrgMode = uiRdModeList[uiMode - numModesForFullRD];