Commit 47b610b5 authored by Karsten Suehring's avatar Karsten Suehring

Merge branch 'Bitstream-Switching-Fixes' into 'master'

fixed bit-stream switching issue (mismatches, see VVC ticket #81)

See merge request jvet/VVCSoftware_VTM!137
parents 58a26de5 c7612e5c
Pipeline #480 passed with stage
......@@ -173,12 +173,6 @@ bool tryDecodePicture( Picture* pcEncPic, const int expectedPoc, const std::stri
pcEncPic->copySAO( *pic, 0 );
}
pcDecLib->executeLoopFilters();
if ( pic->cs->sps->getUseSAO() )
{
pcEncPic->copySAO( *pic, 1 );
}
if( pic->cs->sps->getUseALF() )
{
for( int compIdx = 0; compIdx < MAX_NUM_COMPONENT; compIdx++ )
......@@ -192,6 +186,12 @@ bool tryDecodePicture( Picture* pcEncPic, const int expectedPoc, const std::stri
}
}
pcDecLib->executeLoopFilters();
if ( pic->cs->sps->getUseSAO() )
{
pcEncPic->copySAO( *pic, 1 );
}
pcEncPic->cs->copyStructure( *pic->cs, CH_L, true, true );
if( CS::isDualITree( *pcEncPic->cs ) )
......@@ -1088,7 +1088,7 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl
pcSlice->checkCRA(pcSlice->getRPS(), m_pocCRA, m_associatedIRAPType, m_cListPic );
// Set reference list
pcSlice->setRefPicList( m_cListPic, true, true );
if (!pcSlice->isIntra())
{
bool bLowDelay = true;
......
......@@ -1919,6 +1919,15 @@ void EncSlice::encodeSlice ( Picture* pcPic, OutputBitstream* pcSubstreams, ui
}
}
#endif
#if JVET_L0646_GBI
bool updateGbiCodingOrder = cs.slice->getSliceType() == B_SLICE && ctuTsAddr == startCtuTsAddr;
if( updateGbiCodingOrder )
{
resetGbiCodingOrder(false, cs);
}
#endif
m_CABACWriter->coding_tree_unit( cs, ctuArea, pcPic->m_prevQP, ctuRsAddr );
#if HEVC_TILES_WPP
......
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