Commit ab14bc37 authored by Karsten Suehring's avatar Karsten Suehring

Merge branch 'JVET_S0183' into 'master'

JVET-S0183 Propoal 1: VPS information signalling modification: signal num_output_layer_sets_minus1 as num_output_layer_sets_minus2

See merge request !1786
parents 1f9c54b9 40fc9426
......@@ -129,6 +129,8 @@
#define JVET_S0185_PROPOSAl1_PICTURE_TIMING_CLEANUP 1 // JVET-S0185: Proposal 1, put syntax element pt_cpb_removal_delay_minus1[] first, followed by similar information for sub-layers, followed by pt_dpb_output_delay
#define JVET_S0183_VPS_INFORMATION_SIGNALLING 1 // JVET-S0183: Proposal 1, signal vps_num_output_layer_sets_minus1 as vps_num_output_layer_sets_minus2
//########### place macros to be be kept below this line ###############
#define JVET_S0257_DUMP_360SEI_MESSAGE 1 // Software support of 360 SEI messages
......
......@@ -2400,7 +2400,11 @@ void HLSyntaxReader::parseVPS(VPS* pcVPS)
}
if (pcVPS->getOlsModeIdc() == 2)
{
#if JVET_S0183_VPS_INFORMATION_SIGNALLING
READ_CODE(8, uiCode, "num_output_layer_sets_minus2"); pcVPS->setNumOutputLayerSets(uiCode + 2);
#else
READ_CODE(8, uiCode, "num_output_layer_sets_minus1"); pcVPS->setNumOutputLayerSets(uiCode + 1);
#endif
for (uint32_t i = 1; i <= pcVPS->getNumOutputLayerSets() - 1; i++)
{
for (uint32_t j = 0; j < pcVPS->getMaxLayers(); j++)
......
......@@ -1495,7 +1495,11 @@ void HLSWriter::codeVPS(const VPS* pcVPS)
}
if (pcVPS->getOlsModeIdc() == 2)
{
#if JVET_S0183_VPS_INFORMATION_SIGNALLING
WRITE_CODE(pcVPS->getNumOutputLayerSets() - 2, 8, "num_output_layer_sets_minus2");
#else
WRITE_CODE(pcVPS->getNumOutputLayerSets() - 1, 8, "num_output_layer_sets_minus1");
#endif
for (uint32_t i = 1; i < pcVPS->getNumOutputLayerSets(); i++)
{
for (uint32_t j = 0; j < pcVPS->getMaxLayers(); j++)
......
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