diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 14:08:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 14:08:00 +0200 |
| commit | 69d2eff5af67e9bc461f64dfd3014009f5c851b2 (patch) | |
| tree | fd67c1bdca403cac385230040020ea72ae854ed8 /libavcodec/x86/rv40dsp_init.c | |
| parent | 2f9ef60c97657e5fa47d5f17c5e4714efb672e4e (diff) | |
| parent | 63bac48f734fc69cca2ef2cfada92cd9a222734d (diff) | |
| download | ffmpeg-69d2eff5af67e9bc461f64dfd3014009f5c851b2.tar.gz | |
Merge commit '63bac48f734fc69cca2ef2cfada92cd9a222734d'
* commit '63bac48f734fc69cca2ef2cfada92cd9a222734d':
x86: dsputil: Move rv40-specific functions where they belong
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_mmx.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/rv40dsp_init.c')
| -rw-r--r-- | libavcodec/x86/rv40dsp_init.c | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c index 2f975186de..ac15f885c6 100644 --- a/libavcodec/x86/rv40dsp_init.c +++ b/libavcodec/x86/rv40dsp_init.c @@ -188,6 +188,29 @@ QPEL_FUNCS_SET (OP, 3, 2, OPT) #endif /* HAVE_YASM */ +#if HAVE_MMX_INLINE +static void put_rv40_qpel8_mc33_mmx(uint8_t *dst, uint8_t *src, + ptrdiff_t stride) +{ + ff_put_pixels8_xy2_mmx(dst, src, stride, 8); +} +static void put_rv40_qpel16_mc33_mmx(uint8_t *dst, uint8_t *src, + ptrdiff_t stride) +{ + ff_put_pixels16_xy2_mmx(dst, src, stride, 16); +} +static void avg_rv40_qpel8_mc33_mmx(uint8_t *dst, uint8_t *src, + ptrdiff_t stride) +{ + ff_avg_pixels8_xy2_mmx(dst, src, stride, 8); +} +static void avg_rv40_qpel16_mc33_mmx(uint8_t *dst, uint8_t *src, + ptrdiff_t stride) +{ + ff_avg_pixels16_xy2_mmx(dst, src, stride, 16); +} +#endif /* HAVE_MMX_INLINE */ + av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c) { #if HAVE_YASM @@ -197,10 +220,10 @@ av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c) c->put_chroma_pixels_tab[0] = ff_put_rv40_chroma_mc8_mmx; c->put_chroma_pixels_tab[1] = ff_put_rv40_chroma_mc4_mmx; #if HAVE_MMX_INLINE - c->put_pixels_tab[0][15] = ff_put_rv40_qpel16_mc33_mmx; - c->put_pixels_tab[1][15] = ff_put_rv40_qpel8_mc33_mmx; - c->avg_pixels_tab[0][15] = ff_avg_rv40_qpel16_mc33_mmx; - c->avg_pixels_tab[1][15] = ff_avg_rv40_qpel8_mc33_mmx; + c->put_pixels_tab[0][15] = put_rv40_qpel16_mc33_mmx; + c->put_pixels_tab[1][15] = put_rv40_qpel8_mc33_mmx; + c->avg_pixels_tab[0][15] = avg_rv40_qpel16_mc33_mmx; + c->avg_pixels_tab[1][15] = avg_rv40_qpel8_mc33_mmx; #endif /* HAVE_MMX_INLINE */ #if ARCH_X86_32 QPEL_MC_SET(put_, _mmx) |