diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp index 328a0ceadb23055c40a934a39099096c184ee6fa..64a2a402cebdea75f45cbb2fb9b23da9c4c0b6b7 100644 --- a/source/Lib/CommonLib/Slice.cpp +++ b/source/Lib/CommonLib/Slice.cpp @@ -1599,8 +1599,7 @@ void ChromaQpMappingTable::derivedChromaQPMappingTables() #endif PPSRExt::PPSRExt() -: m_log2MaxTransformSkipBlockSize (2) -, m_crossComponentPredictionEnabledFlag(false) +: m_crossComponentPredictionEnabledFlag(false) , m_cuChromaQpOffsetSubdiv (0) , m_chromaQpOffsetListLen (0) // m_ChromaQpAdjTableIncludingNullEntry initialized below diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h index 7bac2fcb0b7627d851ea7b51f34e0593a24e8262..9b9e55a8110739acc7e72b02d56a80c926e183e0 100644 --- a/source/Lib/CommonLib/Slice.h +++ b/source/Lib/CommonLib/Slice.h @@ -1195,7 +1195,6 @@ public: class PPSRExt // Names aligned to text specification { private: - int m_log2MaxTransformSkipBlockSize; bool m_crossComponentPredictionEnabledFlag; // Chroma QP Adjustments @@ -1210,16 +1209,12 @@ public: bool settingsDifferFromDefaults(const bool bTransformSkipEnabledFlag) const { - return (bTransformSkipEnabledFlag && (getLog2MaxTransformSkipBlockSize() !=2)) - || (getCrossComponentPredictionEnabledFlag() ) + return (getCrossComponentPredictionEnabledFlag() ) || (getChromaQpOffsetListEnabledFlag() ) || (getLog2SaoOffsetScale(CHANNEL_TYPE_LUMA) !=0 ) || (getLog2SaoOffsetScale(CHANNEL_TYPE_CHROMA) !=0 ); } - uint32_t getLog2MaxTransformSkipBlockSize() const { return m_log2MaxTransformSkipBlockSize; } - void setLog2MaxTransformSkipBlockSize( uint32_t u ) { m_log2MaxTransformSkipBlockSize = u; } - bool getCrossComponentPredictionEnabledFlag() const { return m_crossComponentPredictionEnabledFlag; } void setCrossComponentPredictionEnabledFlag(bool value) { m_crossComponentPredictionEnabledFlag = value; } diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp index b269c6fa0362b1a1fddf36b70e39a7dc1820133e..ee8adc7b12686de75c86a4249d670a19a775297c 100644 --- a/source/Lib/DecoderLib/VLCReader.cpp +++ b/source/Lib/DecoderLib/VLCReader.cpp @@ -775,16 +775,6 @@ void HLSyntaxReader::parsePPS( PPS* pcPPS, ParameterSetManager *parameterSetMana PPSRExt &ppsRangeExtension = pcPPS->getPpsRangeExtension(); CHECK(bSkipTrailingExtensionBits, "Invalid state"); -#if JVET_O1136_TS_BDPCM_SIGNALLING - if (parameterSetManager->getSPS(pcPPS->getSPSId())->getTransformSkipEnabledFlag()) -#else - if (pcPPS->getUseTransformSkip()) -#endif - { - READ_UVLC( uiCode, "log2_max_transform_skip_block_size_minus2"); - ppsRangeExtension.setLog2MaxTransformSkipBlockSize(uiCode+2); - } - READ_FLAG( uiCode, "cross_component_prediction_enabled_flag"); ppsRangeExtension.setCrossComponentPredictionEnabledFlag(uiCode != 0); diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp index 55b63286fce9a1391f2521f9bc2f5f7d6ac30c7f..ccefb18d04d134ad3a818c4c9feb9a47b231d6b9 100644 --- a/source/Lib/EncoderLib/VLCWriter.cpp +++ b/source/Lib/EncoderLib/VLCWriter.cpp @@ -486,14 +486,6 @@ void HLSWriter::codePPS( const PPS* pcPPS ) case PPS_EXT__REXT: { const PPSRExt &ppsRangeExtension = pcPPS->getPpsRangeExtension(); -#if JVET_O1136_TS_BDPCM_SIGNALLING - if (pcSPS->getTransformSkipEnabledFlag()) -#else - if (pcPPS->getUseTransformSkip()) -#endif - { - WRITE_UVLC( ppsRangeExtension.getLog2MaxTransformSkipBlockSize()-2, "log2_max_transform_skip_block_size_minus2"); - } WRITE_FLAG((ppsRangeExtension.getCrossComponentPredictionEnabledFlag() ? 1 : 0), "cross_component_prediction_enabled_flag" );