mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
Merge remote-tracking branch 'rbultje/vp9-32bit-lpf'
* rbultje/vp9-32bit-lpf: vp9/x86: add myself to copyright holders for loopfilter assembly. vp9/x86: make filter_16_h work on 32-bit. vp9/x86: make filter_48/84/88_h work on 32-bit. vp9/x86: make filter_44_h work on 32-bit. vp9/x86: make filter_16_v work on 32-bit. vp9/x86: make filter_48/84_v work on 32-bit. vp9/x86: make filter_88_v work on 32-bit. vp9/x86: make filter_44_v work on 32-bit. vp8/x86: save one register in SIGN_ADD/SUB. vp9/x86: store unpacked intermediates for filter6/14 on stack. vp8/x86: move variable assigned inside macro branch. vp9/x86: simplify ABSSUM_CMP by inverting the comparison meaning. vp8/x86: remove unused register from ABSSUB_CMP macro. vp9/x86: slightly simplify 44/48/84/88 h stores. vp9/x86: make cglobal statement more conservative in register allocation. vp9/x86: save one register in loopfilter surface coverage. Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
17dde95ec5
@ -342,18 +342,16 @@ av_cold void ff_vp9dsp_init_x86(VP9DSPContext *dsp)
|
||||
init_subpel2(4, idx, 4, type, opt)
|
||||
|
||||
#define init_lpf(opt) do { \
|
||||
if (ARCH_X86_64) { \
|
||||
dsp->loop_filter_16[0] = ff_vp9_loop_filter_h_16_16_##opt; \
|
||||
dsp->loop_filter_16[1] = ff_vp9_loop_filter_v_16_16_##opt; \
|
||||
dsp->loop_filter_mix2[0][0][0] = ff_vp9_loop_filter_h_44_16_##opt; \
|
||||
dsp->loop_filter_mix2[0][0][1] = ff_vp9_loop_filter_v_44_16_##opt; \
|
||||
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[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][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; \
|
||||
} \
|
||||
dsp->loop_filter_16[0] = ff_vp9_loop_filter_h_16_16_##opt; \
|
||||
dsp->loop_filter_16[1] = ff_vp9_loop_filter_v_16_16_##opt; \
|
||||
dsp->loop_filter_mix2[0][0][0] = ff_vp9_loop_filter_h_44_16_##opt; \
|
||||
dsp->loop_filter_mix2[0][0][1] = ff_vp9_loop_filter_v_44_16_##opt; \
|
||||
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[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][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; \
|
||||
} while (0)
|
||||
|
||||
#define init_ipred(sz, opt, t, e) \
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user