diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index d0d582d1592b485d60efe9b625a54830d87a4728..c3ee4765238c7b339232d0f9a506020451e6c54f 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -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 diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp index 1a553e1240743e1031fd359e75b406becce353ab..1cc4fada171c288309728bf7acb884cee00f56a3 100644 --- a/source/Lib/DecoderLib/VLCReader.cpp +++ b/source/Lib/DecoderLib/VLCReader.cpp @@ -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"); diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp index 992ba6d53c8d1ea28c552b01539e8bb49e101e90..6deccd7f221e454a09d094f080c0a8dbb0f8c85e 100644 --- a/source/Lib/EncoderLib/VLCWriter.cpp +++ b/source/Lib/EncoderLib/VLCWriter.cpp @@ -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