Changeset 614 in 3DVCSoftware for branches/HTM-8.0-dev0/source/Lib

Timestamp:

3 Sep 2013, 19:54:21 (11 years ago)

Author:

hhi

Message:

SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX: Fix for SCU_HS_FAST_DEPTH_INTRA_E0238, replacing "0" by "PLANAR_IDX".

Location:

branches/HTM-8.0-dev0/source/Lib

Files:

• TLibCommon/TComRdCost.cpp (modified) (1 diff)
• TLibCommon/TComRdCost.h (modified) (1 diff)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/TEncSearch.cpp (modified) (3 diffs)

branches/HTM-8.0-dev0/source/Lib/TLibCommon/TComRdCost.cpp

@@ -484 +484 @@
 }
 
-#if SCU_HS_FAST_DEPTH_INTRA_E0238
+#if SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX
 
 UInt TComRdCost::calcVAR (Pel* pi0, Int stride, Int width, Int height, Int cuDepth)

branches/HTM-8.0-dev0/source/Lib/TLibCommon/TComRdCost.h

@@ -235 +235 @@
   UInt    calcHAD(Int bitDepth, Pel* pi0, Int iStride0, Pel* pi1, Int iStride1, Int iWidth, Int iHeight );
   
-#if SCU_HS_FAST_DEPTH_INTRA_E0238
+#if SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX
   UInt    calcVAR(Pel* pi0, Int stride, Int width, Int height, Int cuDepth);
 #endif  

branches/HTM-8.0-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -184 +184 @@
 #define KWU_SDC_SIMPLE_DC_E0117           1   // Simplified DC calculation for SDC
 #define SCU_HS_DMM4_REMOVE_DIV_E0242      1   // DMM4 Division Removal
-#define SCU_HS_FAST_DEPTH_INTRA_E0238     1   // Fast DMM and RBC Mode Selection
+#define SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX     1   // Fast DMM and RBC Mode Selection
 #endif
 

branches/HTM-8.0-dev0/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -2851 +2851 @@
     {
 
-#if SCU_HS_FAST_DEPTH_INTRA_E0238
+#if SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX
       Int  threshold    = max(((pcCU->getQP(0))>>3)-1,3);
       Int  varThreshold = (Int)( threshold * threshold - 8 );
@@ -2857 +2857 @@
 #endif
 
-
 #if H_3D_DIM_DMM
       if( m_pcEncCfg->getUseDMM()
-#if SCU_HS_FAST_DEPTH_INTRA_E0238
-         && (uiRdModeList[0] != 0 || varCU >= varThreshold)
+#if SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX
+         && (uiRdModeList[0] != PLANAR_IDX || varCU >= varThreshold)
 #endif
         )
@@ -2942 +2941 @@
 #if H_3D_DIM_RBC
       if( m_pcEncCfg->getUseRBC()
-#if SCU_HS_FAST_DEPTH_INTRA_E0238
-          && (uiRdModeList[0] != 0 || varCU >= varThreshold)
+#if SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX
+          && (uiRdModeList[0] != PLANAR_IDX || varCU >= varThreshold)
 #endif
         )