Commit 62684e17 authored by Xiang Li's avatar Xiang Li

Merge branch 'guillaume.laroche/VVCSoftware_VTM-R0200-Move-LMCS-ScalingList-in-SH'

parents bb5469ef bdcec62c
......@@ -52,6 +52,8 @@
//########### place macros to be removed in next cycle below this line ###############
#define JVET_R0200_MOVE_LMCS_AND_SCALING_LIST_SE 1 // JVET-R0200 Move the SH flags slice_lmcs_enabled_flag and slice_explicit_scaling_list_used_flag to be just after the ALF parameters
#define JVET_R0388_DBF_CLEANUP 1 // JVET-R0388: Cleanups on deblocking signalling
#define JVET_R0071_SPS_PPS_CELANUP 1 // JVET-R0071 item 2-4: cleanups on subpicture signalling (item 1 has been ported in JVET_R0156_ASPECT4)
......
......@@ -3274,6 +3274,26 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
pcSlice->setTileGroupCcAlfCrApsId(-1);
}
}
#if JVET_R0200_MOVE_LMCS_AND_SCALING_LIST_SE
if (picHeader->getLmcsEnabledFlag())
{
READ_FLAG(uiCode, "slice_lmcs_enabled_flag");
pcSlice->setLmcsEnabledFlag(uiCode);
}
else
{
pcSlice->setLmcsEnabledFlag(false);
}
if (picHeader->getExplicitScalingListEnabledFlag())
{
READ_FLAG(uiCode, "slice_explicit_scaling_list_used_flag");
pcSlice->setExplicitScalingListUsed(uiCode);
}
else
{
pcSlice->setExplicitScalingListUsed(false);
}
#endif
// 4:4:4 colour plane ID
if( sps->getSeparateColourPlaneFlag() )
......@@ -3818,6 +3838,7 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
pcSlice->setTSResidualCodingDisabledFlag(uiCode != 0);
#endif
#if !JVET_R0200_MOVE_LMCS_AND_SCALING_LIST_SE
if (picHeader->getLmcsEnabledFlag())
{
READ_FLAG(uiCode, "slice_lmcs_enabled_flag");
......@@ -3836,6 +3857,7 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
{
pcSlice->setExplicitScalingListUsed(false);
}
#endif
if( pcSlice->getFirstCtuRsAddrInSlice() == 0 )
{
pcSlice->setDefaultClpRng( *sps );
......
......@@ -2088,6 +2088,18 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
}
}
#if JVET_R0200_MOVE_LMCS_AND_SCALING_LIST_SE
if (picHeader->getLmcsEnabledFlag())
{
WRITE_FLAG(pcSlice->getLmcsEnabledFlag(), "slice_lmcs_enabled_flag");
}
if (picHeader->getExplicitScalingListEnabledFlag())
{
WRITE_FLAG(pcSlice->getExplicitScalingListUsed(), "slice_explicit_scaling_list_used_flag");
}
#endif
// 4:4:4 colour plane ID
if( pcSlice->getSPS()->getSeparateColourPlaneFlag() )
{
......@@ -2401,6 +2413,7 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
WRITE_FLAG(pcSlice->getTSResidualCodingDisabledFlag() ? 1 : 0, "slice_ts_residual_coding_disabled_flag");
#endif
#if !JVET_R0200_MOVE_LMCS_AND_SCALING_LIST_SE
if (picHeader->getLmcsEnabledFlag())
{
WRITE_FLAG(pcSlice->getLmcsEnabledFlag(), "slice_lmcs_enabled_flag");
......@@ -2410,6 +2423,7 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
{
WRITE_FLAG(pcSlice->getExplicitScalingListUsed(), "slice_explicit_scaling_list_used_flag");
}
#endif
if(pcSlice->getPPS()->getSliceHeaderExtensionPresentFlag())
{
......
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