Publish internal changes to GitHub (#624)

K-os · web-flow · commit 25a17d8ba74b · 2025-10-24T11:33:59.000+02:00
* publish internal changes to github

disable LMCS and some bugfixes

* bugfix and config fixes
diff --git a/.gitlab-ci-internal.yml b/.gitlab-ci-internal.yml
@@ -54,6 +54,10 @@ variables:
       - make msvc-arch=${MSVC_ARCH} disable-lto=1 all
       - make msvc-arch=${MSVC_ARCH} disable-lto=1 test
 
+.build_msvc_template:   # this extra template is needed to set msvc-arch=${MSVC_ARCH}
+  extends: .build_only_template_full
+  script:
+    - make msvc-arch=${MSVC_ARCH} enable-lto=${ENABLE_LTO} all
 
 build_gcc5_ubuntu1804:
    extends: .build_only_template_full
@@ -267,12 +271,12 @@ test_vs2022:
   tags:
     - vs2022
 
-test_vs2022_arm64:
-  extends: .build_test_msvc_template
+build_vs2022_arm64:
+  extends: .build_msvc_template
   variables:
      MSVC_ARCH: arm64
   tags:
-    - vs2022-arm
+    - vs2022
 
 test_macos-x86_64:
    extends: .build_test_macos_template
diff --git a/cfg/experimental/lowdelay_fast.cfg b/cfg/experimental/lowdelay_fast.cfg
@@ -94,10 +94,10 @@ ISP                           : 0      # Intra subpartitions: 0: disabled, 1: en
 JointCbCr                     : 1      # Joint coding of chroma residuals: 0: disabled, 1: enabled
 LFNST                         : 1      # LFNST: 0: disabled, 1: enabled
 LMChroma                      : 1      # LMChroma prediction: 0: disabled, 1: enabled
-LMCSEnable                    : 2      # LMCS: 0: disable, 1:enable, 2: use SCC detection to disable for screen coded content
-LMCSOffset                    : 1      # chroma residual scaling offset
-LMCSSignalType                : 0      # Input signal type: 0:SDR, 1:HDR-PQ, 2:HDR-HLG
-LMCSUpdateCtrl                : 2      # LMCS model update control: 0:RA, 1:AI, 2:LDB/LDP
+LMCSEnable                    : 0      # deprecated
+LMCSOffset                    : 0      # deprecated
+LMCSSignalType                : 0      # deprecated
+LMCSUpdateCtrl                : 0      # deprecated
 MCTF                          : 2      # GOP based temporal filter (0:off, 1:filter all frames, 2:use SCC detection to disable for screen coded content)
 MCTFSpeed                     : 3      # MCTF Fast Mode (0:best quality .. 4:fastest operation)
 MCTFFutureReference           : 0      # Enable referencing of future frames in the GOP based temporal filter. This is typically disabled for Low Delay configurations
diff --git a/cfg/experimental/lowdelay_faster.cfg b/cfg/experimental/lowdelay_faster.cfg
@@ -94,10 +94,10 @@ ISP                           : 0      # Intra subpartitions: 0: disabled, 1: en
 JointCbCr                     : 0      # Joint coding of chroma residuals: 0: disabled, 1: enabled
 LFNST                         : 0      # LFNST: 0: disabled, 1: enabled
 LMChroma                      : 1      # LMChroma prediction: 0: disabled, 1: enabled
-LMCSEnable                    : 0      # LMCS: 0: disable, 1:enable, 2: use SCC detection to disable for screen coded content
-LMCSOffset                    : 1      # chroma residual scaling offset
-LMCSSignalType                : 0      # Input signal type: 0:SDR, 1:HDR-PQ, 2:HDR-HLG
-LMCSUpdateCtrl                : 2      # LMCS model update control: 0:RA, 1:AI, 2:LDB/LDP
+LMCSEnable                    : 0      # deprecated
+LMCSOffset                    : 0      # deprecated
+LMCSSignalType                : 0      # deprecated
+LMCSUpdateCtrl                : 0      # deprecated
 MCTF                          : 2      # GOP based temporal filter (0:off, 1:filter all frames, 2:use SCC detection to disable for screen coded content)
 MCTFSpeed                     : 4      # MCTF Fast Mode (0:best quality .. 4:fastest operation)
 MCTFFutureReference           : 0      # Enable referencing of future frames in the GOP based temporal filter. This is typically disabled for Low Delay configurations
diff --git a/cfg/experimental/lowdelay_medium.cfg b/cfg/experimental/lowdelay_medium.cfg
@@ -93,10 +93,10 @@ ISP                           : 3      # Intra subpartitions: 0: disabled, 1: en
 JointCbCr                     : 1      # Joint coding of chroma residuals: 0: disabled, 1: enabled
 LFNST                         : 1      # LFNST: 0: disabled, 1: enabled
 LMChroma                      : 1      # LMChroma prediction: 0: disabled, 1: enabled
-LMCSEnable                    : 2      # LMCS: 0: disable, 1:enable, 2: use SCC detection to disable for screen coded content
-LMCSOffset                    : 1      # chroma residual scaling offset
-LMCSSignalType                : 0      # Input signal type: 0:SDR, 1:HDR-PQ, 2:HDR-HLG
-LMCSUpdateCtrl                : 2      # LMCS model update control: 0:RA, 1:AI, 2:LDB/LDP
+LMCSEnable                    : 0      # deprecated
+LMCSOffset                    : 0      # deprecated
+LMCSSignalType                : 0      # deprecated
+LMCSUpdateCtrl                : 0      # deprecated
 MCTF                          : 2      # GOP based temporal filter (0:off, 1:filter all frames, 2:use SCC detection to disable for screen coded content)
 MCTFSpeed                     : 2      # MCTF Fast Mode (0:best quality .. 4:fastest operation)
 MCTFFutureReference           : 0      # Enable referencing of future frames in the GOP based temporal filter. This is typically disabled for Low Delay configurations
diff --git a/cfg/experimental/lowdelay_slow.cfg b/cfg/experimental/lowdelay_slow.cfg
@@ -93,10 +93,10 @@ ISP                           : 3      # Intra subpartitions: 0: disabled, 1: en
 JointCbCr                     : 1      # Joint coding of chroma residuals: 0: disabled, 1: enabled
 LFNST                         : 1      # LFNST: 0: disabled, 1: enabled
 LMChroma                      : 1      # LMChroma prediction: 0: disabled, 1: enabled
-LMCSEnable                    : 2      # LMCS: 0: disable, 1:enable, 2: use SCC detection to disable for screen coded content
-LMCSOffset                    : 1      # chroma residual scaling offset
-LMCSSignalType                : 0      # Input signal type: 0:SDR, 1:HDR-PQ, 2:HDR-HLG
-LMCSUpdateCtrl                : 2      # LMCS model update control: 0:RA, 1:AI, 2:LDB/LDP
+LMCSEnable                    : 0      # deprecated
+LMCSOffset                    : 0      # deprecated
+LMCSSignalType                : 0      # deprecated
+LMCSUpdateCtrl                : 0      # deprecated
 MCTF                          : 2      # GOP based temporal filter (0:off, 1:filter all frames, 2:use SCC detection to disable for screen coded content)
 MCTFSpeed                     : 2      # MCTF Fast Mode (0:best quality .. 4:fastest operation)
 MCTFFutureReference           : 0      # Enable referencing of future frames in the GOP based temporal filter. This is typically disabled for Low Delay configurations
diff --git a/cfg/experimental/lowdelay_slower.cfg b/cfg/experimental/lowdelay_slower.cfg
@@ -93,10 +93,10 @@ ISP                           : 1      # Intra subpartitions: 0: disabled, 1: en
 JointCbCr                     : 1      # Joint coding of chroma residuals: 0: disabled, 1: enabled
 LFNST                         : 1      # LFNST: 0: disabled, 1: enabled
 LMChroma                      : 1      # LMChroma prediction: 0: disabled, 1: enabled
-LMCSEnable                    : 2      # LMCS: 0: disable, 1:enable, 2: use SCC detection to disable for screen coded content
-LMCSOffset                    : 1      # chroma residual scaling offset
-LMCSSignalType                : 0      # Input signal type: 0:SDR, 1:HDR-PQ, 2:HDR-HLG
-LMCSUpdateCtrl                : 2      # LMCS model update control: 0:RA, 1:AI, 2:LDB/LDP
+LMCSEnable                    : 0      # deprecated
+LMCSOffset                    : 0      # deprecated
+LMCSSignalType                : 0      # deprecated
+LMCSUpdateCtrl                : 0      # deprecated
 MCTF                          : 2      # GOP based temporal filter (0:off, 1:filter all frames, 2:use SCC detection to disable for screen coded content)
 MCTFSpeed                     : 2      # MCTF Fast Mode (0:best quality .. 4:fastest operation)
 MCTFFutureReference           : 0      # Enable referencing of future frames in the GOP based temporal filter. This is typically disabled for Low Delay configurations
diff --git a/cfg/randomaccess_fast.cfg b/cfg/randomaccess_fast.cfg
@@ -83,10 +83,10 @@ ISP                           : 0      # Intra subpartitions: 0: disabled, 1: en
 JointCbCr                     : 1      # Joint coding of chroma residuals: 0: disabled, 1: enabled
 LFNST                         : 1      # LFNST: 0: disabled, 1: enabled
 LMChroma                      : 1      # LMChroma prediction: 0: disabled, 1: enabled
-LMCSEnable                    : 2      # LMCS: 0: disable, 1:enable, 2: use SCC detection to disable for screen coded content
-LMCSOffset                    : 6      # chroma residual scaling offset
-LMCSSignalType                : 0      # Input signal type: 0:SDR, 1:HDR-PQ, 2:HDR-HLG
-LMCSUpdateCtrl                : 0      # LMCS model update control: 0:RA, 1:AI, 2:LDB/LDP
+LMCSEnable                    : 0      # deprecated
+LMCSOffset                    : 0      # deprecated
+LMCSSignalType                : 0      # deprecated
+LMCSUpdateCtrl                : 0      # deprecated
 MCTF                          : 2      # GOP based temporal filter (0:off, 1:filter all frames, 2:use SCC detection to disable for screen coded content)
 MCTFSpeed                     : 3      # MCTF Fast Mode (0:best quality .. 4:fastest operation)
 MCTFFutureReference           : 1      # Enable referencing of future frames in the GOP based temporal filter. This is typically disabled for Low Delay configurations
diff --git a/cfg/randomaccess_faster.cfg b/cfg/randomaccess_faster.cfg
@@ -82,10 +82,10 @@ ISP                           : 0      # Intra subpartitions: 0: disabled, 1: en
 JointCbCr                     : 0      # Joint coding of chroma residuals: 0: disabled, 1: enabled
 LFNST                         : 0      # LFNST: 0: disabled, 1: enabled
 LMChroma                      : 1      # LMChroma prediction: 0: disabled, 1: enabled
-LMCSEnable                    : 0      # LMCS: 0: disable, 1:enable, 2: use SCC detection to disable for screen coded content
-LMCSOffset                    : 6      # chroma residual scaling offset
-LMCSSignalType                : 0      # Input signal type: 0:SDR, 1:HDR-PQ, 2:HDR-HLG
-LMCSUpdateCtrl                : 0      # LMCS model update control: 0:RA, 1:AI, 2:LDB/LDP
+LMCSEnable                    : 0      # deprecated
+LMCSOffset                    : 0      # deprecated
+LMCSSignalType                : 0      # deprecated
+LMCSUpdateCtrl                : 0      # deprecated
 MCTF                          : 2      # GOP based temporal filter (0:off, 1:filter all frames, 2:use SCC detection to disable for screen coded content)
 MCTFSpeed                     : 4      # MCTF Fast Mode (0:best quality .. 4:fastest operation)
 MCTFFutureReference           : 1      # Enable referencing of future frames in the GOP based temporal filter. This is typically disabled for Low Delay configurations
diff --git a/cfg/randomaccess_medium.cfg b/cfg/randomaccess_medium.cfg
@@ -83,10 +83,10 @@ ISP                           : 3      # Intra subpartitions: 0: disabled, 1: en
 JointCbCr                     : 1      # Joint coding of chroma residuals: 0: disabled, 1: enabled
 LFNST                         : 1      # LFNST: 0: disabled, 1: enabled
 LMChroma                      : 1      # LMChroma prediction: 0: disabled, 1: enabled
-LMCSEnable                    : 2      # LMCS: 0: disable, 1:enable, 2: use SCC detection to disable for screen coded content
-LMCSOffset                    : 6      # chroma residual scaling offset
-LMCSSignalType                : 0      # Input signal type: 0:SDR, 1:HDR-PQ, 2:HDR-HLG
-LMCSUpdateCtrl                : 0      # LMCS model update control: 0:RA, 1:AI, 2:LDB/LDP
+LMCSEnable                    : 0      # deprecated
+LMCSOffset                    : 0      # deprecated
+LMCSSignalType                : 0      # deprecated
+LMCSUpdateCtrl                : 0      # deprecated
 MCTF                          : 2      # GOP based temporal filter (0:off, 1:filter all frames, 2:use SCC detection to disable for screen coded content)
 MCTFSpeed                     : 2      # MCTF Fast Mode (0:best quality .. 4:fastest operation)
 MCTFFutureReference           : 1      # Enable referencing of future frames in the GOP based temporal filter. This is typically disabled for Low Delay configurations
diff --git a/cfg/randomaccess_medium_lowDecEnergy.cfg b/cfg/randomaccess_medium_lowDecEnergy.cfg
@@ -84,10 +84,10 @@ ISP                           : 0      # Intra subpartitions: 0: disabled, 1: en
 JointCbCr                     : 1      # Joint coding of chroma residuals: 0: disabled, 1: enabled
 LFNST                         : 0      # LFNST: 0: disabled, 1: enabled
 LMChroma                      : 1      # LMChroma prediction: 0: disabled, 1: enabled
-LMCSEnable                    : 0      # LMCS: 0: disable, 1:enable, 2: use SCC detection to disable for screen coded content
-LMCSOffset                    : 6      # chroma residual scaling offset
-LMCSSignalType                : 0      # Input signal type: 0:SDR, 1:HDR-PQ, 2:HDR-HLG
-LMCSUpdateCtrl                : 0      # LMCS model update control: 0:RA, 1:AI, 2:LDB/LDP
+LMCSEnable                    : 0      # deprecated
+LMCSOffset                    : 0      # deprecated
+LMCSSignalType                : 0      # deprecated
+LMCSUpdateCtrl                : 0      # deprecated
 MCTF                          : 2      # GOP based temporal filter (0:off, 1:filter all frames, 2:use SCC detection to disable for screen coded content)
 MCTFSpeed                     : 2      # MCTF Fast Mode (0:best quality .. 4:fastest operation)
 MCTFFutureReference           : 1      # Enable referencing of future frames in the GOP based temporal filter. This is typically disabled for Low Delay configurations
diff --git a/cfg/randomaccess_slow.cfg b/cfg/randomaccess_slow.cfg
@@ -81,10 +81,10 @@ ISP                           : 3      # Intra subpartitions: 0: disabled, 1: en
 JointCbCr                     : 1      # Joint coding of chroma residuals: 0: disabled, 1: enabled
 LFNST                         : 1      # LFNST: 0: disabled, 1: enabled
 LMChroma                      : 1      # LMChroma prediction: 0: disabled, 1: enabled
-LMCSEnable                    : 2      # LMCS: 0: disable, 1:enable, 2: use SCC detection to disable for screen coded content
-LMCSOffset                    : 6      # chroma residual scaling offset
-LMCSSignalType                : 0      # Input signal type: 0:SDR, 1:HDR-PQ, 2:HDR-HLG
-LMCSUpdateCtrl                : 0      # LMCS model update control: 0:RA, 1:AI, 2:LDB/LDP
+LMCSEnable                    : 0      # deprecated
+LMCSOffset                    : 0      # deprecated
+LMCSSignalType                : 0      # deprecated
+LMCSUpdateCtrl                : 0      # deprecated
 MCTF                          : 2      # GOP based temporal filter (0:off, 1:filter all frames, 2:use SCC detection to disable for screen coded content)
 MCTFSpeed                     : 2      # MCTF Fast Mode (0:best quality .. 4:fastest operation)
 MCTFFutureReference           : 1      # Enable referencing of future frames in the GOP based temporal filter. This is typically disabled for Low Delay configurations
diff --git a/cfg/randomaccess_slower.cfg b/cfg/randomaccess_slower.cfg
@@ -81,10 +81,10 @@ ISP                           : 1      # Intra subpartitions: 0: disabled, 1: en
 JointCbCr                     : 1      # Joint coding of chroma residuals: 0: disabled, 1: enabled
 LFNST                         : 1      # LFNST: 0: disabled, 1: enabled
 LMChroma                      : 1      # LMChroma prediction: 0: disabled, 1: enabled
-LMCSEnable                    : 2      # LMCS: 0: disable, 1:enable, 2: use SCC detection to disable for screen coded content
-LMCSOffset                    : 6      # chroma residual scaling offset
-LMCSSignalType                : 0      # Input signal type: 0:SDR, 1:HDR-PQ, 2:HDR-HLG
-LMCSUpdateCtrl                : 0      # LMCS model update control: 0:RA, 1:AI, 2:LDB/LDP
+LMCSEnable                    : 0      # deprecated
+LMCSOffset                    : 0      # deprecated
+LMCSSignalType                : 0      # deprecated
+LMCSUpdateCtrl                : 0      # deprecated
 MCTF                          : 2      # GOP based temporal filter (0:off, 1:filter all frames, 2:use SCC detection to disable for screen coded content)
 MCTFSpeed                     : 2      # MCTF Fast Mode (0:best quality .. 4:fastest operation)
 MCTFFutureReference           : 1      # Enable referencing of future frames in the GOP based temporal filter. This is typically disabled for Low Delay configurations
diff --git a/cfg/randomaccess_tooltest.cfg b/cfg/randomaccess_tooltest.cfg
@@ -81,10 +81,10 @@ ISP                           : 2      # Intra subpartitions: 0: disabled, 1: en
 JointCbCr                     : 1      # Joint coding of chroma residuals: 0: disabled, 1: enabled
 LFNST                         : 1      # LFNST: 0: disabled, 1: enabled
 LMChroma                      : 1      # LMChroma prediction: 0: disabled, 1: enabled
-LMCSEnable                    : 2      # LMCS: 0: disable, 1:enable, 2: use SCC detection to disable for screen coded content
-LMCSOffset                    : 6      # chroma residual scaling offset
-LMCSSignalType                : 0      # Input signal type: 0:SDR, 1:HDR-PQ, 2:HDR-HLG
-LMCSUpdateCtrl                : 0      # LMCS model update control: 0:RA, 1:AI, 2:LDB/LDP
+LMCSEnable                    : 0      # deprecated
+LMCSOffset                    : 0      # deprecated
+LMCSSignalType                : 0      # deprecated
+LMCSUpdateCtrl                : 0      # deprecated
 MCTF                          : 2      # GOP based temporal filter (0:off, 1:filter all frames, 2:use SCC detection to disable for screen coded content)
 MCTFSpeed                     : 2      # MCTF Fast Mode (0:best quality .. 4:fastest operation)
 MCTFFutureReference           : 1      # Enable referencing of future frames in the GOP based temporal filter. This is typically disabled for Low Delay configurations
diff --git a/source/Lib/CommonLib/InterpolationFilter.cpp b/source/Lib/CommonLib/InterpolationFilter.cpp
@@ -181,11 +181,10 @@ InterpolationFilter::InterpolationFilter()
   m_filterHor[2][1][0] = filter<2, false, true, false>;
   m_filterHor[2][1][1] = filter<2, false, true, true>;
 
-  // for scalar implementation, use the 8-tap filter, as the 6-tap filter is 0-padded
-  m_filterHor[3][0][0] = filter<8, false, false, false>;
-  m_filterHor[3][0][1] = filter<8, false, false, true>;
-  m_filterHor[3][1][0] = filter<8, false, true, false>;
-  m_filterHor[3][1][1] = filter<8, false, true, true>;
+  m_filterHor[3][0][0] = filter<6, false, false, false>;
+  m_filterHor[3][0][1] = filter<6, false, false, true>;
+  m_filterHor[3][1][0] = filter<6, false, true, false>;
+  m_filterHor[3][1][1] = filter<6, false, true, true>;
 
   m_filterVer[0][0][0] = filter<8, true, false, false>;
   m_filterVer[0][0][1] = filter<8, true, false, true>;
@@ -202,11 +201,10 @@ InterpolationFilter::InterpolationFilter()
   m_filterVer[2][1][0] = filter<2, true, true, false>;
   m_filterVer[2][1][1] = filter<2, true, true, true>;
 
-  // for scalar implementation, use the 8-tap filter, as the 6-tap filter is 0-padded
-  m_filterVer[3][0][0] = filter<8, true, false, false>;
-  m_filterVer[3][0][1] = filter<8, true, false, true>;
-  m_filterVer[3][1][0] = filter<8, true, true, false>;
-  m_filterVer[3][1][1] = filter<8, true, true, true>;
+  m_filterVer[3][0][0] = filter<6, true, false, false>;
+  m_filterVer[3][0][1] = filter<6, true, false, true>;
+  m_filterVer[3][1][0] = filter<6, true, true, false>;
+  m_filterVer[3][1][1] = filter<6, true, true, true>;
 
   m_filterCopy[0][0]   = filterCopy<false, false>;
   m_filterCopy[0][1]   = filterCopy<false, true>;
@@ -360,6 +358,11 @@ void InterpolationFilter::filter(const ClpRng& clpRng, Pel const *src, int srcSt
 {
   int row, col;
 
+  if( N == 6 )
+  {
+    coeff++;
+  }
+
   Pel c[8];
   c[0] = coeff[0];
   c[1] = coeff[1];
diff --git a/source/Lib/EncoderLib/InterSearch.cpp b/source/Lib/EncoderLib/InterSearch.cpp
diff --git a/source/Lib/apputils/VVEncAppCfg.h b/source/Lib/apputils/VVEncAppCfg.h
diff --git a/source/Lib/vvenc/vvencCfg.cpp b/source/Lib/vvenc/vvencCfg.cpp
