Ignore:
Timestamp:
14 Feb 2013, 11:45:40 (11 years ago)
Author:
tech
Message:

Cleanup of motionCompensation functions in C0152.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-5.1-dev3-CleanUp/source/Lib/TLibEncoder/TEncSearch.cpp

    r231 r275  
    29062906  pcCU->getPartIndexAndSize( iPartIdx, uiAbsPartIdx, iWidth, iHeight );
    29072907#if MERL_VSP_C0152
    2908   motionCompensationBWVSP( pcCU, &m_tmpYuvPred,  pcCU->getZorderIdxInCU(), REF_PIC_LIST_X, iPartIdx );
     2908  motionCompensation( pcCU, &m_tmpYuvPred,  pcCU->getZorderIdxInCU(), REF_PIC_LIST_X, iPartIdx );
    29092909#endif
    29102910  DistParam cDistParam;
     
    34143414              {
    34153415                TComYuv*  pcYuvPred = &m_acYuvPred[iRefList];
     3416#if MERL_VSP_C0152
     3417                motionCompensation ( pcCU, pcYuvPred, pcCU->getZorderIdxInCU(),  eRefPicList, iPartIdx );
     3418#else
    34163419                motionCompensation ( pcCU, pcYuvPred, eRefPicList, iPartIdx );
     3420#endif
    34173421              }
    34183422              if ( (pcCU->getSlice()->getNoBackPredFlag() || (pcCU->getSlice()->getNumRefIdx(REF_PIC_LIST_C) > 0 && pcCU->getSlice()->getRefIdxOfL0FromRefIdxOfL1(0)==0 )) && eRefPicList == REF_PIC_LIST_0 )
    34193423              {
    34203424                TComYuv*  pcYuvPred = &m_acYuvPred[iRefList];
     3425#if MERL_VSP_C0152
     3426                motionCompensation ( pcCU, pcYuvPred, pcCU->getZorderIdxInCU(),  eRefPicList, iPartIdx );
     3427#else
    34213428                motionCompensation ( pcCU, pcYuvPred, eRefPicList, iPartIdx );
     3429#endif
    34223430              }
    34233431#if H0111_MVD_L1_ZERO
     
    34603468        pcCU->getCUMvField( REF_PIC_LIST_1 )->setAllRefIdx( iRefIdxBi[1], ePartSize, uiPartAddr, 0, iPartIdx );
    34613469        TComYuv* pcYuvPred = &m_acYuvPred[1];
     3470#if MERL_VSP_C0152
     3471        motionCompensation( pcCU, pcYuvPred, pcCU->getZorderIdxInCU(),  REF_PIC_LIST_1, iPartIdx );
     3472#else
    34623473        motionCompensation( pcCU, pcYuvPred, REF_PIC_LIST_1, iPartIdx );
    3463 
     3474#endif
    34643475        uiMotBits[0] = uiBits[0] - uiMbBits[0];
    34653476        uiMotBits[1] = uiMbBits[1];
     
    36003611
    36013612              TComYuv* pcYuvPred = &m_acYuvPred[iRefList];
     3613#if MERL_VSP_C0152
     3614              motionCompensation( pcCU, pcYuvPred, pcCU->getZorderIdxInCU(),  REF_PIC_LIST_1, iPartIdx );
     3615#else
    36023616              motionCompensation( pcCU, pcYuvPred, eRefPicList, iPartIdx );
     3617#endif
    36033618#if H0111_MVD_L1_ZERO
    36043619            }
     
    39413956    //  MC
    39423957#if MERL_VSP_C0152
    3943     motionCompensationBWVSP ( pcCU, rpcPredYuv, pcCU->getZorderIdxInCU(), REF_PIC_LIST_X, iPartIdx);
     3958    motionCompensation ( pcCU, rpcPredYuv, pcCU->getZorderIdxInCU(), REF_PIC_LIST_X, iPartIdx);
    39443959#else
    39453960    motionCompensation ( pcCU, rpcPredYuv, REF_PIC_LIST_X, iPartIdx );
Note: See TracChangeset for help on using the changeset viewer.