From 98f280c6cd4d4444a77dfd8787a974e1923d6cb7 Mon Sep 17 00:00:00 2001
From: Xiang Li <xlxiangli@tencent.com>
Date: Fri, 16 Nov 2018 15:09:35 -0800
Subject: [PATCH] Reduce the merge list size from 6 to 5 according to
 JVET-L0369

---
 cfg/encoder_intra_vtm.cfg        | 2 +-
 cfg/encoder_lowdelay_P_vtm.cfg   | 2 +-
 cfg/encoder_lowdelay_vtm.cfg     | 2 +-
 cfg/encoder_randomaccess_vtm.cfg | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cfg/encoder_intra_vtm.cfg b/cfg/encoder_intra_vtm.cfg
index 100dc175..64f49711 100644
--- a/cfg/encoder_intra_vtm.cfg
+++ b/cfg/encoder_intra_vtm.cfg
@@ -106,7 +106,7 @@ EMT                          : 1
 EMTFast                      : 1
 Affine                       : 1
 SubPuMvp                     : 1
-MaxNumMergeCand              : 6
+MaxNumMergeCand              : 5
 LMChroma                     : 1      # use CCLM only
 DepQuant                     : 1
 IMV                          : 2
diff --git a/cfg/encoder_lowdelay_P_vtm.cfg b/cfg/encoder_lowdelay_P_vtm.cfg
index 60efe607..2d823be2 100644
--- a/cfg/encoder_lowdelay_P_vtm.cfg
+++ b/cfg/encoder_lowdelay_P_vtm.cfg
@@ -122,7 +122,7 @@ EMT                          : 1
 EMTFast                      : 1
 Affine                       : 1
 SubPuMvp                     : 1
-MaxNumMergeCand              : 6
+MaxNumMergeCand              : 5
 LMChroma                     : 1      # use CCLM only
 DepQuant                     : 1
 IMV                          : 2
diff --git a/cfg/encoder_lowdelay_vtm.cfg b/cfg/encoder_lowdelay_vtm.cfg
index 9612eada..2a4bb97a 100644
--- a/cfg/encoder_lowdelay_vtm.cfg
+++ b/cfg/encoder_lowdelay_vtm.cfg
@@ -122,7 +122,7 @@ EMT                          : 1
 EMTFast                      : 1
 Affine                       : 1
 SubPuMvp                     : 1
-MaxNumMergeCand              : 6
+MaxNumMergeCand              : 5
 LMChroma                     : 1      # use CCLM only
 DepQuant                     : 1
 IMV                          : 2
diff --git a/cfg/encoder_randomaccess_vtm.cfg b/cfg/encoder_randomaccess_vtm.cfg
index 8dbf07b8..ca25bfea 100644
--- a/cfg/encoder_randomaccess_vtm.cfg
+++ b/cfg/encoder_randomaccess_vtm.cfg
@@ -136,7 +136,7 @@ EMT                          : 1
 EMTFast                      : 1
 Affine                       : 1
 SubPuMvp                     : 1
-MaxNumMergeCand              : 6
+MaxNumMergeCand              : 5
 LMChroma                     : 1      # use CCLM only
 DepQuant                     : 1
 IMV                          : 2
-- 
GitLab