From 5c4013fce93a5cc6c15043741a223979d64e5a2d Mon Sep 17 00:00:00 2001
From: Remy Foray <remy.foray@allegrodvt.com>
Date: Fri, 6 Sep 2019 14:12:38 +0200
Subject: [PATCH] Align syntax element trace name in slice header with
specification
---
source/Lib/DecoderLib/VLCReader.cpp | 50 +++++++++++++--------------
source/Lib/EncoderLib/VLCWriter.cpp | 52 ++++++++++++++---------------
2 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 94f4ea2338..3b1ab66c25 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -2025,7 +2025,7 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para
#if JVET_N0100_PROPOSAL1
if (pcSlice->getRPL0()->getLtrpInSliceHeaderFlag())
{
- READ_CODE(sps->getBitsForPOC(), uiCode, "poc_lsb_lt[i][j]");
+ READ_CODE(sps->getBitsForPOC(), uiCode, "slice_poc_lsb_lt[i][j]");
pcSlice->getLocalRPL0()->setRefPicIdentifier(i, uiCode, true);
}
#endif
@@ -2112,7 +2112,7 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para
#if JVET_N0100_PROPOSAL1
if (pcSlice->getRPL1()->getLtrpInSliceHeaderFlag())
{
- READ_CODE(sps->getBitsForPOC(), uiCode, "poc_lsb_lt[i][j]");
+ READ_CODE(sps->getBitsForPOC(), uiCode, "slice_poc_lsb_lt[i][j]");
pcSlice->getLocalRPL1()->setRefPicIdentifier(i, uiCode, true);
}
#endif
@@ -2204,15 +2204,15 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para
sps->getSplitConsOverrideEnabledFlag()
)
{
- READ_FLAG(uiCode, "partition_constrainst_override_flag"); pcSlice->setSplitConsOverrideFlag(uiCode ? true : false);
+ READ_FLAG(uiCode, "partition_constraints_override_flag"); pcSlice->setSplitConsOverrideFlag(uiCode ? true : false);
if (pcSlice->getSplitConsOverrideFlag())
{
- READ_UVLC(uiCode, "log2_diff_min_qt_min_cb"); pcSlice->setMinQTSize(1 << (uiCode + sps->getLog2MinCodingBlockSize()));
- READ_UVLC(uiCode, "max_mtt_hierarchy_depth"); pcSlice->setMaxBTDepth(uiCode);
+ READ_UVLC(uiCode, "slice_log2_diff_min_qt_min_cb"); pcSlice->setMinQTSize(1 << (uiCode + sps->getLog2MinCodingBlockSize()));
+ READ_UVLC(uiCode, "slice_max_mtt_hierarchy_depth_luma"); pcSlice->setMaxBTDepth(uiCode);
if (pcSlice->getMaxBTDepth() != 0)
{
- READ_UVLC(uiCode, "log2_diff_max_bt_min_qt"); pcSlice->setMaxBTSize(pcSlice->getMinQTSize() << uiCode);
- READ_UVLC(uiCode, "log2_diff_max_tt_min_qt"); pcSlice->setMaxTTSize(pcSlice->getMinQTSize() << uiCode);
+ READ_UVLC(uiCode, "slice_log2_diff_max_bt_min_qt"); pcSlice->setMaxBTSize(pcSlice->getMinQTSize() << uiCode);
+ READ_UVLC(uiCode, "slice_log2_diff_max_tt_min_qt"); pcSlice->setMaxTTSize(pcSlice->getMinQTSize() << uiCode);
}
else
{
@@ -2223,12 +2223,12 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para
pcSlice->isIntra() && sps->getUseDualITree()
)
{
- READ_UVLC(uiCode, "log2_diff_min_qt_min_cb_chroma"); pcSlice->setMinQTSizeIChroma(1 << (uiCode + sps->getLog2MinCodingBlockSize()));
- READ_UVLC(uiCode, "max_mtt_hierarchy_depth_chroma"); pcSlice->setMaxBTDepthIChroma(uiCode);
+ READ_UVLC(uiCode, "slice_log2_diff_min_qt_min_cb_chroma"); pcSlice->setMinQTSizeIChroma(1 << (uiCode + sps->getLog2MinCodingBlockSize()));
+ READ_UVLC(uiCode, "slice_max_mtt_hierarchy_depth_chroma"); pcSlice->setMaxBTDepthIChroma(uiCode);
if (pcSlice->getMaxBTDepthIChroma() != 0)
{
- READ_UVLC(uiCode, "log2_diff_max_bt_min_qt_chroma"); pcSlice->setMaxBTSizeIChroma(pcSlice->getMinQTSizeIChroma() << uiCode);
- READ_UVLC(uiCode, "log2_diff_max_tt_min_qt_chroma"); pcSlice->setMaxTTSizeIChroma(pcSlice->getMinQTSizeIChroma() << uiCode);
+ READ_UVLC(uiCode, "slice_log2_diff_max_bt_min_qt_chroma"); pcSlice->setMaxBTSizeIChroma(pcSlice->getMinQTSizeIChroma() << uiCode);
+ READ_UVLC(uiCode, "slice_log2_diff_max_tt_min_qt_chroma"); pcSlice->setMaxTTSizeIChroma(pcSlice->getMinQTSizeIChroma() << uiCode);
}
else
{
@@ -2400,7 +2400,7 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para
#if JVET_O0238_PPS_OR_SLICE
if (!pps->getPPSFiveMinusMaxNumSubblockMergeCandPlus1())
{
- READ_UVLC(uiCode, "five_minus_max_num_affine_merge_cand");
+ READ_UVLC(uiCode, "five_minus_max_num_subblock_merge_cand");
}
else
{
@@ -2413,13 +2413,13 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para
}
if ( sps->getFpelMmvdEnabledFlag() )
{
- READ_FLAG( uiCode, "tile_group_fracmmvd_disabled_flag" );
+ READ_FLAG( uiCode, "slice_fpel_mmvd_enabled_flag" );
pcSlice->setDisFracMMVD( uiCode ? true : false );
}
#if JVET_O1140_SLICE_DISABLE_BDOF_DMVR_FLAG
if (sps->getBdofDmvrSlicePresentFlag())
{
- READ_FLAG(uiCode, "tile_group_bdof_dmvr_disabled_flag");
+ READ_FLAG(uiCode, "slice_disable_bdof_dmvr_flag");
pcSlice->setDisBdofDmvrFlag(uiCode ? true : false);
}
#endif
@@ -2448,7 +2448,7 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para
#if JVET_O0455_IBC_MAX_MERGE_NUM
if (sps->getIBCFlag())
{
- READ_UVLC(uiCode, "six_minus_max_num_ibc_merge_cand");
+ READ_UVLC(uiCode, "slice_six_minus_max_num_ibc_merge_cand");
pcSlice->setMaxNumIBCMergeCand(IBC_MRG_MAX_NUM_CANDS - uiCode);
}
#endif
@@ -2540,26 +2540,26 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para
if( sps->getALFEnabledFlag() )
{
- READ_FLAG(uiCode, "tile_group_alf_enabled_flag");
+ READ_FLAG(uiCode, "slice_alf_enabled_flag");
pcSlice->setTileGroupAlfEnabledFlag(COMPONENT_Y, uiCode);
int alfChromaIdc = 0;
if (uiCode)
{
#if JVET_O0288_UNIFY_ALF_SLICE_TYPE_REMOVAL
#if JVET_O_MAX_NUM_ALF_APS_8
- READ_CODE(3, uiCode, "tile_group_num_APS");
+ READ_CODE(3, uiCode, "slice_num_alf_aps_ids_luma");
#else
xReadTruncBinCode(uiCode, ALF_CTB_MAX_NUM_APS + 1);
#endif
#else
if (pcSlice->isIntra())
{
- READ_FLAG(uiCode, "tile_group_num_APS");
+ READ_FLAG(uiCode, "slice_num_alf_aps_ids_luma");
}
else
{
#if JVET_O_MAX_NUM_ALF_APS_8
- READ_CODE(3, uiCode, "tile_group_num_APS");
+ READ_CODE(3, uiCode, "slice_num_alf_aps_ids_luma");
#else
xReadTruncBinCode(uiCode, ALF_CTB_MAX_NUM_APS + 1);
#endif
@@ -2571,9 +2571,9 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para
for (int i = 0; i < numAps; i++)
{
#if JVET_O_MAX_NUM_ALF_APS_8
- READ_CODE(3, uiCode, "tile_group_aps_id");
+ READ_CODE(3, uiCode, "slice_alf_aps_id_luma");
#else
- READ_CODE(5, uiCode, "tile_group_aps_id");
+ READ_CODE(5, uiCode, "slice_alf_aps_id_luma");
#endif
apsId[i] = uiCode;
}
@@ -2600,9 +2600,9 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para
{
#if JVET_O0288_UNIFY_ALF_SLICE_TYPE_REMOVAL
#if JVET_O_MAX_NUM_ALF_APS_8
- READ_CODE(3, uiCode, "tile_group_aps_id_chroma");
+ READ_CODE(3, uiCode, "slice_alf_aps_id_chroma");
#else
- READ_CODE(5, uiCode, "tile_group_aps_id_chroma");
+ READ_CODE(5, uiCode, "slice_alf_aps_id_chroma");
#endif
#else
if (pcSlice->isIntra() && pcSlice->getTileGroupNumAps() == 1)
@@ -2612,9 +2612,9 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para
else
{
#if JVET_O_MAX_NUM_ALF_APS_8
- READ_CODE(3, uiCode, "tile_group_aps_id_chroma");
+ READ_CODE(3, uiCode, "slice_alf_aps_id_chroma");
#else
- READ_CODE(5, uiCode, "tile_group_aps_id_chroma");
+ READ_CODE(5, uiCode, "slice_alf_aps_id_chroma");
#endif
}
#endif
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 10668058d6..557dfeac0c 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -1398,7 +1398,7 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
if (pcSlice->getRPL0()->getLtrpInSliceHeaderFlag())
{
WRITE_CODE(pcSlice->getRPL0()->getRefPicIdentifier(i), pcSlice->getSPS()->getBitsForPOC(),
- "poc_lsb_lt[listIdx][rplsIdx][j]");
+ "slice_poc_lsb_lt[listIdx][rplsIdx][j]");
}
#endif
WRITE_FLAG(pcSlice->getLocalRPL0()->getDeltaPocMSBPresentFlag(i) ? 1 : 0, "delta_poc_msb_present_flag[i][j]");
@@ -1468,7 +1468,7 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
if (pcSlice->getRPL1()->getLtrpInSliceHeaderFlag())
{
WRITE_CODE(pcSlice->getRPL1()->getRefPicIdentifier(i), pcSlice->getSPS()->getBitsForPOC(),
- "poc_lsb_lt[listIdx][rplsIdx][j]");
+ "slice_poc_lsb_lt[listIdx][rplsIdx][j]");
}
#endif
WRITE_FLAG(pcSlice->getLocalRPL1()->getDeltaPocMSBPresentFlag(i) ? 1 : 0, "delta_poc_msb_present_flag[i][j]");
@@ -1526,30 +1526,30 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
pcSlice->getSPS()->getSplitConsOverrideEnabledFlag()
)
{
- WRITE_FLAG(pcSlice->getSplitConsOverrideFlag() ? 1 : 0, "partition_constrainst_override_flag");
+ WRITE_FLAG(pcSlice->getSplitConsOverrideFlag() ? 1 : 0, "partition_constraints_override_flag");
if (pcSlice->getSplitConsOverrideFlag())
{
- WRITE_UVLC(floorLog2(pcSlice->getMinQTSize()) - pcSlice->getSPS()->getLog2MinCodingBlockSize(), "log2_diff_min_qt_min_cb");
- WRITE_UVLC(pcSlice->getMaxBTDepth(), "max_bt_depth");
+ WRITE_UVLC(floorLog2(pcSlice->getMinQTSize()) - pcSlice->getSPS()->getLog2MinCodingBlockSize(), "slice_log2_diff_min_qt_min_cb");
+ WRITE_UVLC(pcSlice->getMaxBTDepth(), "slice_max_mtt_hierarchy_depth_luma");
if (pcSlice->getMaxBTDepth() != 0)
{
CHECK(pcSlice->getMaxBTSize() < pcSlice->getMinQTSize(), "maxBtSize is smaller than minQtSize");
- WRITE_UVLC(floorLog2(pcSlice->getMaxBTSize()) - floorLog2(pcSlice->getMinQTSize()), "log2_diff_max_bt_min_qt");
+ WRITE_UVLC(floorLog2(pcSlice->getMaxBTSize()) - floorLog2(pcSlice->getMinQTSize()), "slice_log2_diff_max_bt_min_qt");
CHECK(pcSlice->getMaxTTSize() < pcSlice->getMinQTSize(), "maxTtSize is smaller than minQtSize");
- WRITE_UVLC(floorLog2(pcSlice->getMaxTTSize()) - floorLog2(pcSlice->getMinQTSize()), "log2_diff_max_tt_min_qt");
+ WRITE_UVLC(floorLog2(pcSlice->getMaxTTSize()) - floorLog2(pcSlice->getMinQTSize()), "slice_log2_diff_max_tt_min_qt");
}
if (
pcSlice->isIntra() && pcSlice->getSPS()->getUseDualITree()
)
{
- WRITE_UVLC(floorLog2(pcSlice->getMinQTSizeIChroma()) - pcSlice->getSPS()->getLog2MinCodingBlockSize(), "log2_diff_min_qt_min_cb_chroma");
- WRITE_UVLC(pcSlice->getMaxBTDepthIChroma(), "max_mtt_hierarchy_depth_chroma");
+ WRITE_UVLC(floorLog2(pcSlice->getMinQTSizeIChroma()) - pcSlice->getSPS()->getLog2MinCodingBlockSize(), "slice_log2_diff_min_qt_min_cb_chroma");
+ WRITE_UVLC(pcSlice->getMaxBTDepthIChroma(), "slice_max_mtt_hierarchy_depth_chroma");
if (pcSlice->getMaxBTDepthIChroma() != 0)
{
CHECK(pcSlice->getMaxBTSizeIChroma() < pcSlice->getMinQTSizeIChroma(), "maxBtSizeC is smaller than minQtSizeC");
- WRITE_UVLC(floorLog2(pcSlice->getMaxBTSizeIChroma()) - floorLog2(pcSlice->getMinQTSizeIChroma()), "log2_diff_max_bt_min_qt_chroma");
+ WRITE_UVLC(floorLog2(pcSlice->getMaxBTSizeIChroma()) - floorLog2(pcSlice->getMinQTSizeIChroma()), "slice_log2_diff_max_bt_min_qt_chroma");
CHECK(pcSlice->getMaxTTSizeIChroma() < pcSlice->getMinQTSizeIChroma(), "maxTtSizeC is smaller than minQtSizeC");
- WRITE_UVLC(floorLog2(pcSlice->getMaxTTSizeIChroma()) - floorLog2(pcSlice->getMinQTSizeIChroma()), "log2_diff_max_tt_min_qt_chroma");
+ WRITE_UVLC(floorLog2(pcSlice->getMaxTTSizeIChroma()) - floorLog2(pcSlice->getMinQTSizeIChroma()), "slice_log2_diff_max_tt_min_qt_chroma");
}
}
}
@@ -1657,20 +1657,20 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
#if JVET_O0238_PPS_OR_SLICE
if (!pcSlice->getPPS()->getPPSFiveMinusMaxNumSubblockMergeCandPlus1())
{
- WRITE_UVLC( AFFINE_MRG_MAX_NUM_CANDS - pcSlice->getMaxNumAffineMergeCand(), "five_minus_max_num_affine_merge_cand" );
+ WRITE_UVLC( AFFINE_MRG_MAX_NUM_CANDS - pcSlice->getMaxNumAffineMergeCand(), "five_minus_max_num_subblock_merge_cand" );
}
#else
- WRITE_UVLC( AFFINE_MRG_MAX_NUM_CANDS - pcSlice->getMaxNumAffineMergeCand(), "five_minus_max_num_affine_merge_cand" );
+ WRITE_UVLC( AFFINE_MRG_MAX_NUM_CANDS - pcSlice->getMaxNumAffineMergeCand(), "five_minus_max_num_subblock_merge_cand" );
#endif
}
if ( pcSlice->getSPS()->getFpelMmvdEnabledFlag() )
{
- WRITE_FLAG( pcSlice->getDisFracMMVD(), "tile_group_fracmmvd_disabled_flag" );
+ WRITE_FLAG( pcSlice->getDisFracMMVD(), "slice_fpel_mmvd_enabled_flag" );
}
#if JVET_O1140_SLICE_DISABLE_BDOF_DMVR_FLAG
if (pcSlice->getSPS()->getBdofDmvrSlicePresentFlag())
{
- WRITE_FLAG(pcSlice->getDisBdofDmvrFlag(), "tile_group_bdof_dmvr_disabled_flag");
+ WRITE_FLAG(pcSlice->getDisBdofDmvrFlag(), "slice_disable_bdof_dmvr_flag");
}
#endif
if (pcSlice->getSPS()->getUseTriangle() && pcSlice->getMaxNumMergeCand() >= 2)
@@ -1694,7 +1694,7 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
if ( pcSlice->getSPS()->getIBCFlag() )
{
CHECK( pcSlice->getMaxNumIBCMergeCand() > IBC_MRG_MAX_NUM_CANDS, "More IBC merge candidates signalled than supported" );
- WRITE_UVLC( IBC_MRG_MAX_NUM_CANDS - pcSlice->getMaxNumIBCMergeCand(), "six_minus_max_num_ibc_merge_cand" );
+ WRITE_UVLC( IBC_MRG_MAX_NUM_CANDS - pcSlice->getMaxNumIBCMergeCand(), "slice_six_minus_max_num_ibc_merge_cand" );
}
#endif
#if JVET_O0105_ICT
@@ -1755,25 +1755,25 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
if( pcSlice->getSPS()->getALFEnabledFlag() )
{
const int alfEnabled = pcSlice->getTileGroupAlfEnabledFlag(COMPONENT_Y);
- WRITE_FLAG(alfEnabled, "tile_group_alf_enabled_flag");
+ WRITE_FLAG(alfEnabled, "slice_alf_enabled_flag");
if (alfEnabled)
{
#if JVET_O0288_UNIFY_ALF_SLICE_TYPE_REMOVAL
#if JVET_O_MAX_NUM_ALF_APS_8
- WRITE_CODE(pcSlice->getTileGroupNumAps(), 3, "tile_group_num_aps");
+ WRITE_CODE(pcSlice->getTileGroupNumAps(), 3, "slice_num_alf_aps_ids_luma");
#else
xWriteTruncBinCode(pcSlice->getTileGroupNumAps(), ALF_CTB_MAX_NUM_APS + 1);
#endif
#else
if (pcSlice->isIntra())
{
- WRITE_FLAG(pcSlice->getTileGroupNumAps(), "tile_group_num_APS");
+ WRITE_FLAG(pcSlice->getTileGroupNumAps(), "slice_num_alf_aps_ids_luma");
}
else
{
#if JVET_O_MAX_NUM_ALF_APS_8
- WRITE_CODE(pcSlice->getTileGroupNumAps(), 3, "tile_group_num_aps");
+ WRITE_CODE(pcSlice->getTileGroupNumAps(), 3, "slice_num_alf_aps_ids_luma");
#else
xWriteTruncBinCode(pcSlice->getTileGroupNumAps(), ALF_CTB_MAX_NUM_APS + 1);
#endif
@@ -1783,9 +1783,9 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
for (int i = 0; i < pcSlice->getTileGroupNumAps(); i++)
{
#if JVET_O_MAX_NUM_ALF_APS_8
- WRITE_CODE(apsId[i], 3, "tile_group_aps_id");
+ WRITE_CODE(apsId[i], 3, "slice_alf_aps_id_luma");
#else
- WRITE_CODE(apsId[i], 5, "tile_group_aps_id");
+ WRITE_CODE(apsId[i], 5, "slice_alf_aps_id_luma");
#endif
}
@@ -1806,9 +1806,9 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
{
#if JVET_O0288_UNIFY_ALF_SLICE_TYPE_REMOVAL
#if JVET_O_MAX_NUM_ALF_APS_8
- WRITE_CODE(pcSlice->getTileGroupApsIdChroma(), 3, "tile_group_aps_id_chroma");
+ WRITE_CODE(pcSlice->getTileGroupApsIdChroma(), 3, "slice_alf_aps_id_chroma");
#else
- WRITE_CODE(pcSlice->getTileGroupApsIdChroma(), 5, "tile_group_aps_id_chroma");
+ WRITE_CODE(pcSlice->getTileGroupApsIdChroma(), 5, "slice_alf_aps_id_chroma");
#endif
#else
if (pcSlice->isIntra()&& pcSlice->getTileGroupNumAps() == 1)
@@ -1818,9 +1818,9 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
else
{
#if JVET_O_MAX_NUM_ALF_APS_8
- WRITE_CODE(pcSlice->getTileGroupApsIdChroma(), 3, "tile_group_aps_id_chroma");
+ WRITE_CODE(pcSlice->getTileGroupApsIdChroma(), 3, "slice_alf_aps_id_chroma");
#else
- WRITE_CODE(pcSlice->getTileGroupApsIdChroma(), 5, "tile_group_aps_id_chroma");
+ WRITE_CODE(pcSlice->getTileGroupApsIdChroma(), 5, "slice_alf_aps_id_chroma");
#endif
}
#endif
--
GitLab