From 570144e9fd03f17d23a134dddc1abd207e2a026d Mon Sep 17 00:00:00 2001
From: Franck Galpin <franck.galpin@interdigital.com>
Date: Wed, 24 Apr 2024 08:03:39 +0000
Subject: [PATCH] modify default sadl, modify default lop3 model, adapt HOP cfg
---
Makefile | 2 +-
cfg/nn-based/HOP.cfg | 2 +-
sadl | 2 +-
source/App/DecoderApp/DecAppCfg.cpp | 2 +-
source/App/EncoderApp/EncAppCfg.cpp | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index c406ac3d3..051c5ac52 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ BUILD_SCRIPT := $(CURDIR)/cmake/CMakeBuild/bin/cmake.py
TARGETS := CommonLib DecoderAnalyserApp DecoderAnalyserLib DecoderApp DecoderLib
TARGETS += EncoderApp EncoderLib Utilities SEIRemovalApp StreamMergeApp
-SADL_HASH := "v7rc1" # hard coded because of windows $(shell git submodule status | grep sadl | cut -d' ' -f2)
+SADL_HASH := "46a16e25178eb5e57d6aa57dfc76cd465f530e66" # hard coded because of windows $(shell git submodule status | grep sadl | cut -d' ' -f2)
ifeq ($(OS),Windows_NT)
ifneq ($(MSYSTEM),)
diff --git a/cfg/nn-based/HOP.cfg b/cfg/nn-based/HOP.cfg
index a110f1ec6..e872d5848 100644
--- a/cfg/nn-based/HOP.cfg
+++ b/cfg/nn-based/HOP.cfg
@@ -2,4 +2,4 @@ NnlfOption : 1
NnlfModelName : models/nnlf_hop3_model_int16.sadl
CbQpOffset : 1
CrQpOffset : 1
-
+NnlfTransInput : 0
diff --git a/sadl b/sadl
index 0f7052747..46a16e251 160000
--- a/sadl
+++ b/sadl
@@ -1 +1 @@
-Subproject commit 0f7052747f06381fccfd8dcad5ae2215f08588b1
+Subproject commit 46a16e25178eb5e57d6aa57dfc76cd465f530e66
diff --git a/source/App/DecoderApp/DecAppCfg.cpp b/source/App/DecoderApp/DecAppCfg.cpp
index e18359d7d..aeeff0fcd 100644
--- a/source/App/DecoderApp/DecAppCfg.cpp
+++ b/source/App/DecoderApp/DecAppCfg.cpp
@@ -81,7 +81,7 @@ bool DecAppCfg::parseCfg( int argc, char* argv[] )
("DumpBasename", m_dumpBasename, string(""), "basename for data dumping\n")
#endif
#if NN_LF_UNIFIED
- ("NnlfModelName", m_nnModel[NnModel::LOP_UNIFIED_FILTER], string("models/nnlf_lop2_model_int16.sadl"), "loop filter model name\n")
+ ("NnlfModelName", m_nnModel[NnModel::LOP_UNIFIED_FILTER], string("models/nnlf_lop3_model_int16.sadl"), "loop filter model name\n")
#if NN_LF_FORCE_USE
( "NnlfUnifiedDebugOption", m_nnlfDebugOption, 0, "Option used to debug stage 1 model. 0: default, 1: apply only on I slice, 2: apply on all slices using I type as input" )
#endif
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index c3f067ebd..1ea434a08 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -1174,7 +1174,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("AlignCABACBeforeBypass", m_cabacBypassAlignmentEnabledFlag, false, "Align the CABAC engine to a defined fraction of a bit prior to coding bypass data. Must be 1 in high bit rate profile, 0 otherwise")
#if NN_COMMON_SPS
("NnlfOption", m_nnlfOption, 1, "NN-based in-loop filter option (0:disable nnlf, 1: enable unified nnlf, [legacy: 10: enable nnlf-0, 11: enable nnlf-1, 12: enable nnlf-LC])")
- ("NnlfModelName", m_nnModel[NnModel::LOP_UNIFIED_FILTER], string("models/nnlf_lop2_model_int16.sadl"), "unified nnlf model name." )
+ ("NnlfModelName", m_nnModel[NnModel::LOP_UNIFIED_FILTER], string("models/nnlf_lop3_model_int16.sadl"), "unified nnlf model name." )
#endif
#if NN_LF_UNIFIED
( "NnlfBlockSize", m_nnlfBlockSize, 128u, "Base inference size of NN-based in-loop filter")
--
GitLab