Changeset 133 in 3DVCSoftware for branches/HTM-4.0-dev0/source/Lib/TLibEncoder

Timestamp:

13 Sep 2012, 13:55:57 (12 years ago)

Author:

tech

Message:

Added RD-relevant bug fixes from HTM-4.1:

• FIX_RESTRICTEDRESPRED_M24766
• FIX_RDO_MACRO
• FIX_DBL_CONTROL_DEFAULT + config files

File:

• branches/HTM-4.0-dev0/source/Lib/TLibEncoder/TEncSearch.cpp (modified) (2 diffs)

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

@@ -6113 +6113 @@
         
         Dist uiActDist = RDO_DIST_MAX;
+#if FIX_RDO_MACRO
 #if SAIT_VSO_EST_A0033
         if ( m_pcRdCost->getUseEstimatedVSD() )
@@ -6121 +6122 @@
         }
         else       
-#else
+#endif // SAIT_VSO_EST_A0033
         {        
           uiActDist = m_pcRdCost->getDistVS( pcCU, 0, piPredic, uiStride,  piOrig, uiStride, uiWidth, uiHeight, false, 0 );
         }
-#endif
+#else // FIX_RDO_MACRO
+#if SAIT_VSO_EST_A0033
+        if ( m_pcRdCost->getUseEstimatedVSD() )
+        {          
+          TComPicYuv* pcVirRec = m_pcRdCost->getVideoRecPicYuv();
+          TComPicYuv* pcVirOrg = m_pcRdCost->getDepthPicYuv();
+          uiActDist = m_pcRdCost->getDistPart( piPredic, uiStride, piOrig, uiStride, pcVirRec->getLumaAddr(pcCU->getAddr(),pcCU->getZorderIdxInCU()), pcVirOrg->getLumaAddr(pcCU->getAddr(),pcCU->getZorderIdxInCU()), pcVirRec->getStride(), uiWidth, uiHeight );
+        }
+        else       
+#else  // SAIT_VSO_EST_A0033 <-- wrong #else statement should be #endif
+        {        
+          uiActDist = m_pcRdCost->getDistVS( pcCU, 0, piPredic, uiStride,  piOrig, uiStride, uiWidth, uiHeight, false, 0 );
+        }
+#endif // SAIT_VSO_EST_A0033 <-- wrong #endif should be removed
+#endif // FIX_RDO_MACRO
 
         if( uiActDist < uiBestDist || uiBestDist == RDO_DIST_MAX )