diff options
| author | Michael Kostylev <michael.kostylev@gmail.com> | 2012-05-10 23:44:04 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-05-15 23:54:08 +0200 |
| commit | 6797d1948b1dff634eafce402d96f05393af7edc (patch) | |
| tree | 574bb52715913ddeb2496cadf82ac4e9010bece9 /libavcodec | |
| parent | 95a98ab3f0439df82a907233f80a7404b987e838 (diff) | |
| download | ffmpeg-6797d1948b1dff634eafce402d96f05393af7edc.tar.gz | |
x86: rv40: Mark rv40_weight functions as MMX2; they use MMX2 instructions.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/rv40dsp.asm | 2 | ||||
| -rw-r--r-- | libavcodec/x86/rv40dsp_init.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/x86/rv40dsp.asm b/libavcodec/x86/rv40dsp.asm index e0213f40b9..ae740c213a 100644 --- a/libavcodec/x86/rv40dsp.asm +++ b/libavcodec/x86/rv40dsp.asm @@ -487,7 +487,7 @@ cglobal rv40_weight_func_%1_%2, 6, 7, 8 REP_RET %endmacro -INIT_MMX mmx +INIT_MMX mmx2 RV40_WEIGHT rnd, 8, 3 RV40_WEIGHT rnd, 16, 4 RV40_WEIGHT nornd, 8, 3 diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c index 3f42363e4e..cc1ea45e88 100644 --- a/libavcodec/x86/rv40dsp_init.c +++ b/libavcodec/x86/rv40dsp_init.c @@ -52,7 +52,7 @@ void ff_rv40_weight_func_nornd_16_##opt(uint8_t *dst, uint8_t *src1, uint8_t *sr int w1, int w2, ptrdiff_t stride); \ void ff_rv40_weight_func_nornd_8_##opt (uint8_t *dst, uint8_t *src1, uint8_t *src2, \ int w1, int w2, ptrdiff_t stride); -DECLARE_WEIGHT(mmx) +DECLARE_WEIGHT(mmx2) DECLARE_WEIGHT(sse2) DECLARE_WEIGHT(ssse3) @@ -190,10 +190,6 @@ void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp) if (mm_flags & AV_CPU_FLAG_MMX) { c->put_chroma_pixels_tab[0] = ff_put_rv40_chroma_mc8_mmx; c->put_chroma_pixels_tab[1] = ff_put_rv40_chroma_mc4_mmx; - c->rv40_weight_pixels_tab[0][0] = ff_rv40_weight_func_rnd_16_mmx; - c->rv40_weight_pixels_tab[0][1] = ff_rv40_weight_func_rnd_8_mmx; - c->rv40_weight_pixels_tab[1][0] = ff_rv40_weight_func_nornd_16_mmx; - c->rv40_weight_pixels_tab[1][1] = ff_rv40_weight_func_nornd_8_mmx; 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; @@ -205,6 +201,10 @@ void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp) if (mm_flags & AV_CPU_FLAG_MMX2) { c->avg_chroma_pixels_tab[0] = ff_avg_rv40_chroma_mc8_mmx2; c->avg_chroma_pixels_tab[1] = ff_avg_rv40_chroma_mc4_mmx2; + c->rv40_weight_pixels_tab[0][0] = ff_rv40_weight_func_rnd_16_mmx2; + c->rv40_weight_pixels_tab[0][1] = ff_rv40_weight_func_rnd_8_mmx2; + c->rv40_weight_pixels_tab[1][0] = ff_rv40_weight_func_nornd_16_mmx2; + c->rv40_weight_pixels_tab[1][1] = ff_rv40_weight_func_nornd_8_mmx2; #if ARCH_X86_32 QPEL_MC_SET(avg_, _mmx2) #endif |