Skip to content

Commit ce8a364

Browse files
K-osK-os
committed
bugfix and config fixes
1 parent 5047144 commit ce8a364

File tree

7 files changed

+40
-33
lines changed

7 files changed

+40
-33
lines changed

‎.gitlab-ci-internal.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ variables:
5454
- make msvc-arch=${MSVC_ARCH} disable-lto=1 all
5555
- make msvc-arch=${MSVC_ARCH} disable-lto=1 test
5656

57+
.build_msvc_template: # this extra template is needed to set msvc-arch=${MSVC_ARCH}
58+
extends: .build_only_template_full
59+
script:
60+
- make msvc-arch=${MSVC_ARCH} enable-lto=${ENABLE_LTO} all
5761

5862
build_gcc5_ubuntu1804:
5963
extends: .build_only_template_full
@@ -267,12 +271,12 @@ test_vs2022:
267271
tags:
268272
- vs2022
269273

270-
test_vs2022_arm64:
271-
extends: .build_test_msvc_template
274+
build_vs2022_arm64:
275+
extends: .build_msvc_template
272276
variables:
273277
MSVC_ARCH: arm64
274278
tags:
275-
- vs2022-arm
279+
- vs2022
276280

277281
test_macos-x86_64:
278282
extends: .build_test_macos_template

‎cfg/experimental/lowdelay_fast.cfg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ ISP : 0 # Intra subpartitions: 0: disabled, 1: en
9494
JointCbCr : 1 # Joint coding of chroma residuals: 0: disabled, 1: enabled
9595
LFNST : 1 # LFNST: 0: disabled, 1: enabled
9696
LMChroma : 1 # LMChroma prediction: 0: disabled, 1: enabled
97-
LMCSEnable : 2 # LMCS: 0: disable, 1:enable, 2: use SCC detection to disable for screen coded content
98-
LMCSOffset : 1 # chroma residual scaling offset
99-
LMCSSignalType : 0 # Input signal type: 0:SDR, 1:HDR-PQ, 2:HDR-HLG
100-
LMCSUpdateCtrl : 2 # LMCS model update control: 0:RA, 1:AI, 2:LDB/LDP
97+
LMCSEnable : 0 # deprecated
98+
LMCSOffset : 0 # deprecated
99+
LMCSSignalType : 0 # deprecated
100+
LMCSUpdateCtrl : 0 # deprecated
101101
MCTF : 2 # GOP based temporal filter (0:off, 1:filter all frames, 2:use SCC detection to disable for screen coded content)
102102
MCTFSpeed : 3 # MCTF Fast Mode (0:best quality .. 4:fastest operation)
103103
MCTFFutureReference : 0 # Enable referencing of future frames in the GOP based temporal filter. This is typically disabled for Low Delay configurations

‎cfg/experimental/lowdelay_faster.cfg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ ISP : 0 # Intra subpartitions: 0: disabled, 1: en
9494
JointCbCr : 0 # Joint coding of chroma residuals: 0: disabled, 1: enabled
9595
LFNST : 0 # LFNST: 0: disabled, 1: enabled
9696
LMChroma : 1 # LMChroma prediction: 0: disabled, 1: enabled
97-
LMCSEnable : 0 # LMCS: 0: disable, 1:enable, 2: use SCC detection to disable for screen coded content
98-
LMCSOffset : 1 # chroma residual scaling offset
99-
LMCSSignalType : 0 # Input signal type: 0:SDR, 1:HDR-PQ, 2:HDR-HLG
100-
LMCSUpdateCtrl : 2 # LMCS model update control: 0:RA, 1:AI, 2:LDB/LDP
97+
LMCSEnable : 0 # deprecated
98+
LMCSOffset : 0 # deprecated
99+
LMCSSignalType : 0 # deprecated
100+
LMCSUpdateCtrl : 0 # deprecated
101101
MCTF : 2 # GOP based temporal filter (0:off, 1:filter all frames, 2:use SCC detection to disable for screen coded content)
102102
MCTFSpeed : 4 # MCTF Fast Mode (0:best quality .. 4:fastest operation)
103103
MCTFFutureReference : 0 # Enable referencing of future frames in the GOP based temporal filter. This is typically disabled for Low Delay configurations

‎cfg/experimental/lowdelay_medium.cfg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ ISP : 3 # Intra subpartitions: 0: disabled, 1: en
9393
JointCbCr : 1 # Joint coding of chroma residuals: 0: disabled, 1: enabled
9494
LFNST : 1 # LFNST: 0: disabled, 1: enabled
9595
LMChroma : 1 # LMChroma prediction: 0: disabled, 1: enabled
96-
LMCSEnable : 2 # LMCS: 0: disable, 1:enable, 2: use SCC detection to disable for screen coded content
97-
LMCSOffset : 1 # chroma residual scaling offset
98-
LMCSSignalType : 0 # Input signal type: 0:SDR, 1:HDR-PQ, 2:HDR-HLG
99-
LMCSUpdateCtrl : 2 # LMCS model update control: 0:RA, 1:AI, 2:LDB/LDP
96+
LMCSEnable : 0 # deprecated
97+
LMCSOffset : 0 # deprecated
98+
LMCSSignalType : 0 # deprecated
99+
LMCSUpdateCtrl : 0 # deprecated
100100
MCTF : 2 # GOP based temporal filter (0:off, 1:filter all frames, 2:use SCC detection to disable for screen coded content)
101101
MCTFSpeed : 2 # MCTF Fast Mode (0:best quality .. 4:fastest operation)
102102
MCTFFutureReference : 0 # Enable referencing of future frames in the GOP based temporal filter. This is typically disabled for Low Delay configurations

‎cfg/experimental/lowdelay_slow.cfg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ ISP : 3 # Intra subpartitions: 0: disabled, 1: en
9393
JointCbCr : 1 # Joint coding of chroma residuals: 0: disabled, 1: enabled
9494
LFNST : 1 # LFNST: 0: disabled, 1: enabled
9595
LMChroma : 1 # LMChroma prediction: 0: disabled, 1: enabled
96-
LMCSEnable : 2 # LMCS: 0: disable, 1:enable, 2: use SCC detection to disable for screen coded content
97-
LMCSOffset : 1 # chroma residual scaling offset
98-
LMCSSignalType : 0 # Input signal type: 0:SDR, 1:HDR-PQ, 2:HDR-HLG
99-
LMCSUpdateCtrl : 2 # LMCS model update control: 0:RA, 1:AI, 2:LDB/LDP
96+
LMCSEnable : 0 # deprecated
97+
LMCSOffset : 0 # deprecated
98+
LMCSSignalType : 0 # deprecated
99+
LMCSUpdateCtrl : 0 # deprecated
100100
MCTF : 2 # GOP based temporal filter (0:off, 1:filter all frames, 2:use SCC detection to disable for screen coded content)
101101
MCTFSpeed : 2 # MCTF Fast Mode (0:best quality .. 4:fastest operation)
102102
MCTFFutureReference : 0 # Enable referencing of future frames in the GOP based temporal filter. This is typically disabled for Low Delay configurations

‎cfg/experimental/lowdelay_slower.cfg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ ISP : 1 # Intra subpartitions: 0: disabled, 1: en
9393
JointCbCr : 1 # Joint coding of chroma residuals: 0: disabled, 1: enabled
9494
LFNST : 1 # LFNST: 0: disabled, 1: enabled
9595
LMChroma : 1 # LMChroma prediction: 0: disabled, 1: enabled
96-
LMCSEnable : 2 # LMCS: 0: disable, 1:enable, 2: use SCC detection to disable for screen coded content
97-
LMCSOffset : 1 # chroma residual scaling offset
98-
LMCSSignalType : 0 # Input signal type: 0:SDR, 1:HDR-PQ, 2:HDR-HLG
99-
LMCSUpdateCtrl : 2 # LMCS model update control: 0:RA, 1:AI, 2:LDB/LDP
96+
LMCSEnable : 0 # deprecated
97+
LMCSOffset : 0 # deprecated
98+
LMCSSignalType : 0 # deprecated
99+
LMCSUpdateCtrl : 0 # deprecated
100100
MCTF : 2 # GOP based temporal filter (0:off, 1:filter all frames, 2:use SCC detection to disable for screen coded content)
101101
MCTFSpeed : 2 # MCTF Fast Mode (0:best quality .. 4:fastest operation)
102102
MCTFFutureReference : 0 # Enable referencing of future frames in the GOP based temporal filter. This is typically disabled for Low Delay configurations

‎source/Lib/CommonLib/InterpolationFilter.cpp‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,10 @@ InterpolationFilter::InterpolationFilter()
181181
m_filterHor[2][1][0] = filter<2, false, true, false>;
182182
m_filterHor[2][1][1] = filter<2, false, true, true>;
183183

184-
// for scalar implementation, use the 8-tap filter, as the 6-tap filter is 0-padded
185-
m_filterHor[3][0][0] = filter<8, false, false, false>;
186-
m_filterHor[3][0][1] = filter<8, false, false, true>;
187-
m_filterHor[3][1][0] = filter<8, false, true, false>;
188-
m_filterHor[3][1][1] = filter<8, false, true, true>;
184+
m_filterHor[3][0][0] = filter<6, false, false, false>;
185+
m_filterHor[3][0][1] = filter<6, false, false, true>;
186+
m_filterHor[3][1][0] = filter<6, false, true, false>;
187+
m_filterHor[3][1][1] = filter<6, false, true, true>;
189188

190189
m_filterVer[0][0][0] = filter<8, true, false, false>;
191190
m_filterVer[0][0][1] = filter<8, true, false, true>;
@@ -202,11 +201,10 @@ InterpolationFilter::InterpolationFilter()
202201
m_filterVer[2][1][0] = filter<2, true, true, false>;
203202
m_filterVer[2][1][1] = filter<2, true, true, true>;
204203

205-
// for scalar implementation, use the 8-tap filter, as the 6-tap filter is 0-padded
206-
m_filterVer[3][0][0] = filter<8, true, false, false>;
207-
m_filterVer[3][0][1] = filter<8, true, false, true>;
208-
m_filterVer[3][1][0] = filter<8, true, true, false>;
209-
m_filterVer[3][1][1] = filter<8, true, true, true>;
204+
m_filterVer[3][0][0] = filter<6, true, false, false>;
205+
m_filterVer[3][0][1] = filter<6, true, false, true>;
206+
m_filterVer[3][1][0] = filter<6, true, true, false>;
207+
m_filterVer[3][1][1] = filter<6, true, true, true>;
210208

211209
m_filterCopy[0][0] = filterCopy<false, false>;
212210
m_filterCopy[0][1] = filterCopy<false, true>;
@@ -360,6 +358,11 @@ void InterpolationFilter::filter(const ClpRng& clpRng, Pel const *src, int srcSt
360358
{
361359
int row, col;
362360

361+
if( N == 6 )
362+
{
363+
coeff++;
364+
}
365+
363366
Pel c[8];
364367
c[0] = coeff[0];
365368
c[1] = coeff[1];

0 commit comments

Comments
 (0)