Changeset 1308 in 3DVCSoftware for branches

Timestamp:

5 Aug 2015, 14:22:13 (9 years ago)

Author:

tech

Message:

Fix to RD decisions for Intra SDC.

Location:

branches/HTM-14.1-update-dev1/source/Lib

Files:

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

branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TypeDef.h

@@ -66 +66 @@
 /////////////////////////////////////////////////////////////////////////////////////////
 #if NH_MV
+#define NH_3D_INTRA_SDC_RD_FIX            1 // Fix in RD- decsion of intra sdc.
 #define NH_3D_DLT_FIX                     1 // Fixes numbers of parsed DLTs 
 #define NH_3D_VER141_DEC_COMP_FLAG        0 // Makes decoding of this version compatible to HTM-14.1 by re-introducing HTM-14.1 bugs.

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

@@ -2205 +2205 @@
 
   //===== determine distortion =====  
-#if NH_3D_VSO
+#if NH_3D_INTRA_SDC_RD_FIX
+#if NH_3D_VSO  
   if( m_pcRdCost->getUseVSO() )
   {
+    ruiDist = m_pcRdCost->getDistPartVSO( pcCU, uiAbsPartIdx, bitDepthY, piPred, uiStride, piOrg, uiStride, uiWidth, uiHeight, false );
+  }
+  else
+#endif
+#else
+#if NH_3D_VSO  
+  if( m_pcRdCost->getUseVSO() )
+  {
     if( m_pcRdCost->getUseEstimatedVSD() )
     {
@@ -2218 +2227 @@
   }
   else
+#endif
 #endif
   {