Mercurial > libavcodec.hg
comparison x86/mpegvideo_mmx.c @ 12456:a5ddb39627fd libavcodec
Rename FF_MM_ symbols related to CPU features flags as AV_CPU_FLAG_
symbols, and move them from libavcodec/avcodec.h to libavutil/cpu.h.
author | stefano |
---|---|
date | Sat, 04 Sep 2010 09:59:08 +0000 |
parents | 3fc4c625b6f3 |
children | 9fef0a8ddd63 |
comparison
equal
deleted
inserted
replaced
12455:14f85520cd02 | 12456:a5ddb39627fd |
---|---|
625 | 625 |
626 void MPV_common_init_mmx(MpegEncContext *s) | 626 void MPV_common_init_mmx(MpegEncContext *s) |
627 { | 627 { |
628 int mm_flags = mm_support(); | 628 int mm_flags = mm_support(); |
629 | 629 |
630 if (mm_flags & FF_MM_MMX) { | 630 if (mm_flags & AV_CPU_FLAG_MMX) { |
631 const int dct_algo = s->avctx->dct_algo; | 631 const int dct_algo = s->avctx->dct_algo; |
632 | 632 |
633 s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_mmx; | 633 s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_mmx; |
634 s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_mmx; | 634 s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_mmx; |
635 s->dct_unquantize_mpeg1_intra = dct_unquantize_mpeg1_intra_mmx; | 635 s->dct_unquantize_mpeg1_intra = dct_unquantize_mpeg1_intra_mmx; |
636 s->dct_unquantize_mpeg1_inter = dct_unquantize_mpeg1_inter_mmx; | 636 s->dct_unquantize_mpeg1_inter = dct_unquantize_mpeg1_inter_mmx; |
637 if(!(s->flags & CODEC_FLAG_BITEXACT)) | 637 if(!(s->flags & CODEC_FLAG_BITEXACT)) |
638 s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_mmx; | 638 s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_mmx; |
639 s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_mmx; | 639 s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_mmx; |
640 | 640 |
641 if (mm_flags & FF_MM_SSE2) { | 641 if (mm_flags & AV_CPU_FLAG_SSE2) { |
642 s->denoise_dct= denoise_dct_sse2; | 642 s->denoise_dct= denoise_dct_sse2; |
643 } else { | 643 } else { |
644 s->denoise_dct= denoise_dct_mmx; | 644 s->denoise_dct= denoise_dct_mmx; |
645 } | 645 } |
646 | 646 |
647 if(dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX){ | 647 if(dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX){ |
648 #if HAVE_SSSE3 | 648 #if HAVE_SSSE3 |
649 if(mm_flags & FF_MM_SSSE3){ | 649 if(mm_flags & AV_CPU_FLAG_SSSE3){ |
650 s->dct_quantize= dct_quantize_SSSE3; | 650 s->dct_quantize= dct_quantize_SSSE3; |
651 } else | 651 } else |
652 #endif | 652 #endif |
653 if(mm_flags & FF_MM_SSE2){ | 653 if(mm_flags & AV_CPU_FLAG_SSE2){ |
654 s->dct_quantize= dct_quantize_SSE2; | 654 s->dct_quantize= dct_quantize_SSE2; |
655 } else if(mm_flags & FF_MM_MMX2){ | 655 } else if(mm_flags & AV_CPU_FLAG_MMX2){ |
656 s->dct_quantize= dct_quantize_MMX2; | 656 s->dct_quantize= dct_quantize_MMX2; |
657 } else { | 657 } else { |
658 s->dct_quantize= dct_quantize_MMX; | 658 s->dct_quantize= dct_quantize_MMX; |
659 } | 659 } |
660 } | 660 } |