[FFmpeg-cvslog] Fix Win64 AVX h264_deblock by not using redzone on Win64

Matt Wolenetz git at videolan.org
Thu Feb 21 22:43:20 CET 2013


ffmpeg | branch: master | Matt Wolenetz <wolenetz at chromium.org> | Fri Feb 15 13:59:40 2013 -0800| [82a4a4e7caa96cea9aa2185c4c3110a5e9fde7c2] | committer: Michael Niedermayer

Fix Win64 AVX h264_deblock by not using redzone on Win64

Thanks-to: "Ronald S. Bultje" <rsbultje at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82a4a4e7caa96cea9aa2185c4c3110a5e9fde7c2
---

 libavcodec/x86/h264_deblock.asm |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm
index 8ac38fc..5f2374d 100644
--- a/libavcodec/x86/h264_deblock.asm
+++ b/libavcodec/x86/h264_deblock.asm
@@ -625,7 +625,11 @@ DEBLOCK_LUMA v, 16
     %define t5 m11
     %define mask0 m12
     %define mask1p m13
+%if WIN64
+    %define mask1q [rsp]
+%else
     %define mask1q [rsp-24]
+%endif
     %define mpb_0 m14
     %define mpb_1 m15
 %else
@@ -644,7 +648,11 @@ DEBLOCK_LUMA v, 16
 ;-----------------------------------------------------------------------------
 ; void deblock_v_luma_intra( uint8_t *pix, int stride, int alpha, int beta )
 ;-----------------------------------------------------------------------------
+%if WIN64
+cglobal deblock_%1_luma_intra_8, 4,6,16,0x10
+%else
 cglobal deblock_%1_luma_intra_8, 4,6,16,ARCH_X86_64*0x50-0x50
+%endif
     lea     r4, [r1*4]
     lea     r5, [r1*3] ; 3*stride
     dec     r2d        ; alpha-1



More information about the ffmpeg-cvslog mailing list