diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp index 91e65393d7b92070a0fc976a2be6f12dc5517407..7c9e0b550e101ec5921d19f84ba43104494ca8d1 100644 --- a/source/Lib/DecoderLib/VLCReader.cpp +++ b/source/Lib/DecoderLib/VLCReader.cpp @@ -1784,8 +1784,13 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para } if (!pcSlice->isIntra()) { +#if JVET_L0369_SUBBLOCK_MERGE + READ_UVLC(uiCode, "six_minus_max_num_merge_cand"); + pcSlice->setMaxNumMergeCand(MRG_MAX_NUM_CANDS - uiCode); +#else READ_UVLC( uiCode, sps->getSpsNext().getUseSubPuMvp() ? "seven_minus_max_num_merge_cand" : "five_minus_max_num_merge_cand"); pcSlice->setMaxNumMergeCand(MRG_MAX_NUM_CANDS - uiCode - ( sps->getSpsNext().getUseSubPuMvp() ? 0 : 2 ) ); +#endif #if JVET_L0632_AFFINE_MERGE #if JVET_L0369_SUBBLOCK_MERGE