Skip to content
Snippets Groups Projects
Commit 2b9dcd58 authored by Frank Bossen's avatar Frank Bossen
Browse files

Merge branch 'fix_1068' into 'master'

Fix #1068: bins counting issue

See merge request jvet/VVCSoftware_VTM!1641
parents 79775621 1ddf6ed3
No related branches found
No related tags found
No related merge requests found
......@@ -1859,6 +1859,7 @@ void EncSlice::encodeSlice ( Picture* pcPic, OutputBitstream* pcSubstreams, ui
{
if (ctuIdx != 0) // if it is the first CTU, then the entropy coder has already been reset
{
numBinsCoded += m_CABACWriter->getNumBins();
m_CABACWriter->initCtxModels( *pcSlice );
cs.resetPrevPLT(cs.prevPLT);
}
......@@ -1868,6 +1869,7 @@ void EncSlice::encodeSlice ( Picture* pcPic, OutputBitstream* pcSubstreams, ui
// Synchronize cabac probabilities with upper CTU if it's available and at the start of a line.
if (ctuIdx != 0) // if it is the first CTU, then the entropy coder has already been reset
{
numBinsCoded += m_CABACWriter->getNumBins();
m_CABACWriter->initCtxModels( *pcSlice );
cs.resetPrevPLT(cs.prevPLT);
}
......@@ -1933,7 +1935,7 @@ void EncSlice::encodeSlice ( Picture* pcPic, OutputBitstream* pcSubstreams, ui
{
m_encCABACTableIdx = pcSlice->getSliceType();
}
numBinsCoded = m_CABACWriter->getNumBins();
numBinsCoded += m_CABACWriter->getNumBins();
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment