Mercurial > libavcodec.hg
comparison x86/dsputil_mmx.c @ 10749:5cca4b6c459d libavcodec
Get rid of pointless CONFIG_ANY_H263 preprocessor definition.
author | diego |
---|---|
date | Wed, 30 Dec 2009 11:33:59 +0000 |
parents | 6f958f237d7d |
children | 78c2be62260a |
comparison
equal
deleted
inserted
replaced
10748:36611425fedb | 10749:5cca4b6c459d |
---|---|
22 * MMX optimization by Nick Kurshev <nickols_k@mail.ru> | 22 * MMX optimization by Nick Kurshev <nickols_k@mail.ru> |
23 */ | 23 */ |
24 | 24 |
25 #include "libavutil/x86_cpu.h" | 25 #include "libavutil/x86_cpu.h" |
26 #include "libavcodec/dsputil.h" | 26 #include "libavcodec/dsputil.h" |
27 #include "libavcodec/h263.h" | |
28 #include "libavcodec/mpegvideo.h" | 27 #include "libavcodec/mpegvideo.h" |
29 #include "libavcodec/simple_idct.h" | 28 #include "libavcodec/simple_idct.h" |
30 #include "dsputil_mmx.h" | 29 #include "dsputil_mmx.h" |
31 #include "vp3dsp_mmx.h" | 30 #include "vp3dsp_mmx.h" |
32 #include "vp3dsp_sse2.h" | 31 #include "vp3dsp_sse2.h" |
701 "movq %3, %%mm6 \n\t"\ | 700 "movq %3, %%mm6 \n\t"\ |
702 "psubb %%mm1, %%mm5 \n\t"\ | 701 "psubb %%mm1, %%mm5 \n\t"\ |
703 "paddb %%mm1, %%mm6 \n\t" | 702 "paddb %%mm1, %%mm6 \n\t" |
704 | 703 |
705 static void h263_v_loop_filter_mmx(uint8_t *src, int stride, int qscale){ | 704 static void h263_v_loop_filter_mmx(uint8_t *src, int stride, int qscale){ |
706 if(CONFIG_ANY_H263) { | 705 if(CONFIG_H263_DECODER || CONFIG_H263_ENCODER) { |
707 const int strength= ff_h263_loop_filter_strength[qscale]; | 706 const int strength= ff_h263_loop_filter_strength[qscale]; |
708 | 707 |
709 __asm__ volatile( | 708 __asm__ volatile( |
710 | 709 |
711 H263_LOOP_FILTER | 710 H263_LOOP_FILTER |
751 "m" (*(uint32_t*)(src + 3*src_stride)) | 750 "m" (*(uint32_t*)(src + 3*src_stride)) |
752 ); | 751 ); |
753 } | 752 } |
754 | 753 |
755 static void h263_h_loop_filter_mmx(uint8_t *src, int stride, int qscale){ | 754 static void h263_h_loop_filter_mmx(uint8_t *src, int stride, int qscale){ |
756 if(CONFIG_ANY_H263) { | 755 if(CONFIG_H263_DECODER || CONFIG_H263_ENCODER) { |
757 const int strength= ff_h263_loop_filter_strength[qscale]; | 756 const int strength= ff_h263_loop_filter_strength[qscale]; |
758 DECLARE_ALIGNED(8, uint64_t, temp[4]); | 757 DECLARE_ALIGNED(8, uint64_t, temp[4]); |
759 uint8_t *btemp= (uint8_t*)temp; | 758 uint8_t *btemp= (uint8_t*)temp; |
760 | 759 |
761 src -= 2; | 760 src -= 2; |
2622 c->add_bytes= add_bytes_mmx; | 2621 c->add_bytes= add_bytes_mmx; |
2623 c->add_bytes_l2= add_bytes_l2_mmx; | 2622 c->add_bytes_l2= add_bytes_l2_mmx; |
2624 | 2623 |
2625 c->draw_edges = draw_edges_mmx; | 2624 c->draw_edges = draw_edges_mmx; |
2626 | 2625 |
2627 if (CONFIG_ANY_H263) { | 2626 if (CONFIG_H263_DECODER || CONFIG_H263_ENCODER) { |
2628 c->h263_v_loop_filter= h263_v_loop_filter_mmx; | 2627 c->h263_v_loop_filter= h263_v_loop_filter_mmx; |
2629 c->h263_h_loop_filter= h263_h_loop_filter_mmx; | 2628 c->h263_h_loop_filter= h263_h_loop_filter_mmx; |
2630 } | 2629 } |
2631 c->put_h264_chroma_pixels_tab[0]= put_h264_chroma_mc8_mmx_rnd; | 2630 c->put_h264_chroma_pixels_tab[0]= put_h264_chroma_mc8_mmx_rnd; |
2632 c->put_h264_chroma_pixels_tab[1]= put_h264_chroma_mc4_mmx; | 2631 c->put_h264_chroma_pixels_tab[1]= put_h264_chroma_mc4_mmx; |