diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 95f9fc9673f700e33768b23cdc72eb6459cd0bdb..8620c27e0015fa028e1e0fde75d3281bb7bb6515 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -70,7 +70,6 @@ -#define JVET_P0362_RESERVE_NUH_LAYER_ID_VALUES 1 // JVET-P0362: Reserve nuh_layer_id values 56 to 63, inclusive #define RETRAIN_CABAC 1 // Retrained CABAC probabilities diff --git a/source/Lib/DecoderLib/NALread.cpp b/source/Lib/DecoderLib/NALread.cpp index 9027e95aaee3f1086a60c17467151da2e5927129..07dddd03f67e8834f26b88a790f14d2d247b4b5b 100644 --- a/source/Lib/DecoderLib/NALread.cpp +++ b/source/Lib/DecoderLib/NALread.cpp @@ -129,9 +129,7 @@ void readNalUnitHeader(InputNALUnit& nalu) nalu.m_forbiddenZeroBit = bs.read(1); // forbidden zero bit nalu.m_nuhReservedZeroBit = bs.read(1); // nuh_reserved_zero_bit nalu.m_nuhLayerId = bs.read(6); // nuh_layer_id -#if JVET_P0362_RESERVE_NUH_LAYER_ID_VALUES CHECK(nalu.m_nuhLayerId > 55, "The value of nuh_layer_id shall be in the range of 0 to 55, inclusive"); -#endif nalu.m_nalUnitType = (NalUnitType) bs.read(5); // nal_unit_type nalu.m_temporalId = bs.read(3) - 1; // nuh_temporal_id_plus1 diff --git a/source/Lib/EncoderLib/NALwrite.cpp b/source/Lib/EncoderLib/NALwrite.cpp index 3916898ac7f9464d8dafd66ce171ae7dd34f741d..4764029a595e9daa55484faec86163de40b055cd 100644 --- a/source/Lib/EncoderLib/NALwrite.cpp +++ b/source/Lib/EncoderLib/NALwrite.cpp @@ -53,11 +53,7 @@ OutputBitstream bsNALUHeader; bsNALUHeader.write(forbiddenZero, 1); // forbidden_zero_bit int nuhReservedZeroBit = 0; bsNALUHeader.write(nuhReservedZeroBit, 1); // nuh_reserved_zero_bit -#if JVET_P0362_RESERVE_NUH_LAYER_ID_VALUES CHECK(nalu.m_nuhLayerId > 55, "The value of nuh_layer_id shall be in the range of 0 to 55, inclusive"); -#else - CHECK(nalu.m_nuhLayerId > 63, "nuh_layer_id > 63"); -#endif bsNALUHeader.write(nalu.m_nuhLayerId, 6); // nuh_layer_id bsNALUHeader.write(nalu.m_nalUnitType, 5); // nal_unit_type bsNALUHeader.write(nalu.m_temporalId + 1, 3); // nuh_temporal_id_plus1