From 81cc3a2003d65ba48cbb62c38f5b00d81b2eba9c Mon Sep 17 00:00:00 2001
From: Guichun Li <guichunli@tencent.com>
Date: Thu, 4 Apr 2019 20:11:25 -0700
Subject: [PATCH] Keep the warning messages
---
source/App/EncoderApp/EncAppCfg.cpp | 2 --
1 file changed, 2 deletions(-)
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 1fd15e3d68..294b46d88f 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -2187,7 +2187,6 @@ bool EncAppCfg::xCheckParameter()
msg( WARNING, "** advanced sup-pu temporal merging modes are enabled. **\n" );
msg( WARNING, "****************************************************************************\n" );
}
-#if !JVET_N0448_N0380
else if( m_SubPuMvpMode != 0 && m_maxNumMergeCand < 6 )
{
msg( WARNING, "****************************************************************************\n" );
@@ -2195,7 +2194,6 @@ bool EncAppCfg::xCheckParameter()
msg( WARNING, "** an advanced sup-pu temporal merging mode is enabled. **\n" );
msg( WARNING, "****************************************************************************\n" );
}
-#endif
xConfirmPara( m_iQP < -6 * (m_internalBitDepth[CHANNEL_TYPE_LUMA] - 8) || m_iQP > MAX_QP, "QP exceeds supported range (-QpBDOffsety to 63)" );
#if W0038_DB_OPT
xConfirmPara( m_deblockingFilterMetric!=0 && (m_bLoopFilterDisable || m_loopFilterOffsetInPPS), "If DeblockingFilterMetric is non-zero then both LoopFilterDisable and LoopFilterOffsetInPPS must be 0");
--
GitLab