Ticket #155: Ticket155.patch

File Ticket155.patch, 1.1 KB (added by LiZhang, 6 years ago)

  • source/Lib/CommonLib/UnitTools.cpp 

    diff --git a/source/Lib/CommonLib/UnitTools.cpp b/source/Lib/CommonLib/UnitTools.cpp
index e73eea3..33a1f96 100644
    a b bool PU::addMergeHMVPCand(const Slice &slice, MergeCtx& mrgCtx, bool isCandInter 
    777777    miNeighbor = slice.getMotionInfoFromLUTs(num_avai_candInLUT - mrgIdx);
    778778#endif
    779779    mrgCtx.interDirNeighbours[cnt] = miNeighbor.interDir;
    780 #if JVET_M0264_HMVP_WITH_GBIIDX
    781     mrgCtx.GBiIdx[cnt] = (mrgCtx.interDirNeighbours[cnt] == 3) ? miNeighbor.GBiIdx: GBI_DEFAULT;
    782 #endif
    783780    mrgCtx.mvFieldNeighbours[cnt << 1].setMvField(miNeighbor.mv[0], miNeighbor.refIdx[0]);
    784781    if (slice.isInterB())
    785782    {
    … … bool PU::addMergeHMVPCand(const Slice &slice, MergeCtx& mrgCtx, bool isCandInter 
    796793        if(mmvdList != 0 && mrgCandIdx != -1)
    797794          mrgCandIdxIBC++;
    798795      }
     796#if JVET_M0264_HMVP_WITH_GBIIDX
     797      mrgCtx.GBiIdx[cnt] = (mrgCtx.interDirNeighbours[cnt] == 3) ? miNeighbor.GBiIdx: GBI_DEFAULT;
     798#endif
    799799      if (mrgCandIdxIBC == cnt && canFastExit)
    800800      {
    801801        return true;