diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index d6d55df1c0f8489a3ba1cdeecc843ec353e317c4..b5134271d553816aad80f345bd30a4a3c098b909 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -116,7 +116,6 @@ -#define JVET_R0247_PPS_LP_FTR_ACROSS_SLICES_FLAG_CLEANUP 1 // JVET-R0247: Skip pps_loop_filter_across_slices_enabled_flag when the picture contains one slice #define JVET_R0327_ONE_PASS_CCALF 1 // JVET-R0327: One-pass CCALF diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp index 401c0d77fcbf472aec5726d1e331d32ee0b32b20..5dc3f81a284cc852afd022f6def118a1f2f0c992 100644 --- a/source/Lib/DecoderLib/VLCReader.cpp +++ b/source/Lib/DecoderLib/VLCReader.cpp @@ -672,18 +672,14 @@ void HLSyntaxReader::parsePPS( PPS* pcPPS ) // loop filtering across slice/tile controls READ_CODE(1, uiCode, "loop_filter_across_tiles_enabled_flag"); pcPPS->setLoopFilterAcrossTilesEnabledFlag( uiCode == 1 ); #endif -#if JVET_R0247_PPS_LP_FTR_ACROSS_SLICES_FLAG_CLEANUP if (pcPPS->getRectSliceFlag() == 0 || pcPPS->getSingleSlicePerSubPicFlag() || pcPPS->getNumSlicesInPic() > 1) { -#endif READ_CODE(1, uiCode, "loop_filter_across_slices_enabled_flag"); pcPPS->setLoopFilterAcrossSlicesEnabledFlag( uiCode == 1 ); -#if JVET_R0247_PPS_LP_FTR_ACROSS_SLICES_FLAG_CLEANUP } else { pcPPS->setLoopFilterAcrossSlicesEnabledFlag( false ); } -#endif } #if JVET_R0071_SPS_PPS_CELANUP else diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp index 4be57ea6700559e7f4b6cab829bd9568bb39b27b..6e2aeeacb3d386529820dac62f8a4f340b0aa2d5 100644 --- a/source/Lib/EncoderLib/VLCWriter.cpp +++ b/source/Lib/EncoderLib/VLCWriter.cpp @@ -399,14 +399,10 @@ void HLSWriter::codePPS( const PPS* pcPPS ) // loop filtering across slice/tile controls WRITE_FLAG( pcPPS->getLoopFilterAcrossTilesEnabledFlag(), "loop_filter_across_tiles_enabled_flag"); #endif -#if JVET_R0247_PPS_LP_FTR_ACROSS_SLICES_FLAG_CLEANUP if (pcPPS->getRectSliceFlag() == 0 || pcPPS->getSingleSlicePerSubPicFlag() || pcPPS->getNumSlicesInPic() > 1) { -#endif WRITE_FLAG( pcPPS->getLoopFilterAcrossSlicesEnabledFlag(), "loop_filter_across_slices_enabled_flag"); -#if JVET_R0247_PPS_LP_FTR_ACROSS_SLICES_FLAG_CLEANUP } -#endif } WRITE_FLAG( pcPPS->getCabacInitPresentFlag() ? 1 : 0, "cabac_init_present_flag" );