Skip to content

Commit 247f9a6

Browse files
author
Erik Språng
committed
Fix SumOfFrame for extremely wide frames
1 parent 3bc90ba commit 247f9a6

3 files changed

Lines changed: 6 additions & 2 deletions

File tree

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ endif
7171

7272
ifeq ($(USE_ASAN), Yes)
7373
CFLAGS += -fsanitize=address
74+
CXXFLAGS += -fsanitize=address
7475
LDFLAGS += -fsanitize=address
7576
endif
7677

codec/encoder/core/x86/sample_sc.asm

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ WIDTH_LOOP:
127127
psadbw xmm2, xmm0
128128
psubd xmm1, xmm2
129129
movd eax, xmm1
130-
mov cx, [edi]
130+
movzx ecx, word [edi]
131131
add eax, ecx
132132

133133
mov [edi+ebp*2], ax
@@ -479,6 +479,7 @@ WIDTH_LOOP_X16:
479479
paddw xmm1, xmm2
480480
movd eax, xmm1
481481
add ax, word [edi]
482+
movzx eax, ax
482483
mov [edi+ebp*2], ax
483484
inc dword [edx+eax*4]
484485

@@ -906,7 +907,7 @@ WIDTH_LOOP:
906907
psadbw xmm2, xmm0
907908
psubd xmm1, xmm2
908909
movd r2d, xmm1
909-
mov r6w, [r4]
910+
movzx r6d, word [r4]
910911
add r2d, r6d
911912
mov [r4+r1*2], r2w
912913
inc dword [r5+r2*4]
@@ -1224,6 +1225,7 @@ WIDTH_LOOP_X16:
12241225
paddw xmm1, xmm2
12251226
movd r2d, xmm1
12261227
add r2w, word [r4]
1228+
movzx r2d, r2w
12271229
mov [r4+r1*2], r2w
12281230
inc dword [r5+r2*4]
12291231

test/encoder/EncUT_SVC_me.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ GENERATE_SumOfFrame (SumOf8x8BlockOfFrame_ref, SumOf8x8BlockOfFrame_sse2, 6, 320
283283
GENERATE_SumOfFrame (SumOf16x16BlockOfFrame_ref, SumOf16x16BlockOfFrame_sse2, 6, 320, WELS_CPU_SSE2)
284284
GENERATE_SumOfFrame (SumOf8x8BlockOfFrame_ref, SumOf8x8BlockOfFrame_sse2, 640, 320, WELS_CPU_SSE2)
285285
GENERATE_SumOfFrame (SumOf16x16BlockOfFrame_ref, SumOf16x16BlockOfFrame_sse2, 640, 320, WELS_CPU_SSE2)
286+
GENERATE_SumOfFrame (SumOf8x8BlockOfFrame_ref, SumOf8x8BlockOfFrame_sse2, 21840, 16, WELS_CPU_SSE2)
286287

287288
GENERATE_SumOfFrame (SumOf8x8BlockOfFrame_ref, SumOf8x8BlockOfFrame_sse4, 8, 2, WELS_CPU_SSE41)
288289
GENERATE_SumOfFrame (SumOf16x16BlockOfFrame_ref, SumOf16x16BlockOfFrame_sse4, 16, 2, WELS_CPU_SSE41)

0 commit comments

Comments
 (0)