Commit f865549a authored by Xiang Li's avatar Xiang Li

Merge branch 'fix_ticket_368' into 'master'

Fix for Ticket #368 Slice Initialization Issues

See merge request jvet/VVCSoftware_VTM!684
parents 27f91fb0 64747249
Pipeline #1928 passed with stage
......@@ -991,6 +991,10 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl
m_apcSlicePilot->copySliceInfo( m_pcPic->slices[m_uiSliceSegmentIdx-1] );
}
m_apcSlicePilot->setSliceCurStartCtuTsAddr(0);
m_apcSlicePilot->setSliceCurEndCtuTsAddr(0);
m_apcSlicePilot->setSliceCurStartBrickIdx(0);
m_apcSlicePilot->setSliceCurEndBrickIdx(0);
m_apcSlicePilot->setNalUnitType(nalu.m_nalUnitType);
m_apcSlicePilot->setTLayer(nalu.m_temporalId);
......
......@@ -1889,6 +1889,21 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para
parsePredWeightTable(pcSlice, sps);
pcSlice->initWpScaling(sps);
}
else
{
WPScalingParam *wp;
for ( int iNumRef=0 ; iNumRef<((pcSlice->getSliceType() == B_SLICE )?2:1); iNumRef++ )
{
RefPicList eRefPicList = ( iNumRef ? REF_PIC_LIST_1 : REF_PIC_LIST_0 );
for ( int iRefIdx=0 ; iRefIdx<pcSlice->getNumRefIdx(eRefPicList) ; iRefIdx++ )
{
pcSlice->getWpScaling(eRefPicList, iRefIdx, wp);
wp[0].bPresentFlag = false;
wp[1].bPresentFlag = false;
wp[2].bPresentFlag = false;
}
}
}
READ_FLAG( uiCode, "dep_quant_enabled_flag" );
pcSlice->setDepQuantEnabledFlag( uiCode != 0 );
if( !pcSlice->getDepQuantEnabledFlag() )
......
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