From 8d9ea6ab5c74f9f8b0b663c72b61b59589bb4dd3 Mon Sep 17 00:00:00 2001
From: Frank Bossen <fbossen@gmail.com>
Date: Fri, 16 Nov 2018 07:28:21 -0500
Subject: [PATCH] Ensure encoding and decoding of # merge candidates matches
Fixes #114
---
source/Lib/DecoderLib/VLCReader.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 91e65393d7..7c9e0b550e 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
--
GitLab