Mercurial > libavcodec.hg

comparison dct-test.c @ 12456:a5ddb39627fd libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 7dd2a45249a9
children 9fef0a8ddd63
comparison
equal deleted inserted replaced
12455:14f85520cd02 12456:a5ddb39627fd
92 {"REF-DBL", 1, ff_ref_idct, ff_ref_idct, NO_PERM}, 92 {"REF-DBL", 1, ff_ref_idct, ff_ref_idct, NO_PERM},
93 {"INT", 1, j_rev_dct, ff_ref_idct, MMX_PERM}, 93 {"INT", 1, j_rev_dct, ff_ref_idct, MMX_PERM},
94 {"SIMPLE-C", 1, ff_simple_idct, ff_ref_idct, NO_PERM}, 94 {"SIMPLE-C", 1, ff_simple_idct, ff_ref_idct, NO_PERM},
95 95
96 #if HAVE_MMX 96 #if HAVE_MMX
97 {"MMX", 0, ff_fdct_mmx, ff_ref_fdct, NO_PERM, FF_MM_MMX}, 97 {"MMX", 0, ff_fdct_mmx, ff_ref_fdct, NO_PERM, AV_CPU_FLAG_MMX},
98 #if HAVE_MMX2 98 #if HAVE_MMX2
99 {"MMX2", 0, ff_fdct_mmx2, ff_ref_fdct, NO_PERM, FF_MM_MMX2}, 99 {"MMX2", 0, ff_fdct_mmx2, ff_ref_fdct, NO_PERM, AV_CPU_FLAG_MMX2},
100 {"SSE2", 0, ff_fdct_sse2, ff_ref_fdct, NO_PERM, FF_MM_SSE2}, 100 {"SSE2", 0, ff_fdct_sse2, ff_ref_fdct, NO_PERM, AV_CPU_FLAG_SSE2},
101 #endif 101 #endif
102 102
103 #if CONFIG_GPL 103 #if CONFIG_GPL
104 {"LIBMPEG2-MMX", 1, ff_mmx_idct, ff_ref_idct, MMX_PERM, FF_MM_MMX}, 104 {"LIBMPEG2-MMX", 1, ff_mmx_idct, ff_ref_idct, MMX_PERM, AV_CPU_FLAG_MMX},
105 {"LIBMPEG2-MMX2", 1, ff_mmxext_idct, ff_ref_idct, MMX_PERM, FF_MM_MMX2}, 105 {"LIBMPEG2-MMX2", 1, ff_mmxext_idct, ff_ref_idct, MMX_PERM, AV_CPU_FLAG_MMX2},
106 #endif 106 #endif
107 {"SIMPLE-MMX", 1, ff_simple_idct_mmx, ff_ref_idct, MMX_SIMPLE_PERM, FF_MM_MMX}, 107 {"SIMPLE-MMX", 1, ff_simple_idct_mmx, ff_ref_idct, MMX_SIMPLE_PERM, AV_CPU_FLAG_MMX},
108 {"XVID-MMX", 1, ff_idct_xvid_mmx, ff_ref_idct, NO_PERM, FF_MM_MMX}, 108 {"XVID-MMX", 1, ff_idct_xvid_mmx, ff_ref_idct, NO_PERM, AV_CPU_FLAG_MMX},
109 {"XVID-MMX2", 1, ff_idct_xvid_mmx2, ff_ref_idct, NO_PERM, FF_MM_MMX2}, 109 {"XVID-MMX2", 1, ff_idct_xvid_mmx2, ff_ref_idct, NO_PERM, AV_CPU_FLAG_MMX2},
110 {"XVID-SSE2", 1, ff_idct_xvid_sse2, ff_ref_idct, SSE2_PERM, FF_MM_SSE2}, 110 {"XVID-SSE2", 1, ff_idct_xvid_sse2, ff_ref_idct, SSE2_PERM, AV_CPU_FLAG_SSE2},
111 #endif 111 #endif
112 112
113 #if HAVE_ALTIVEC 113 #if HAVE_ALTIVEC
114 {"altivecfdct", 0, fdct_altivec, ff_ref_fdct, NO_PERM, FF_MM_ALTIVEC}, 114 {"altivecfdct", 0, fdct_altivec, ff_ref_fdct, NO_PERM, AV_CPU_FLAG_ALTIVEC},
115 #endif 115 #endif
116 116
117 #if ARCH_BFIN 117 #if ARCH_BFIN
118 {"BFINfdct", 0, ff_bfin_fdct, ff_ref_fdct, NO_PERM}, 118 {"BFINfdct", 0, ff_bfin_fdct, ff_ref_fdct, NO_PERM},
119 {"BFINidct", 1, ff_bfin_idct, ff_ref_idct, NO_PERM}, 119 {"BFINidct", 1, ff_bfin_idct, ff_ref_idct, NO_PERM},
185 DECLARE_ALIGNED(8, static DCTELEM, block_org)[64]; 185 DECLARE_ALIGNED(8, static DCTELEM, block_org)[64];
186 186
187 static inline void mmx_emms(void) 187 static inline void mmx_emms(void)
188 { 188 {
189 #if HAVE_MMX 189 #if HAVE_MMX
190 if (cpu_flags & FF_MM_MMX) 190 if (cpu_flags & AV_CPU_FLAG_MMX)
191 __asm__ volatile ("emms\n\t"); 191 __asm__ volatile ("emms\n\t");
192 #endif 192 #endif
193 } 193 }
194 194
195 static void dct_error(const char *name, int is_idct, 195 static void dct_error(const char *name, int is_idct,