Mercurial > libavcodec.hg
comparison x86/dsputil_mmx.c @ 9342:7f594601d5e9 libavcodec
Rename FF_MM_MMXEXT to FF_MM_MMX2, for both clarity and consistency
with libswscale.
| author | stefano |
|---|---|
| date | Sat, 04 Apr 2009 13:20:53 +0000 |
| parents | 06532529c428 |
| children | ef3a7b711cc0 |
comparison
equal
deleted
inserted
replaced
| 9341:06532529c428 | 9342:7f594601d5e9 |
|---|---|
| 2589 | 2589 |
| 2590 #if 0 | 2590 #if 0 |
| 2591 av_log(avctx, AV_LOG_INFO, "libavcodec: CPU flags:"); | 2591 av_log(avctx, AV_LOG_INFO, "libavcodec: CPU flags:"); |
| 2592 if (mm_flags & FF_MM_MMX) | 2592 if (mm_flags & FF_MM_MMX) |
| 2593 av_log(avctx, AV_LOG_INFO, " mmx"); | 2593 av_log(avctx, AV_LOG_INFO, " mmx"); |
| 2594 if (mm_flags & FF_MM_MMXEXT) | 2594 if (mm_flags & FF_MM_MMX2) |
| 2595 av_log(avctx, AV_LOG_INFO, " mmxext"); | 2595 av_log(avctx, AV_LOG_INFO, " mmx2"); |
| 2596 if (mm_flags & FF_MM_3DNOW) | 2596 if (mm_flags & FF_MM_3DNOW) |
| 2597 av_log(avctx, AV_LOG_INFO, " 3dnow"); | 2597 av_log(avctx, AV_LOG_INFO, " 3dnow"); |
| 2598 if (mm_flags & FF_MM_SSE) | 2598 if (mm_flags & FF_MM_SSE) |
| 2599 av_log(avctx, AV_LOG_INFO, " sse"); | 2599 av_log(avctx, AV_LOG_INFO, " sse"); |
| 2600 if (mm_flags & FF_MM_SSE2) | 2600 if (mm_flags & FF_MM_SSE2) |
| 2611 c->idct_add= ff_simple_idct_add_mmx; | 2611 c->idct_add= ff_simple_idct_add_mmx; |
| 2612 c->idct = ff_simple_idct_mmx; | 2612 c->idct = ff_simple_idct_mmx; |
| 2613 c->idct_permutation_type= FF_SIMPLE_IDCT_PERM; | 2613 c->idct_permutation_type= FF_SIMPLE_IDCT_PERM; |
| 2614 #if CONFIG_GPL | 2614 #if CONFIG_GPL |
| 2615 }else if(idct_algo==FF_IDCT_LIBMPEG2MMX){ | 2615 }else if(idct_algo==FF_IDCT_LIBMPEG2MMX){ |
| 2616 if(mm_flags & FF_MM_MMXEXT){ | 2616 if(mm_flags & FF_MM_MMX2){ |
| 2617 c->idct_put= ff_libmpeg2mmx2_idct_put; | 2617 c->idct_put= ff_libmpeg2mmx2_idct_put; |
| 2618 c->idct_add= ff_libmpeg2mmx2_idct_add; | 2618 c->idct_add= ff_libmpeg2mmx2_idct_add; |
| 2619 c->idct = ff_mmxext_idct; | 2619 c->idct = ff_mmxext_idct; |
| 2620 }else{ | 2620 }else{ |
| 2621 c->idct_put= ff_libmpeg2mmx_idct_put; | 2621 c->idct_put= ff_libmpeg2mmx_idct_put; |
| 2643 if(mm_flags & FF_MM_SSE2){ | 2643 if(mm_flags & FF_MM_SSE2){ |
| 2644 c->idct_put= ff_idct_xvid_sse2_put; | 2644 c->idct_put= ff_idct_xvid_sse2_put; |
| 2645 c->idct_add= ff_idct_xvid_sse2_add; | 2645 c->idct_add= ff_idct_xvid_sse2_add; |
| 2646 c->idct = ff_idct_xvid_sse2; | 2646 c->idct = ff_idct_xvid_sse2; |
| 2647 c->idct_permutation_type= FF_SSE2_IDCT_PERM; | 2647 c->idct_permutation_type= FF_SSE2_IDCT_PERM; |
| 2648 }else if(mm_flags & FF_MM_MMXEXT){ | 2648 }else if(mm_flags & FF_MM_MMX2){ |
| 2649 c->idct_put= ff_idct_xvid_mmx2_put; | 2649 c->idct_put= ff_idct_xvid_mmx2_put; |
| 2650 c->idct_add= ff_idct_xvid_mmx2_add; | 2650 c->idct_add= ff_idct_xvid_mmx2_add; |
| 2651 c->idct = ff_idct_xvid_mmx2; | 2651 c->idct = ff_idct_xvid_mmx2; |
| 2652 }else{ | 2652 }else{ |
| 2653 c->idct_put= ff_idct_xvid_mmx_put; | 2653 c->idct_put= ff_idct_xvid_mmx_put; |
| 2710 | 2710 |
| 2711 if (CONFIG_VP6_DECODER) { | 2711 if (CONFIG_VP6_DECODER) { |
| 2712 c->vp6_filter_diag4 = ff_vp6_filter_diag4_mmx; | 2712 c->vp6_filter_diag4 = ff_vp6_filter_diag4_mmx; |
| 2713 } | 2713 } |
| 2714 | 2714 |
| 2715 if (mm_flags & FF_MM_MMXEXT) { | 2715 if (mm_flags & FF_MM_MMX2) { |
| 2716 c->prefetch = prefetch_mmx2; | 2716 c->prefetch = prefetch_mmx2; |
| 2717 | 2717 |
| 2718 c->put_pixels_tab[0][1] = put_pixels16_x2_mmx2; | 2718 c->put_pixels_tab[0][1] = put_pixels16_x2_mmx2; |
| 2719 c->put_pixels_tab[0][2] = put_pixels16_y2_mmx2; | 2719 c->put_pixels_tab[0][2] = put_pixels16_y2_mmx2; |
| 2720 | 2720 |
| 2947 c->add_png_paeth_prediction= add_png_paeth_prediction_ssse3; | 2947 c->add_png_paeth_prediction= add_png_paeth_prediction_ssse3; |
| 2948 } | 2948 } |
| 2949 #endif | 2949 #endif |
| 2950 | 2950 |
| 2951 #if CONFIG_GPL && HAVE_YASM | 2951 #if CONFIG_GPL && HAVE_YASM |
| 2952 if( mm_flags&FF_MM_MMXEXT ){ | 2952 if (mm_flags & FF_MM_MMX2){ |
| 2953 #if ARCH_X86_32 | 2953 #if ARCH_X86_32 |
| 2954 c->h264_v_loop_filter_luma_intra = ff_x264_deblock_v_luma_intra_mmxext; | 2954 c->h264_v_loop_filter_luma_intra = ff_x264_deblock_v_luma_intra_mmxext; |
| 2955 c->h264_h_loop_filter_luma_intra = ff_x264_deblock_h_luma_intra_mmxext; | 2955 c->h264_h_loop_filter_luma_intra = ff_x264_deblock_h_luma_intra_mmxext; |
| 2956 #endif | 2956 #endif |
| 2957 if( mm_flags&FF_MM_SSE2 ){ | 2957 if( mm_flags&FF_MM_SSE2 ){ |
| 2975 c->vertical_compose97i = ff_snow_vertical_compose97i_sse2; | 2975 c->vertical_compose97i = ff_snow_vertical_compose97i_sse2; |
| 2976 #endif | 2976 #endif |
| 2977 c->inner_add_yblock = ff_snow_inner_add_yblock_sse2; | 2977 c->inner_add_yblock = ff_snow_inner_add_yblock_sse2; |
| 2978 } | 2978 } |
| 2979 else{ | 2979 else{ |
| 2980 if(mm_flags & FF_MM_MMXEXT){ | 2980 if(mm_flags & FF_MM_MMX2){ |
| 2981 c->horizontal_compose97i = ff_snow_horizontal_compose97i_mmx; | 2981 c->horizontal_compose97i = ff_snow_horizontal_compose97i_mmx; |
| 2982 #if HAVE_7REGS | 2982 #if HAVE_7REGS |
| 2983 c->vertical_compose97i = ff_snow_vertical_compose97i_mmx; | 2983 c->vertical_compose97i = ff_snow_vertical_compose97i_mmx; |
| 2984 #endif | 2984 #endif |
| 2985 } | 2985 } |