diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index e68caf82072440a3588a9b3c59f4b52f8574fb76..61156ceadea00b8440f0f7bb391255a7f23aa9f1 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -55,7 +55,6 @@ -#define JVET_S0208_ASPECT1 1 // JVET-S0208 aspect 1: Remove the extra_sh_bits_struct( ) and extra_ph_bits_struct( ) structures and put their content directly in the SPS. #define JVET_S0208_ASPECT6 1 // JVET-S0208 aspect 6: Modify the derivation process for the variable TotalNumOlss by removing unnecessary text. diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp index 6c42aa975700f1228e7803d37b85aa64aee69250..3caeafc94e2fcfef1e20b91b772f3425dba14646 100644 --- a/source/Lib/DecoderLib/VLCReader.cpp +++ b/source/Lib/DecoderLib/VLCReader.cpp @@ -1384,37 +1384,6 @@ void HLSyntaxReader::dpb_parameters(int maxSubLayersMinus1, bool subLayerInfoFla } } -#if !JVET_S0208_ASPECT1 -void HLSyntaxReader::parseExtraPHBitsStruct( SPS *sps, int numBytes ) -{ - uint32_t symbol; - std::vector<bool> presentFlags; - presentFlags.resize ( 8 * numBytes ); - - for (int i=0; i < 8*numBytes; i++) - { - READ_FLAG(symbol, "sps_extra_ph_bit_present_flag[ i ]"); - presentFlags[i] = symbol; - } - - sps->setExtraPHBitPresentFlags(presentFlags); -} - -void HLSyntaxReader::parseExtraSHBitsStruct( SPS *sps, int numBytes ) -{ - uint32_t symbol; - std::vector<bool> presentFlags; - presentFlags.resize ( 8 * numBytes ); - - for (int i=0; i < 8*numBytes; i++) - { - READ_FLAG(symbol, "sps_extra_sh_bit_present_flag[ i ]"); - presentFlags[i] = symbol; - } - - sps->setExtraSHBitPresentFlags(presentFlags); -} -#endif void HLSyntaxReader::parseSPS(SPS* pcSPS) { @@ -1732,7 +1701,6 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS) // extra bits are for future extensions, we will read, but ignore them, // unless a meaning is specified in the spec READ_CODE(2, uiCode, "sps_num_extra_ph_bytes"); pcSPS->setNumExtraPHBytes(uiCode); -#if JVET_S0208_ASPECT1 int numExtraPhBytes = uiCode; std::vector<bool> extraPhBitPresentFlags; extraPhBitPresentFlags.resize ( 8 * numExtraPhBytes ); @@ -1742,11 +1710,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS) extraPhBitPresentFlags[i] = uiCode; } pcSPS->setExtraPHBitPresentFlags(extraPhBitPresentFlags); -#else - parseExtraPHBitsStruct( pcSPS, uiCode ); -#endif READ_CODE(2, uiCode, "sps_num_extra_sh_bytes"); pcSPS->setNumExtraSHBytes(uiCode); -#if JVET_S0208_ASPECT1 int numExtraShBytes = uiCode; std::vector<bool> extraShBitPresentFlags; extraShBitPresentFlags.resize ( 8 * numExtraShBytes ); @@ -1756,9 +1720,6 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS) extraShBitPresentFlags[i] = uiCode; } pcSPS->setExtraSHBitPresentFlags(extraShBitPresentFlags); -#else - parseExtraSHBitsStruct( pcSPS, uiCode ); -#endif if (pcSPS->getPtlDpbHrdParamsPresentFlag()) { diff --git a/source/Lib/DecoderLib/VLCReader.h b/source/Lib/DecoderLib/VLCReader.h index 001aff92d91221f7efee0beaf1673cf8dbcfe6d3..5cb2651c121031b63319ef34af575921923d4c58 100644 --- a/source/Lib/DecoderLib/VLCReader.h +++ b/source/Lib/DecoderLib/VLCReader.h @@ -188,10 +188,6 @@ public: void alfFilter( AlfParam& alfParam, const bool isChroma, const int altIdx ); void ccAlfFilter( Slice *pcSlice ); void dpb_parameters(int maxSubLayersMinus1, bool subLayerInfoFlag, SPS *pcSPS); -#if !JVET_S0208_ASPECT1 - void parseExtraPHBitsStruct( SPS *sps, int numBytes ); - void parseExtraSHBitsStruct( SPS *sps, int numBytes ); -#endif private: protected: diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp index 4398ce505221b544914963b2e30d628714413de0..0f1d730e753613914fcb55d2a263c246b236892f 100644 --- a/source/Lib/EncoderLib/VLCWriter.cpp +++ b/source/Lib/EncoderLib/VLCWriter.cpp @@ -1015,19 +1015,11 @@ void HLSWriter::codeSPS( const SPS* pcSPS ) } // extra bits are for future extensions, so these are currently hard coded to not being sent WRITE_CODE(0, 2, "sps_num_extra_ph_bytes"); -#if JVET_S0208_ASPECT1 // for( i = 0; i < (sps_num_extra_ph_bytes * 8 ); i++ ) // sps_extra_ph_bit_present_flag[ i ] -#else - // extra_ph_bits_struct( sps_num_extra_ph_bytes ) -#endif WRITE_CODE(0, 2, "sps_num_extra_sh_bytes"); -#if JVET_S0208_ASPECT1 // for( i = 0; i < (sps_num_extra_sh_bytes * 8 ); i++ ) // sps_extra_sh_bit_present_flag[ i ] -#else - // extra_sh_bits_struct( sps_num_extra_sh_bytes ) -#endif if (pcSPS->getPtlDpbHrdParamsPresentFlag()) {