diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2014-12-26 12:10:26 -0500 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2014-12-27 16:55:14 -0500 |
| commit | 0cc9c23ea171e1b7515334032a5c684472e91bc4 (patch) | |
| tree | ed3f5a19d5cf8aa1ad5a0747d225737c8ad82f30 | |
| parent | 6433a9133f418c59c5f60eff0f8a2187b623a2f1 (diff) | |
| download | ffmpeg-0cc9c23ea171e1b7515334032a5c684472e91bc4.tar.gz | |
vp9/x86: make filter_48/84_v work on 32-bit.
| -rw-r--r-- | libavcodec/x86/vp9dsp_init.c | 8 | ||||
| -rw-r--r-- | libavcodec/x86/vp9lpf.asm | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/libavcodec/x86/vp9dsp_init.c b/libavcodec/x86/vp9dsp_init.c index 5d375aa9dc..f3a8de3626 100644 --- a/libavcodec/x86/vp9dsp_init.c +++ b/libavcodec/x86/vp9dsp_init.c @@ -350,9 +350,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 1e65d8eaca..94939d8505 100644 --- a/libavcodec/x86/vp9lpf.asm +++ b/libavcodec/x86/vp9lpf.asm @@ -918,9 +918,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 |