From 729e766b7b65ba35a59d7ec4e4ac6aaedc49bf26 Mon Sep 17 00:00:00 2001
From: Laroche Guillaume <guillaume.laroche@crf.canon.fr>
Date: Fri, 19 Oct 2018 17:53:04 +0200
Subject: [PATCH] JVET-L0194: One context for full-block Merge index
---
source/Lib/CommonLib/Contexts.cpp | 6 ++++++
source/Lib/CommonLib/TypeDef.h | 2 ++
source/Lib/DecoderLib/CABACReader.cpp | 6 ++++++
source/Lib/EncoderLib/CABACWriter.cpp | 6 ++++++
4 files changed, 20 insertions(+)
diff --git a/source/Lib/CommonLib/Contexts.cpp b/source/Lib/CommonLib/Contexts.cpp
index c735ab2d9..2abec74d9 100644
--- a/source/Lib/CommonLib/Contexts.cpp
+++ b/source/Lib/CommonLib/Contexts.cpp
@@ -290,9 +290,15 @@ const CtxSet ContextSetCfg::MergeFlag = ContextSetCfg::addCtxSet
const CtxSet ContextSetCfg::MergeIdx = ContextSetCfg::addCtxSet
({
+#if JVET_L0194_ONE_CTX_FOR_MRG_IDX
+ { 137,},
+ { 122,},
+ { CNU,},
+#else
{ 137, CNU, CNU, CNU, CNU,},
{ 122, CNU, CNU, CNU, CNU,},
{ CNU, CNU, CNU, CNU, CNU,},
+#endif
});
const CtxSet ContextSetCfg::PartSize = ContextSetCfg::addCtxSet
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 3ef736ae4..15a73e446 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -50,6 +50,8 @@
#include <assert.h>
#include <cassert>
+#define JVET_L0194_ONE_CTX_FOR_MRG_IDX 1 // one context for full-block Merge index
+
#define REUSE_CU_RESULTS 1
#define REMOVE_MV_ADAPT_PREC 1 // remove the high precision flag in the MV class
diff --git a/source/Lib/DecoderLib/CABACReader.cpp b/source/Lib/DecoderLib/CABACReader.cpp
index 8d7ebb8d0..7886c7b18 100644
--- a/source/Lib/DecoderLib/CABACReader.cpp
+++ b/source/Lib/DecoderLib/CABACReader.cpp
@@ -1227,10 +1227,13 @@ void CABACReader::merge_idx( PredictionUnit& pu )
{
if( m_BinDecoder.decodeBin( Ctx::MergeIdx() ) )
{
+#if !JVET_L0194_ONE_CTX_FOR_MRG_IDX
bool useExtCtx = pu.cs->sps->getSpsNext().getUseSubPuMvp();
+#endif
pu.mergeIdx++;
for( ; pu.mergeIdx < numCandminus1; pu.mergeIdx++ )
{
+#if !JVET_L0194_ONE_CTX_FOR_MRG_IDX
if( useExtCtx )
{
if( !m_BinDecoder.decodeBin( Ctx::MergeIdx( std::min<int>( pu.mergeIdx, NUM_MERGE_IDX_EXT_CTX - 1 ) ) ) )
@@ -1240,11 +1243,14 @@ void CABACReader::merge_idx( PredictionUnit& pu )
}
else
{
+#endif
if( !m_BinDecoder.decodeBinEP() )
{
break;
}
+#if !JVET_L0194_ONE_CTX_FOR_MRG_IDX
}
+#endif
}
}
}
diff --git a/source/Lib/EncoderLib/CABACWriter.cpp b/source/Lib/EncoderLib/CABACWriter.cpp
index c46fc745e..c2fe809d7 100644
--- a/source/Lib/EncoderLib/CABACWriter.cpp
+++ b/source/Lib/EncoderLib/CABACWriter.cpp
@@ -1196,18 +1196,24 @@ void CABACWriter::merge_idx( const PredictionUnit& pu )
}
else
{
+#if !JVET_L0194_ONE_CTX_FOR_MRG_IDX
bool useExtCtx = pu.cs->sps->getSpsNext().getUseSubPuMvp();
+#endif
m_BinEncoder.encodeBin( 1, Ctx::MergeIdx() );
for( unsigned idx = 1; idx < numCandminus1; idx++ )
{
+#if !JVET_L0194_ONE_CTX_FOR_MRG_IDX
if( useExtCtx )
{
m_BinEncoder.encodeBin( pu.mergeIdx == idx ? 0 : 1, Ctx::MergeIdx( std::min<int>( idx, NUM_MERGE_IDX_EXT_CTX - 1 ) ) );
}
else
{
+#endif
m_BinEncoder.encodeBinEP( pu.mergeIdx == idx ? 0 : 1 );
+#if !JVET_L0194_ONE_CTX_FOR_MRG_IDX
}
+#endif
if( pu.mergeIdx == idx )
{
break;
--
GitLab