Merge branch 'N0462-Fix-context-modeling' into 'master'

N0462: Fix context modeling of inter_pred_idc

See merge request !428

source/Lib/CommonLib/ContextModelling.cpp

@@ -267,7 +267,11 @@ unsigned DeriveCtx::CtxQtCbf( const ComponentID compID, const unsigned trDepth,
 
 unsigned DeriveCtx::CtxInterDir( const PredictionUnit& pu )
 {
+#if JVET_N0462_FIX_CTX_MODELING
+  return ( 7 - ((g_aucLog2[pu.lumaSize().width] + g_aucLog2[pu.lumaSize().height] + 1) >> 1) );
+#else
   return Clip3( 0, 3, 7 - ( ( g_aucLog2[pu.lumaSize().width] + g_aucLog2[pu.lumaSize().height] + 1 ) >> 1 ) );    // VG-ASYMM DONE
+#endif
 }
 
 unsigned DeriveCtx::CtxAffineFlag( const CodingUnit& cu )

source/Lib/CommonLib/TypeDef.h

@@ -50,6 +50,8 @@
 #include <assert.h>
 #include <cassert>
 
+#define JVET_N0462_FIX_CTX_MODELING                       1 // Fix context modeling of inter_pred_idc
+
 #define JVET_N0286_SIMPLIFIED_GBI_IDX                     1 // Simplified coding of the GBi index
 
 #define JVET_N600_AMVR_TPM_CTX_REDUCTION                  1