Commit 140792e1 authored by Biao Wang's avatar Biao Wang

JVET-N0185:A Unified MPM List for Intra Mode Coding

parent 49d3fb45
......@@ -311,7 +311,7 @@ const CtxSet ContextSetCfg::IntraLumaMpmFlag = ContextSetCfg::addCtxSet
});
#if JVET_N0185_UNIFIED_MPM
const CtxSet ContextSetCfg::HarmonizedMPMIdx = ContextSetCfg::addCtxSet
const CtxSet ContextSetCfg::IntraLumaPlanarFlag = ContextSetCfg::addCtxSet
({
{ 154, 154, },
......
......@@ -207,7 +207,7 @@ public:
static const CtxSet MultiRefLineIdx;
static const CtxSet IntraLumaMpmFlag;
#if JVET_N0185_UNIFIED_MPM
static const CtxSet HarmonizedMPMIdx;
static const CtxSet IntraLumaPlanarFlag;
#endif
static const CtxSet IntraChromaPredMode;
static const CtxSet DeltaQP;
......
......@@ -1110,7 +1110,7 @@ void CABACReader::intra_luma_pred_modes( CodingUnit &cu )
#if JVET_N0185_UNIFIED_MPM
unsigned ctx = (pu->cu->ispMode == NOT_INTRA_SUBPARTITIONS ? 1 : 0);
if (pu->multiRefIdx == 0)
ipred_idx = m_BinDecoder.decodeBin(Ctx::HarmonizedMPMIdx(ctx));
ipred_idx = m_BinDecoder.decodeBin(Ctx::IntraLumaPlanarFlag(ctx));
else
ipred_idx = 1;
#else
......
......@@ -953,7 +953,7 @@ void CABACWriter::intra_luma_pred_modes( const CodingUnit& cu )
#if JVET_N0185_UNIFIED_MPM
unsigned ctx = (pu->cu->ispMode == NOT_INTRA_SUBPARTITIONS ? 1 : 0);
if (pu->multiRefIdx == 0)
m_BinEncoder.encodeBin(mpm_idx > 0, Ctx::HarmonizedMPMIdx(ctx));
m_BinEncoder.encodeBin(mpm_idx > 0, Ctx::IntraLumaPlanarFlag(ctx));
#else
m_BinEncoder.encodeBinEP( mpm_idx > 0 );
#endif
......@@ -1038,7 +1038,7 @@ void CABACWriter::intra_luma_pred_mode( const PredictionUnit& pu )
#if JVET_N0185_UNIFIED_MPM
unsigned ctx = (pu.cu->ispMode == NOT_INTRA_SUBPARTITIONS ? 1 : 0);
if (pu.multiRefIdx == 0)
m_BinEncoder.encodeBin( mpm_idx > 0, Ctx::HarmonizedMPMIdx(ctx) );
m_BinEncoder.encodeBin( mpm_idx > 0, Ctx::IntraLumaPlanarFlag(ctx) );
#else
m_BinEncoder.encodeBinEP( mpm_idx > 0 );
#endif
......
Markdown is supported
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