Changeset 582 in 3DVCSoftware for branches/HTM-DEV-2.0-dev3-SCU-Hisilicon/source/Lib/TLibEncoder

Timestamp:

17 Aug 2013, 01:38:28 (11 years ago)

Author:

hisilicon-htm

Message:

JCT3V-E0242:On DMM simplification
JCT3V-E0283:Fast Intra Prediction Mode Selection for Intra Depth Map Coding

File:

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

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

@@ -2836 +2836 @@
 #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,pcCU->getDepth(0));
-#endif
+Int varThreshold = (Int)(threshold*threshold - 8);
+UInt uiVarCU=m_pcRdCost->calcVAR(piOrg, uiWidth,uiHeight,pcCU->getDepth(0));
+#endif
+
 
 #if H_3D_DIM_DMM
-       if( m_pcEncCfg->getUseDMM()
+      if( m_pcEncCfg->getUseDMM()
 #if SCU_HS_FAST_DEPTH_INTRA_E0238
-        && (uiRdModeList[0] != 0 || uiVarCU >= varThreshold)
-#endif
-         )
-       {
+         && (uiRdModeList[0] != 0 || uiVarCU >= varThreshold)
+#endif
+        )
+      {
         for( UInt dmmType = 0; dmmType < DMM_NUM_TYPE; dmmType++ )
         {
@@ -2919 +2920 @@
 #endif
 #if H_3D_DIM_RBC
-       if( m_pcEncCfg->getUseRBC()
+      if( m_pcEncCfg->getUseRBC()
 #if SCU_HS_FAST_DEPTH_INTRA_E0238
           && (uiRdModeList[0] != 0 || uiVarCU >= varThreshold)
 #endif
-         )
-       {
+        )
+      {
         if( xSearchRbcEdge( pcCU, uiPartOffset, piOrg, uiStride, uiWidth, uiHeight ) )
         {