Commit 71c30041 authored by Daniel's avatar Daniel
Browse files

JVET-N0470, SMVD RefIdxSymLX derivation, aligned software to spec text.

parent 3aac3f63
......@@ -50,6 +50,8 @@
#include <assert.h>
#include <cassert>
#define JVET_N0470_SMVD_FIX 1 // remove mvd_l1_zero_flag condition, align to spec text.
#define JVET_N0235_SMVD_SPS 1
#define JVET_N0843_BVP_SIMPLIFICATION 1
......
......@@ -1211,7 +1211,11 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl
}
#if JVET_N0235_SMVD_SPS
if (pcSlice->getSPS()->getUseSMVD() && pcSlice->getCheckLDC() == false && pcSlice->getMvdL1ZeroFlag() == false)
if (pcSlice->getSPS()->getUseSMVD() && pcSlice->getCheckLDC() == false
#if !JVET_N0470_SMVD_FIX
&& pcSlice->getMvdL1ZeroFlag() == false
#endif
)
#else
if ( pcSlice->getCheckLDC() == false && pcSlice->getMvdL1ZeroFlag() == false )
#endif
......
......@@ -1935,7 +1935,11 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
#endif
#if JVET_N0235_SMVD_SPS
if ( pcSlice->getSPS()->getUseSMVD() && pcSlice->getCheckLDC() == false && pcSlice->getMvdL1ZeroFlag() == false )
if ( pcSlice->getSPS()->getUseSMVD() && pcSlice->getCheckLDC() == false
#if !JVET_N0470_SMVD_FIX
&& pcSlice->getMvdL1ZeroFlag() == false
#endif
)
#else
if ( pcSlice->getCheckLDC() == false && pcSlice->getMvdL1ZeroFlag() == false )
#endif
......
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