Commit 92a0bd99 authored by Xiang Li's avatar Xiang Li
Browse files

Merge branch 'yuhan/VVCSoftware_VTM-N0371-ADD-ZERO-BV'

parents 8865ae25 dd47359e
......@@ -50,6 +50,8 @@
#include <assert.h>
#include <cassert>
#define JVET_N0317_ADD_ZERO_BV 1
#define JVET_N0318_N0467_IBC_SIZE 1 // IBC flag dependent on CU size and disabling 128x128 IBC mode
#define JVET_N0462_FIX_CTX_MODELING 1 // Fix context modeling of inter_pred_idc
......
......@@ -1323,6 +1323,19 @@ void PU::getIBCMergeCandidates(const PredictionUnit &pu, MergeCtx& mrgCtx, const
}
#endif
#if JVET_N0317_ADD_ZERO_BV
while (cnt < maxNumMergeCand)
{
mrgCtx.mvFieldNeighbours[cnt * 2].setMvField(Mv(0, 0), MAX_NUM_REF);
mrgCtx.interDirNeighbours[cnt] = 1;
cnt++;
if (mrgCandIdx == cnt && canFastExit)
{
return;
}
}
#endif
mrgCtx.numValidMergeCand = cnt;
}
......
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