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

source/Lib/CommonLib/TypeDef.h

@@ -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

source/Lib/DecoderLib/DecLib.cpp

@@ -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

source/Lib/EncoderLib/EncGOP.cpp

@@ -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