diff --git a/source/Lib/CommonLib/Contexts_ecm13.inl b/source/Lib/CommonLib/Contexts_ecm13.inl index e7ba65fbe4b490df6b5b5cb11ff12bba3814fdb1..a61b37286b637e079a1b104f6553caf59a207325 100644 --- a/source/Lib/CommonLib/Contexts_ecm13.inl +++ b/source/Lib/CommonLib/Contexts_ecm13.inl @@ -595,7 +595,29 @@ const CtxSet ContextSetCfg::GeoMmvdStepMvpIdx = ContextSetCfg::addCtxSet({ }); const CtxSet ContextSetCfg::GeoBldFlag = ContextSetCfg::addCtxSet({ -// ctx 97 100 +// ctx 97 104 +#if JVET_AH0314_ADAPTIVE_GPM_BLENDING_IMPROV + { 58, 22, 45, 13, 58, 22, 45, 13 }, + { 60, 36, 58, 36, 60, 36, 58, 36 }, + { 35, 35, 35, 35, 35, 35, 35, 35 }, + { 58, 22, 52, 13, 58, 22, 52, 13 }, + { 1, 1, 1, 1, 1, 1, 1, 1 }, + { 1, 1, 1, 1, 1, 1, 1, 1 }, + { 8, 8, 8, 8, 8, 8, 8, 8 }, + { 1, 2, 1, 1, 1, 2, 1, 1 }, + { 11, 18, 18, 11, 11, 18, 18, 11 }, + { 4, 18, 11, 11, 4, 18, 11, 11 }, + { 18, 18, 18, 18, 18, 18, 18, 18 }, + { 4, 18, 18, 4, 4, 18, 18, 4 }, + { 132, 116, 116, 117, 132, 116, 116, 117 }, + { 118, 116, 132, 118, 118, 116, 132, 118 }, + { 117, 116, 116, 117, 117, 116, 116, 117 }, + { 118, 117, 133, 119, 118, 117, 133, 119 }, + { 119, 119, 119, 119, 119, 119, 119, 119 }, + { 119, 119, 119, 119, 119, 119, 119, 119 }, + { 132, 115, 116, 117, 132, 115, 116, 117 }, + { 117, 115, 117, 117, 117, 115, 117, 117 }, +#else { 58, 22, 45, 13 }, { 60, 36, 58, 36 }, { 35, 35, 35, 35 }, @@ -616,6 +638,7 @@ const CtxSet ContextSetCfg::GeoBldFlag = ContextSetCfg::addCtxSet({ { 119, 119, 119, 119 }, { 132, 115, 116, 117 }, { 117, 115, 117, 117 }, +#endif }); const CtxSet ContextSetCfg::GeoSubModeIdx = ContextSetCfg::addCtxSet({