Hi,
On Sat, Dec 27, 2014 at 1:24 PM, Clément Bœsch <u...@pkh.me> wrote:
> On Sat, Dec 27, 2014 at 11:02:46AM -0500, Ronald S. Bultje wrote:
> > ---
> > libavcodec/x86/vp9dsp_init.c | 8 ++++++--
> > 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 6c58c6c..79cae38 100644
> > --- a/libavcodec/x86/vp9dsp_init.c
> > +++ b/libavcodec/x86/vp9dsp_init.c
> > @@ -357,9 +357,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 2759031..7c16861 100644
> > --- a/libavcodec/x86/vp9lpf.asm
> > +++ b/libavcodec/x86/vp9lpf.asm
> > @@ -916,9 +916,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
>
> OK I guess :)
I mean, I could merge this with filter_88_v (since that one does all the
required plumbing to get filter_48/84_v to work also), but what's the fun
in that? :)
Ronald
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
