diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 9f87d0eb8809271a9c24e0214c7c4801a76f2065..0334e920cd05b90dcd22bb506ea98f34ea02b390 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -104,7 +104,6 @@ -#define JVET_S0064_SEI_BUFFERING_PERIOD_CLEANUP 1 // JVET-S0064: Conditionally signal bp_sublayer_dpb_output_offsets_present_flag #define JVET_S0185_PROPOSAL2_SEI_CLEANUP 1 // JVET-S0185_PROPOSAL2: Move signalling of syntax element bp_alt_cpb_params_present_flag diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp index 7cb6e372cc227cc505038ec8b7bec9815e3caef6..7301f5616f20bb9b18edd79b373b7c2e9fb21bd9 100644 --- a/source/Lib/DecoderLib/SEIread.cpp +++ b/source/Lib/DecoderLib/SEIread.cpp @@ -801,7 +801,6 @@ void SEIReader::xParseSEIBufferingPeriod(SEIBufferingPeriod& sei, uint32_t paylo } } } -#if JVET_S0064_SEI_BUFFERING_PERIOD_CLEANUP if (sei.m_bpMaxSubLayers-1 > 0) { sei_read_flag(pDecodedMessageOutputStream, code, "bp_sublayer_dpb_output_offsets_present_flag"); @@ -811,10 +810,6 @@ void SEIReader::xParseSEIBufferingPeriod(SEIBufferingPeriod& sei, uint32_t paylo { sei.m_sublayerDpbOutputOffsetsPresentFlag = false; } -#else - sei_read_flag( pDecodedMessageOutputStream, code, "sublayer_dpb_output_offsets_present_flag" ); - sei.m_sublayerDpbOutputOffsetsPresentFlag = code; -#endif if(sei.m_sublayerDpbOutputOffsetsPresentFlag) { for(int i = 0; i < sei.m_bpMaxSubLayers - 1; i++) diff --git a/source/Lib/EncoderLib/SEIwrite.cpp b/source/Lib/EncoderLib/SEIwrite.cpp index a9fa963d9f31c1e395db226cccad40974c277298..4e2523aa182035846804e94021a557db20990733 100644 --- a/source/Lib/EncoderLib/SEIwrite.cpp +++ b/source/Lib/EncoderLib/SEIwrite.cpp @@ -345,14 +345,10 @@ void SEIWriter::xWriteSEIBufferingPeriod(const SEIBufferingPeriod& sei) } } } -#if JVET_S0064_SEI_BUFFERING_PERIOD_CLEANUP if (sei.m_bpMaxSubLayers-1 > 0) { WRITE_FLAG(sei.m_sublayerDpbOutputOffsetsPresentFlag, "bp_sublayer_dpb_output_offsets_present_flag"); } -#else - WRITE_FLAG(sei.m_sublayerDpbOutputOffsetsPresentFlag, "sublayer_dpb_output_offsets_present_flag"); -#endif if(sei.m_sublayerDpbOutputOffsetsPresentFlag) {