Commit f555917e authored by Xiang Li's avatar Xiang Li
Browse files

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

N0462: Fix context modeling of inter_pred_idc

See merge request jvet/VVCSoftware_VTM!428
parents 27c1d1f9 5adb3079
......@@ -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 )
......
......@@ -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
......
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