Commit 092bf370 authored by Xiang Li's avatar Xiang Li

Merge branch 'S0219_ASPECT2_CHANGE_ORDER_APS_PARAM_TYPE' into 'master'

JVET-S0219 aspect2 : Change the order aps_params_type to place before aps_adaptation_parameter_set_id

See merge request jvet/VVCSoftware_VTM!1795
parents e0dfe462 49575fb5
......@@ -51,6 +51,7 @@
#include <cassert>
//########### place macros to be removed in next cycle below this line ###############
#define JVET_S0219_ASPECT2_CHANGE_ORDER_APS_PARAMS_TYPE 1 // JVET-S0219 aspect2: change the order to put the aps_params_type before the aps_adaptation_parameter_set_id.
#define JVET_R0270 1 // JVET-S0270: Treating picture with mixed RASL and RADL slices as RASL picture
......
......@@ -913,13 +913,19 @@ void HLSyntaxReader::parseAPS( APS* aps )
#endif
uint32_t code;
#if JVET_S0219_ASPECT2_CHANGE_ORDER_APS_PARAMS_TYPE
READ_CODE(3, code, "aps_params_type");
aps->setAPSType(ApsType(code));
READ_CODE(5, code, "adaptation_parameter_set_id");
aps->setAPSId(code);
#else
READ_CODE(5, code, "adaptation_parameter_set_id");
aps->setAPSId(code);
READ_CODE(3, code, "aps_params_type");
aps->setAPSType( ApsType(code) );
#endif
#if JVET_R0433
uint32_t codeApsChromaPresentFlag;
READ_FLAG(codeApsChromaPresentFlag, "aps_chroma_present_flag");
......
......@@ -515,8 +515,13 @@ void HLSWriter::codeAPS( APS* pcAPS )
xTraceAPSHeader();
#endif
#if JVET_S0219_ASPECT2_CHANGE_ORDER_APS_PARAMS_TYPE
WRITE_CODE((int)pcAPS->getAPSType(), 3, "aps_params_type");
WRITE_CODE(pcAPS->getAPSId(), 5, "adaptation_parameter_set_id");
#else
WRITE_CODE(pcAPS->getAPSId(), 5, "adaptation_parameter_set_id");
WRITE_CODE( (int)pcAPS->getAPSType(), 3, "aps_params_type" );
#endif
#if JVET_R0433
WRITE_FLAG(pcAPS->chromaPresentFlag, "aps_chroma_present_flag");
#endif
......
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