diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp index 68cd9f54c87af43bcc8634d9f5d1a05903122d9a..6f841d07839703193ebe8c412a3ab1d6b0cac5dc 100644 --- a/source/Lib/DecoderLib/VLCReader.cpp +++ b/source/Lib/DecoderLib/VLCReader.cpp @@ -2530,7 +2530,7 @@ void HLSyntaxReader::alfFilter( AlfSliceParam& alfSliceParam, const bool isChrom // derive maxGolombIdx AlfFilterShape alfShape( isChroma ? 5 : 7 ); const int maxGolombIdx = AdaptiveLoopFilter::getMaxGolombIdx( alfShape.filterType ); - READ_UVLC( code, "min_golomb_order" ); + READ_UVLC( code, isChroma ? "alf_chroma_min_eg_order_minus1" : "alf_luma_min_eg_order_minus1" ); int kMin = code + 1; static int kMinTab[MAX_NUM_ALF_COEFF]; @@ -2539,7 +2539,7 @@ void HLSyntaxReader::alfFilter( AlfSliceParam& alfSliceParam, const bool isChrom for( int idx = 0; idx < maxGolombIdx; idx++ ) { - READ_FLAG( code, "golomb_order_increase_flag" ); + READ_FLAG( code, isChroma ? "alf_chroma_eg_order_increase_flag" : "alf_luma_eg_order_increase_flag" ); CHECK( code > 1, "Wrong golomb_order_increase_flag" ); kMinTab[idx] = kMin + code; kMin = kMinTab[idx]; diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp index 7632e3ce4506ee1cf96fa44faf4979e23204f827..25441e7174817b8e824f66b76d132d65971ff94f 100644 --- a/source/Lib/EncoderLib/VLCWriter.cpp +++ b/source/Lib/EncoderLib/VLCWriter.cpp @@ -1824,13 +1824,13 @@ void HLSWriter::alfFilter( const AlfSliceParam& alfSliceParam, const bool isChro int kMin = EncAdaptiveLoopFilter::getGolombKMin( alfShape, numFilters, kMinTab, bitsCoeffScan ); // Golomb parameters - WRITE_UVLC( kMin - 1, "min_golomb_order" ); + WRITE_UVLC( kMin - 1, isChroma ? "alf_chroma_min_eg_order_minus1" : "alf_luma_min_eg_order_minus1" ); for( int idx = 0; idx < maxGolombIdx; idx++ ) { bool golombOrderIncreaseFlag = ( kMinTab[idx] != kMin ) ? true : false; CHECK( !( kMinTab[idx] <= kMin + 1 ), "ALF Golomb parameter not consistent" ); - WRITE_FLAG( golombOrderIncreaseFlag, "golomb_order_increase_flag" ); + WRITE_FLAG( golombOrderIncreaseFlag, isChroma ? "alf_chroma_eg_order_increase_flag" : "alf_luma_eg_order_increase_flag" ); kMin = kMinTab[idx]; }