diff --git a/source/Lib/CommonLib/ContextModelling.cpp b/source/Lib/CommonLib/ContextModelling.cpp index 74eaf6d23dc1cfede034569c4cc3e071241dd71a..983ae59f90d84bbc7b75a5f5eb542156248da0c4 100644 --- a/source/Lib/CommonLib/ContextModelling.cpp +++ b/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 ) diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index a3a4dd41ab54b6b502f33b5ed274f29e558e5feb..46c32deb691170d6667c2509ef865e2458831985 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/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