From 0058bd70c4c7739b72e91698fe8b980b7fbe8370 Mon Sep 17 00:00:00 2001
From: Du Liu <du.liu@ericsson.com>
Date: Tue, 14 Feb 2023 15:30:53 +0100
Subject: [PATCH] Add macro JVET_AC0089_COMBINE_INTRA_INTER for the
modification of default filer set 1 paths.
---
source/App/EncoderApp/EncAppCfg.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index ac2a63060b..e6fedbfa70 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -1440,10 +1440,17 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
( "NnlfSet1InferSizeBase", m_nnlfSet1InferSizeBase, 128u, "Base inference size of NN-based loop filter set 1" )
( "NnlfSet1InferSizeExtension", m_nnlfSet1InferSizeExtension, 8u, "Extension of inference size of NN-based loop filter set 1" )
( "NnlfSet1MaxNumParams", m_nnlfSet1MaxNumParams, 3u, "Number of conditional parameters of NN-based loop filter set 1" )
+#if JVET_AC0089_COMBINE_INTRA_INTER
( "NnlfSet1InterLumaModel", m_nnlfSet1InterLumaModelName, string("models/NnlfSet1_CombinedIntraInter/NnlfSet1_LumaCNNFilter_int16.sadl"), "NnlfSet1 luma model name")
( "NnlfSet1InterChromaModel", m_nnlfSet1InterChromaModelName, string("models/NnlfSet1_CombinedIntraInter/NnlfSet1_ChromaCNNFilter_int16.sadl"), "NnlfSet1 chroma model name")
( "NnlfSet1IntraLumaModel", m_nnlfSet1IntraLumaModelName, string("models/NnlfSet1_CombinedIntraInter/NnlfSet1_LumaCNNFilter_int16.sadl"), "NnlfSet1 luma model name")
( "NnlfSet1IntraChromaModel", m_nnlfSet1IntraChromaModelName, string("models/NnlfSet1_CombinedIntraInter/NnlfSet1_ChromaCNNFilter_int16.sadl"), "NnlfSet1 chroma model name")
+#else
+ ( "NnlfSet1InterLumaModel", m_nnlfSet1InterLumaModelName, string("models/NnlfSet1_LumaCNNFilter_InterSlice_int16.sadl"), "NnlfSet1 inter luma model name")
+ ( "NnlfSet1InterChromaModel", m_nnlfSet1InterChromaModelName, string("models/NnlfSet1_ChromaCNNFilter_InterSlice_int16.sadl"), "NnlfSet1 inter chroma model name")
+ ( "NnlfSet1IntraLumaModel", m_nnlfSet1IntraLumaModelName, string("models/NnlfSet1_LumaCNNFilter_IntraSlice_int16.sadl"), "NnlfSet1 intra luma model name")
+ ( "NnlfSet1IntraChromaModel", m_nnlfSet1IntraChromaModelName, string("models/NnlfSet1_ChromaCNNFilter_IntraSlice_int16.sadl"), "NnlfSet1 intra chroma model name")
+#endif
#if JVET_AC0177_MULTI_FRAME
( "NnlfSet1AlternativeInterLumaModel", m_nnlfSet1AlternativeInterLumaModelName, string("models/NnlfSet1_LumaCNNFilter_InterSlice_MultiframePrior_Tid345_int16.sadl"), "NnlfSet1 alternative inter luma model name")
( "NnlfSet1Multiframe", m_nnlfSet1Multiframe, false, "Input multiple frames in NN-based loop filter set 1" )
--
GitLab