Changeset 350 in 3DVCSoftware

Timestamp:

2 May 2013, 02:33:41 (11 years ago)

Author:

lg

Message:

JCT3V-D0163: fix for SDC encoder rd-cost (VSO -> WVSO) with Macro FIX_SDC_ENC_RD_WVSO_D0163

Location:

branches/HTM-6.2-dev3-LG/source/Lib

Files:

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

branches/HTM-6.2-dev3-LG/source/Lib/TLibCommon/TypeDef.h

@@ -71 +71 @@
 #define HHI_DELTADC_DLT_D0035             1   // JCT3V-D0035: DLT for DMM deltaDC coding
 #endif
+#define FIX_SDC_ENC_RD_WVSO_D0163         1   // JCT3V-D0163: fix for SDC encoder rd-cost (VSO -> WVSO)
 
 ///// ***** TMVP/AMVP *********

branches/HTM-6.2-dev3-LG/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -1735 +1735 @@
   if ( m_pcRdCost->getUseVSO() )
   {
+#if FIX_SDC_ENC_RD_WVSO_D0163 && LGE_WVSO_A0119
+    if ( m_pcRdCost->getUseWVSO() )
+    {    
+      Int iDWeight = m_pcRdCost->getDWeight() * m_pcRdCost->getDWeight();
+      Int iVSOWeight = m_pcRdCost->getVSOWeight() * m_pcRdCost->getVSOWeight();
+      Dist iD = (Dist) m_pcRdCost->getDistPart( piReco, uiStride, piOrg, uiStride, uiWidth, uiHeight );
+      Dist iVSO = m_pcRdCost->getDistVS  ( pcCU, uiAbsPartIdx, piReco, uiStride, piOrg, uiStride, uiWidth, uiHeight, false, 0 );
+      ruiDist += (iDWeight * iD + iVSOWeight * iVSO) / ( iDWeight + iVSOWeight);
+    }
+    else
+#endif
     ruiDist = m_pcRdCost->getDistVS  ( pcCU, uiAbsPartIdx, piReco, uiStride, piOrg, uiStride, uiWidth, uiHeight, false, 0 );
   }