Changeset 257 in 3DVCSoftware for branches/HTM-5.1-dev3-MERL/source/Lib/TLibEncoder

Timestamp:

5 Feb 2013, 02:08:48 (12 years ago)

Author:

mitsubishi-htm

Message:

-Harmonize the implementation of compensation function with existing ones.

Location:

branches/HTM-5.1-dev3-MERL/source/Lib/TLibEncoder

Files:

• TEncCu.cpp (modified) (3 diffs)
• TEncSearch.cpp (modified) (5 diffs)

branches/HTM-5.1-dev3-MERL/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] );

branches/HTM-5.1-dev3-MERL/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -2906 +2906 @@
   pcCU->getPartIndexAndSize( iPartIdx, uiAbsPartIdx, iWidth, iHeight );
 #if MERL_VSP_C0152
-  motionCompensationBWVSP( pcCU, &m_tmpYuvPred,  pcCU->getZorderIdxInCU(), REF_PIC_LIST_X, iPartIdx );
+  motionCompensation( pcCU, &m_tmpYuvPred,  pcCU->getZorderIdxInCU(), REF_PIC_LIST_X, iPartIdx );
 #endif
   DistParam cDistParam;
@@ -3414 +3414 @@
               {
                 TComYuv*  pcYuvPred = &m_acYuvPred[iRefList];
+#if MERL_VSP_C0152
+                motionCompensation ( pcCU, pcYuvPred, pcCU->getZorderIdxInCU(),  eRefPicList, iPartIdx );
+#else
                 motionCompensation ( pcCU, pcYuvPred, eRefPicList, iPartIdx );
+#endif
               }
               if ( (pcCU->getSlice()->getNoBackPredFlag() || (pcCU->getSlice()->getNumRefIdx(REF_PIC_LIST_C) > 0 && pcCU->getSlice()->getRefIdxOfL0FromRefIdxOfL1(0)==0 )) && eRefPicList == REF_PIC_LIST_0 )
               {
                 TComYuv*  pcYuvPred = &m_acYuvPred[iRefList];
+#if MERL_VSP_C0152
+                motionCompensation ( pcCU, pcYuvPred, pcCU->getZorderIdxInCU(),  eRefPicList, iPartIdx );
+#else
                 motionCompensation ( pcCU, pcYuvPred, eRefPicList, iPartIdx );
+#endif
               }
 #if H0111_MVD_L1_ZERO
@@ -3460 +3468 @@
         pcCU->getCUMvField( REF_PIC_LIST_1 )->setAllRefIdx( iRefIdxBi[1], ePartSize, uiPartAddr, 0, iPartIdx );
         TComYuv* pcYuvPred = &m_acYuvPred[1];
+#if MERL_VSP_C0152
+        motionCompensation( pcCU, pcYuvPred, pcCU->getZorderIdxInCU(),  REF_PIC_LIST_1, iPartIdx );
+#else
         motionCompensation( pcCU, pcYuvPred, REF_PIC_LIST_1, iPartIdx );
-
+#endif
         uiMotBits[0] = uiBits[0] - uiMbBits[0];
         uiMotBits[1] = uiMbBits[1];
@@ -3600 +3611 @@
 
               TComYuv* pcYuvPred = &m_acYuvPred[iRefList];
+#if MERL_VSP_C0152
+              motionCompensation( pcCU, pcYuvPred, pcCU->getZorderIdxInCU(),  REF_PIC_LIST_1, iPartIdx );
+#else
               motionCompensation( pcCU, pcYuvPred, eRefPicList, iPartIdx );
+#endif
 #if H0111_MVD_L1_ZERO
             }
@@ -3941 +3956 @@
     //  MC
 #if MERL_VSP_C0152
-    motionCompensationBWVSP ( pcCU, rpcPredYuv, pcCU->getZorderIdxInCU(), REF_PIC_LIST_X, iPartIdx);
+    motionCompensation ( pcCU, rpcPredYuv, pcCU->getZorderIdxInCU(), REF_PIC_LIST_X, iPartIdx);
 #else
     motionCompensation ( pcCU, rpcPredYuv, REF_PIC_LIST_X, iPartIdx );