Changeset 583 in 3DVCSoftware for branches/HTM-DEV-2.0-dev3-SCU-Hisilicon/source/Lib/TLibEncoder/TEncSearch.cpp

Timestamp:

17 Aug 2013, 15:12:24 (11 years ago)

Author:

tech

Message:

Clean ups related to SCU_HS_FAST_DEPTH_INTRA_E0238

File:

• branches/HTM-DEV-2.0-dev3-SCU-Hisilicon/source/Lib/TLibEncoder/TEncSearch.cpp (modified) (3 diffs)

branches/HTM-DEV-2.0-dev3-SCU-Hisilicon/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -2835 +2835 @@
 
 #if SCU_HS_FAST_DEPTH_INTRA_E0238
-Int threshold = max(((pcCU->getQP(0))>>3)-1,3);
-Int varThreshold = (Int)(threshold*threshold - 8);
-UInt uiVarCU=m_pcRdCost->calcVAR(piOrg, uiWidth,uiHeight,pcCU->getDepth(0));
+      Int  threshold    = max(((pcCU->getQP(0))>>3)-1,3);
+      Int  varThreshold = (Int)( threshold * threshold - 8 );
+      UInt varCU      = m_pcRdCost->calcVAR(piOrg, uiStride, uiWidth,uiHeight,pcCU->getDepth(0));
 #endif
 
@@ -2844 +2844 @@
       if( m_pcEncCfg->getUseDMM()
 #if SCU_HS_FAST_DEPTH_INTRA_E0238
-         && (uiRdModeList[0] != 0 || uiVarCU >= varThreshold)
+         && (uiRdModeList[0] != 0 || varCU >= varThreshold)
 #endif
         )
@@ -2922 +2922 @@
       if( m_pcEncCfg->getUseRBC()
 #if SCU_HS_FAST_DEPTH_INTRA_E0238
-          && (uiRdModeList[0] != 0 || uiVarCU >= varThreshold)
+          && (uiRdModeList[0] != 0 || varCU >= varThreshold)
 #endif
         )