From 7cf7f162f49e8f9f66a6c254d9920e586f13e574 Mon Sep 17 00:00:00 2001
From: Tangi Poirier <tangi.poirier@interdigital.com>
Date: Wed, 4 Mar 2020 12:43:51 +0100
Subject: [PATCH] Fix #919: Add check parameter for combination of Affine Amvr
and IMV
---
source/App/EncoderApp/EncAppCfg.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 52739b85d..fecbcd9ea 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -3664,6 +3664,12 @@ bool EncAppCfg::xCheckParameter()
xConfirmPara(m_preferredTransferCharacteristics > 255, "transfer_characteristics_idc should not be greater than 255.");
#endif
xConfirmPara( unsigned(m_ImvMode) > 1, "ImvMode exceeds range (0 to 1)" );
+#if JVET_Q0444_AMVR_SIGNALLING
+ if (m_AffineAmvr)
+ {
+ xConfirmPara(!m_ImvMode, "AffineAmvr cannot be used when IMV is disabled.");
+ }
+#endif
xConfirmPara( m_decodeBitstreams[0] == m_bitstreamFileName, "Debug bitstream and the output bitstream cannot be equal.\n" );
xConfirmPara( m_decodeBitstreams[1] == m_bitstreamFileName, "Decode2 bitstream and the output bitstream cannot be equal.\n" );
xConfirmPara(unsigned(m_LMChroma) > 1, "LMMode exceeds range (0 to 1)");
--
GitLab