Ticket #174: bugfix174.patch

File bugfix174.patch, 1.3 KB (added by nsprljan, 13 years ago)

Patched based on origin/tags/HM-3.1

  • source/Lib/TLibEncoder/TEncSearch.cpp 

    diff --git a/source/Lib/TLibEncoder/TEncSearch.cpp b/source/Lib/TLibEncoder/TEncSearch.cpp
index d418c73..f880248 100644
    a b Void TEncSearch::xCheckBestMVP ( TComDataCU* pcCU, RefPicList eRefPicList, TComM 
    33583358 
    33593359  m_pcRdCost->setPredictor( rcMvPred );
    33603360  Int iOrgMvBits  = m_pcRdCost->getBits(cMv.getHor(), cMv.getVer());
     3361  iOrgMvBits += m_auiMVPIdxCost[riMVPIdx][pcAMVPInfo->iN];
    33613362  Int iBestMvBits = iOrgMvBits;
    33623363 
    33633364  for (Int iMVPIdx = 0; iMVPIdx < pcAMVPInfo->iN; iMVPIdx++)
    … … Void TEncSearch::xCheckBestMVP ( TComDataCU* pcCU, RefPicList eRefPicList, TComM 
    33673368    m_pcRdCost->setPredictor( pcAMVPInfo->m_acMvCand[iMVPIdx] );
    33683369   
    33693370    Int iMvBits = m_pcRdCost->getBits(cMv.getHor(), cMv.getVer());
     3371    iMvBits += m_auiMVPIdxCost[iMVPIdx][pcAMVPInfo->iN];
    33703372   
    33713373    if (iMvBits < iBestMvBits)
    33723374    {
    … … Void TEncSearch::xCheckBestMVP ( TComDataCU* pcCU, RefPicList eRefPicList, TComM 
    33793381  {
    33803382    rcMvPred = pcAMVPInfo->m_acMvCand[iBestMVPIdx];
    33813383   
    3382     iOrgMvBits  += m_auiMVPIdxCost[riMVPIdx][pcAMVPInfo->iN];
    3383     iBestMvBits += m_auiMVPIdxCost[iBestMVPIdx][pcAMVPInfo->iN];
    3384    
    33853384    riMVPIdx = iBestMVPIdx;
    33863385    UInt uiOrgBits = ruiBits;
    33873386    ruiBits = uiOrgBits - iOrgMvBits + iBestMvBits;