diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-06 11:30:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-06 11:31:01 +0200 |
| commit | 7fb123429e6c153e9ea1e1af6e0165c3583894d0 (patch) | |
| tree | 44efa1f08d645ebe0a2ed9dc3b3632008c9e1bac /libavcodec/x86 | |
| parent | d0b27036763fca5d1bc0286dc52237fdab4050ee (diff) | |
| parent | 258414d0771845d20f646ffe4d4e60f22fba217c (diff) | |
| download | android_external_ffmpeg-7fb123429e6c153e9ea1e1af6e0165c3583894d0.tar.gz android_external_ffmpeg-7fb123429e6c153e9ea1e1af6e0165c3583894d0.tar.bz2 android_external_ffmpeg-7fb123429e6c153e9ea1e1af6e0165c3583894d0.zip | |
Merge commit '258414d0771845d20f646ffe4d4e60f22fba217c'
* commit '258414d0771845d20f646ffe4d4e60f22fba217c':
x86: fdct: Initialize optimized fdct implementations in the standard way
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/dsputilenc_mmx.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c index 52a6f562a1..6205577c57 100644 --- a/libavcodec/x86/dsputilenc_mmx.c +++ b/libavcodec/x86/dsputilenc_mmx.c @@ -947,6 +947,7 @@ hadamard_func(ssse3) av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx) { int cpu_flags = av_get_cpu_flags(); + const int dct_algo = avctx->dct_algo; #if HAVE_YASM int bit_depth = avctx->bits_per_raw_sample; @@ -966,18 +967,9 @@ av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx) #if HAVE_INLINE_ASM if (INLINE_MMX(cpu_flags)) { - const int dct_algo = avctx->dct_algo; if (avctx->bits_per_raw_sample <= 8 && - (dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX)) { - if (cpu_flags & AV_CPU_FLAG_SSE2) { - c->fdct = ff_fdct_sse2; - } else if (cpu_flags & AV_CPU_FLAG_MMXEXT) { - c->fdct = ff_fdct_mmxext; - }else{ - c->fdct = ff_fdct_mmx; - } - } - + (dct_algo == FF_DCT_AUTO || dct_algo == FF_DCT_MMX)) + c->fdct = ff_fdct_mmx; c->diff_bytes= diff_bytes_mmx; c->sum_abs_dctelem= sum_abs_dctelem_mmx; @@ -1001,6 +993,10 @@ av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx) } if (INLINE_MMXEXT(cpu_flags)) { + if (avctx->bits_per_raw_sample <= 8 && + (dct_algo == FF_DCT_AUTO || dct_algo == FF_DCT_MMX)) + c->fdct = ff_fdct_mmxext; + c->sum_abs_dctelem = sum_abs_dctelem_mmxext; c->vsad[4] = vsad_intra16_mmxext; @@ -1012,6 +1008,10 @@ av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx) } if (INLINE_SSE2(cpu_flags)) { + if (avctx->bits_per_raw_sample <= 8 && + (dct_algo == FF_DCT_AUTO || dct_algo == FF_DCT_MMX)) + c->fdct = ff_fdct_sse2; + c->sum_abs_dctelem= sum_abs_dctelem_sse2; } |