Changeset 1239 in 3DVCSoftware for branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibEncoder

Timestamp:

31 May 2015, 20:35:03 (10 years ago)

Author:

rwth

Message:

• enabled SDC encoder speedup
• fixed some compiler warnings

File:

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

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

@@ -3143 +3143 @@
 
 #if NH_3D_DMM
+    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( 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()) )
@@ -3229 +3228 @@
     DEBUG_STRING_NEW(sPU)
     UInt       uiBestPUMode  = 0;
-#if H_3D_FAST_INTRA_SDC
+#if NH_3D_ENC_DEPTH
     UInt    uiBestPUModeConv  = 0;
     UInt    uiSecondBestPUModeConv  = 0;
@@ -3242 +3241 @@
     Double     dBestPUCost   = MAX_DOUBLE;
 
-#if H_3D_FAST_INTRA_SDC
+#if NH_3D_ENC_DEPTH
     Double  dBestPUCostConv   = MAX_DOUBLE;
-    UInt varCU      = m_pcRdCost->calcVAR(piOrg, uiStride, uiWidth,uiHeight,pcCU->getDepth(0));
+    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
@@ -3251 +3250 @@
     Pel     apBestDCOffsets[2] = {0,0};
 #endif
-#if H_3D_FAST_INTRA_SDC
+#if NH_3D_ENC_DEPTH
     for( UInt uiMode = 0; uiMode < numModesForFullRD + rdSDC; uiMode++ )
 #else
@@ -3269 +3268 @@
     {
       // set luma prediction mode
-#if !H_3D_FAST_INTRA_SDC
+#if !NH_3D_ENC_DEPTH
       UInt uiOrgMode = uiRdModeList[uiMode];
 #endif
 
-#if H_3D_FAST_INTRA_SDC
+#if NH_3D_ENC_DEPTH
       UInt uiOrgMode;
       if (uiMode < numModesForFullRD)
@@ -3299 +3298 @@
 
 #if NH_3D_SDC_INTRA
-#if H_3D_FAST_INTRA_SDC
+#if NH_3D_ENC_DEPTH
       Bool bTestSDC = ( ( m_pcEncCfg->getUseSDC() &&  pcCU->getSlice()->getIntraSdcWedgeFlag() ) && pcCU->getSDCAvailable(uiPartOffset) && uiMode >= numModesForFullRD);
 #else
@@ -3307 +3306 @@
       for( UInt uiSDC=0; uiSDC<=(bTestSDC?1:0); uiSDC++ )
       {
-#if H_3D_FAST_INTRA_SDC
+#if NH_3D_ENC_DEPTH
         if (!uiSDC && uiMode >= numModesForFullRD) continue;
 #endif
@@ -3392 +3391 @@
 #if NH_3D_ENC_DEPTH
       xRecurIntraCodingLumaQT( pcOrgYuv, pcPredYuv, pcResiYuv, resiLumaPU, uiPUDistY, true, dPUCost, tuRecurseWithPU DEBUG_STRING_PASS_INTO(sMode), (zeroResi != 0) );
-#if H_3D_FAST_INTRA_SDC    
+#if NH_3D_ENC_DEPTH
               if( dPUCost < dBestPUCostConv )
               {
@@ -3624 +3623 @@
     if( !tuRecurseWithPU.IsLastSection() )
     {
-      const TComRectangle &puRect=tuRecurseWithPU.getRect(COMPONENT_Y);
+      //const TComRectangle &puRect=tuRecurseWithPU.getRect(COMPONENT_Y);
       const UInt  uiCompWidth   = puRect.width;
       const UInt  uiCompHeight  = puRect.height;