Changeset 275 in 3DVCSoftware for branches/HTM-5.1-dev3-CleanUp/source/Lib/TLibEncoder/TEncCu.cpp

Timestamp:

14 Feb 2013, 11:45:40 (12 years ago)

Author:

tech

Message:

Cleanup of motionCompensation functions in C0152.

File:

• branches/HTM-5.1-dev3-CleanUp/source/Lib/TLibEncoder/TEncCu.cpp (modified) (3 diffs)

branches/HTM-5.1-dev3-CleanUp/source/Lib/TLibEncoder/TEncCu.cpp

@@ -1973 +1973 @@
         {
 #if MERL_VSP_C0152
-            m_pcPredSearch->motionCompensationBWVSP ( rpcTempCU, m_ppcPredYuvTemp[uhDepth],  rpcTempCU->getZorderIdxInCU() );
+            m_pcPredSearch->motionCompensation ( rpcTempCU, m_ppcPredYuvTemp[uhDepth],  rpcTempCU->getZorderIdxInCU() );
 #else
             m_pcPredSearch->motionCompensation ( rpcTempCU, m_ppcPredYuvTemp[uhDepth] );
@@ -1987 +1987 @@
             {
 #if MERL_VSP_C0152
-              m_pcPredSearch->motionCompensationBWVSP ( rpcTempCU, m_ppcPredYuvTemp[uhDepth], rpcTempCU->getZorderIdxInCU() );
+              m_pcPredSearch->motionCompensation( rpcTempCU, m_ppcPredYuvTemp[uhDepth], rpcTempCU->getZorderIdxInCU() );
 #else
               m_pcPredSearch->motionCompensation ( rpcTempCU, m_ppcPredYuvTemp[uhDepth] );
@@ -2824 +2824 @@
     rpcTempCU->setPredModeSubParts( bSkipResidual ? MODE_SKIP : MODE_INTER, 0, uhDepth );
 #if MERL_VSP_C0152
-    m_pcPredSearch->motionCompensationBWVSP( rpcTempCU, m_ppcPredYuvTemp[uhDepth], rpcTempCU->getZorderIdxInCU()  );
+    m_pcPredSearch->motionCompensation( rpcTempCU, m_ppcPredYuvTemp[uhDepth], rpcTempCU->getZorderIdxInCU()  );
 #else
     m_pcPredSearch->motionCompensation( rpcTempCU, m_ppcPredYuvTemp[uhDepth] );