diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-22 03:03:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-22 03:09:28 +0200 |
| commit | 4abffbbc54a2f2889ef1275b48be5fe63c51ace0 (patch) | |
| tree | 7a76de8d2bf4b2657e0fd08e26a8274f52106f86 /libswscale | |
| parent | a1a76b209b42cdd9f8f16bfce7509883d636b940 (diff) | |
| download | ffmpeg-streaming-4abffbbc54a2f2889ef1275b48be5fe63c51ace0.zip ffmpeg-streaming-4abffbbc54a2f2889ef1275b48be5fe63c51ace0.tar.gz | |
swscale/x86/input: prevent RGB32_TO_Y_FN from reading into the padding
This avoids reading uninitialized bytes and confusing valgrind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/x86/input.asm | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/libswscale/x86/input.asm b/libswscale/x86/input.asm index 1f0f1ef..af9afca 100644 --- a/libswscale/x86/input.asm +++ b/libswscale/x86/input.asm @@ -347,8 +347,9 @@ cglobal %2%3%4%5 %+ ToY, 6, 6, %1, dst, src, u1, u2, w, table %if ARCH_X86_64 movsxd wq, wd %endif - lea srcq, [srcq+wq*4] add wq, wq + sub wq, mmsize - 1 + lea srcq, [srcq+wq*2] add dstq, wq neg wq mova m4, [rgb_Yrnd] @@ -373,6 +374,23 @@ cglobal %2%3%4%5 %+ ToY, 6, 6, %1, dst, src, u1, u2, w, table mova [dstq+wq], m0 add wq, mmsize jl .loop + sub wq, mmsize - 1 + jz .end + add srcq, 2*mmsize - 2 + add dstq, mmsize - 1 +.loop2: + movd m0, [srcq+wq*2+0] ; (byte) { Bx, Gx, Rx, xx }[0-3] + DEINTB 1, 0, 3, 2, 7 ; (word) { Gx, xx (m0/m2) or Bx, Rx (m1/m3) }[0-3]/[4-7] + pmaddwd m1, m5 ; (dword) { Bx*BY + Rx*RY }[0-3] + pmaddwd m0, m6 ; (dword) { Gx*GY }[0-3] + paddd m0, m4 ; += rgb_Yrnd + paddd m0, m1 ; (dword) { Y[0-3] } + psrad m0, 9 + packssdw m0, m0 ; (word) { Y[0-7] } + movd [dstq+wq], m0 + add wq, 2 + jl .loop2 +.end: REP_RET %endif ; %0 == 3 %endmacro |
