Commit 42779c29 authored by Frank Bossen's avatar Frank Bossen
Browse files

Merge branch 'fix_ticket_152' into 'master'

Fix for Ticket #152

See merge request jvet/VVCSoftware_VTM!285
parents 97f1d9ad 725ee76c
......@@ -4522,6 +4522,11 @@ bool PU::getInterMergeSubPuMvpCand(const PredictionUnit &pu, MergeCtx& mrgCtx, b
MotionInfo mi;
// initialize to default vector in case no motion vector is available
mi.mv[0] = mrgCtx.mvFieldNeighbours[(count << 1) + 0].mv;
mi.mv[1] = mrgCtx.mvFieldNeighbours[(count << 1) + 1].mv;
mi.refIdx[0] = mrgCtx.mvFieldNeighbours[(count << 1) + 0].refIdx;
mi.refIdx[1] = mrgCtx.mvFieldNeighbours[(count << 1) + 1].refIdx;
mi.isInter = true;
mi.sliceIdx = slice.getIndependentSliceIdx();
#if JVET_M0483_IBC
......@@ -4540,14 +4545,6 @@ bool PU::getInterMergeSubPuMvpCand(const PredictionUnit &pu, MergeCtx& mrgCtx, b
mi.mv[currRefListId] = cColMv;
}
}
}
else
{
// intra coded, in this case, no motion vector is available for list 0 or list 1, so use default
mi.mv[0] = mrgCtx.mvFieldNeighbours[(count << 1) + 0].mv;
mi.mv[1] = mrgCtx.mvFieldNeighbours[(count << 1) + 1].mv;
mi.refIdx[0] = mrgCtx.mvFieldNeighbours[(count << 1) + 0].refIdx;
mi.refIdx[1] = mrgCtx.mvFieldNeighbours[(count << 1) + 1].refIdx;
}
mi.interDir = (mi.refIdx[0] != -1 ? 1 : 0) + (mi.refIdx[1] != -1 ? 2 : 0);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment