From 39b6b1fcc97e7b9db6f1e221f148166d0cfd41d3 Mon Sep 17 00:00:00 2001
From: Liqiang Wang <liqiangwang@tencent.com>
Date: Mon, 7 Nov 2022 10:29:47 +0800
Subject: [PATCH] Restrict EncNnlfOpt to only be used when NNLF is enabled.
---
source/App/EncoderApp/EncAppCfg.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 875d6934f3..eb409f7ff1 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -2301,6 +2301,10 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
}
#endif
+#if JVET_AB0068_RD
+ m_encNnlfOpt = m_nnlfSet1 ? m_encNnlfOpt : false;
+#endif
+
if ( m_alf )
{
CHECK( m_maxNumAlfAlternativesChroma < 1 || m_maxNumAlfAlternativesChroma > MAX_NUM_ALF_ALTERNATIVES_CHROMA, std::string("The maximum number of ALF Chroma filter alternatives must be in the range (1-") + std::to_string(MAX_NUM_ALF_ALTERNATIVES_CHROMA) + std::string (", inclusive)") );
--
GitLab