[19/23] vp9lpf/x86: make filter_48/84_v work on 32-bit.

Message ID 1475436610-25770-19-git-send-email-anton@khirnov.net
State Committed
Commit b905e8d2fe03da1bf34ffa6e04b322f19a479143
Headers show

Commit Message

Anton Khirnov Oct. 2, 2016, 7:30 p.m.
From: "Ronald S. Bultje" <rsbultje@gmail.com>

Signed-off-by: Anton Khirnov <anton@khirnov.net>
---
 libavcodec/x86/vp9dsp_init.c | 8 ++++++--
 libavcodec/x86/vp9lpf.asm    | 8 +++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

Patch

diff --git a/libavcodec/x86/vp9dsp_init.c b/libavcodec/x86/vp9dsp_init.c
index 523e92c..9f09053 100644
--- a/libavcodec/x86/vp9dsp_init.c
+++ b/libavcodec/x86/vp9dsp_init.c
@@ -287,9 +287,13 @@  av_cold void ff_vp9dsp_init_x86(VP9DSPContext *dsp)
     dsp->loop_filter_mix2[0][0][1] = ff_vp9_loop_filter_v_44_16_##opt; \
     if (ARCH_X86_64) { \
         dsp->loop_filter_mix2[0][1][0] = ff_vp9_loop_filter_h_48_16_##opt; \
-        dsp->loop_filter_mix2[0][1][1] = ff_vp9_loop_filter_v_48_16_##opt; \
+    } \
+    dsp->loop_filter_mix2[0][1][1] = ff_vp9_loop_filter_v_48_16_##opt; \
+    if (ARCH_X86_64) { \
         dsp->loop_filter_mix2[1][0][0] = ff_vp9_loop_filter_h_84_16_##opt; \
-        dsp->loop_filter_mix2[1][0][1] = ff_vp9_loop_filter_v_84_16_##opt; \
+    } \
+    dsp->loop_filter_mix2[1][0][1] = ff_vp9_loop_filter_v_84_16_##opt; \
+    if (ARCH_X86_64) { \
         dsp->loop_filter_mix2[1][1][0] = ff_vp9_loop_filter_h_88_16_##opt; \
     } \
     dsp->loop_filter_mix2[1][1][1] = ff_vp9_loop_filter_v_88_16_##opt; \
diff --git a/libavcodec/x86/vp9lpf.asm b/libavcodec/x86/vp9lpf.asm
index e1c2b7b..150cd73 100644
--- a/libavcodec/x86/vp9lpf.asm
+++ b/libavcodec/x86/vp9lpf.asm
@@ -920,9 +920,7 @@  LPF_16_VH %1, %2, %3, avx
 %if ARCH_X86_64
 LPF_16_VH_ALL_OPTS 16, 512
 %endif
-LPF_16_VH_ALL_OPTS 44,   0, 0
-%if ARCH_X86_64
-LPF_16_VH_ALL_OPTS 48, 256
-LPF_16_VH_ALL_OPTS 84, 256
-%endif
+LPF_16_VH_ALL_OPTS 44,   0,  0
+LPF_16_VH_ALL_OPTS 48, 256, 16
+LPF_16_VH_ALL_OPTS 84, 256, 16
 LPF_16_VH_ALL_OPTS 88, 256, 16