diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 44a8af7880b7c2fe8d63adf3a2c1816ef69ff5b6..59c55f0abf4230aa3635878a8cdb67ace2279c00 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -107,7 +107,6 @@ -#define JVET_S0181_PROPOSAL1 1 // JVET-0181_Proposal1: Conditionally signal bp_sublayer_initial_cpb_removal_delay_present_flag #define JVET_S0172_ITEM2_GCMP_CONSTRAINT 1 // JVET-S0172 item 2: Constraints on GCMP for the hemisphere cubemap (gcmp_packing_type == 4 or 5) diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp index 240d76b67d6f2d61ed45ff4410b71a161c3ab8bc..a6933fa49c6d1b77c0333493ec2a04d387c7df9b 100644 --- a/source/Lib/DecoderLib/SEIread.cpp +++ b/source/Lib/DecoderLib/SEIread.cpp @@ -765,7 +765,6 @@ void SEIReader::xParseSEIBufferingPeriod(SEIBufferingPeriod& sei, uint32_t paylo sei_read_code( pDecodedMessageOutputStream, 3, code, "bp_max_sub_layers_minus1" ); sei.m_bpMaxSubLayers = code + 1; #endif sei_read_uvlc( pDecodedMessageOutputStream, code, "bp_cpb_cnt_minus1" ); sei.m_bpCpbCnt = code + 1; -#if JVET_S0181_PROPOSAL1 if (sei.m_bpMaxSubLayers - 1 > 0) { sei_read_flag(pDecodedMessageOutputStream, code, "bp_sublayer_initial_cpb_removal_delay_present_flag"); @@ -775,10 +774,6 @@ void SEIReader::xParseSEIBufferingPeriod(SEIBufferingPeriod& sei, uint32_t paylo { sei.m_sublayerInitialCpbRemovalDelayPresentFlag = false; } -#else - sei_read_flag(pDecodedMessageOutputStream, code, "sublayer_initial_cpb_removal_delay_present_flag"); - sei.m_sublayerInitialCpbRemovalDelayPresentFlag = code; -#endif for (i = (sei.m_sublayerInitialCpbRemovalDelayPresentFlag ? 0 : sei.m_bpMaxSubLayers - 1); i < sei.m_bpMaxSubLayers; i++) { for( nalOrVcl = 0; nalOrVcl < 2; nalOrVcl ++ ) diff --git a/source/Lib/EncoderLib/SEIwrite.cpp b/source/Lib/EncoderLib/SEIwrite.cpp index 6e3e5b2554da1858b62d69e089532864a8072455..ae22be917fedb8d3c9e2cabc86d89785b3786afb 100644 --- a/source/Lib/EncoderLib/SEIwrite.cpp +++ b/source/Lib/EncoderLib/SEIwrite.cpp @@ -319,14 +319,10 @@ void SEIWriter::xWriteSEIBufferingPeriod(const SEIBufferingPeriod& sei) } CHECK (sei.m_bpCpbCnt < 1, "sei.m_bpCpbCnt must be > 0"); WRITE_UVLC( sei.m_bpCpbCnt - 1, "bp_cpb_cnt_minus1"); -#if JVET_S0181_PROPOSAL1 if (sei.m_bpMaxSubLayers - 1 > 0) { WRITE_FLAG(sei.m_sublayerInitialCpbRemovalDelayPresentFlag, "bp_sublayer_initial_cpb_removal_delay_present_flag"); } -#else - WRITE_FLAG(sei.m_sublayerInitialCpbRemovalDelayPresentFlag, "sublayer_initial_cpb_removal_delay_present_flag"); -#endif for (int i = (sei.m_sublayerInitialCpbRemovalDelayPresentFlag ? 0 : sei.m_bpMaxSubLayers - 1); i < sei.m_bpMaxSubLayers; i++) { for( int nalOrVcl = 0; nalOrVcl < 2; nalOrVcl ++ )