Rename the called dsp init functions to *_init_x86.
Janne Grunau authored on 2012/10/06 02:54:10... | ... |
@@ -160,7 +160,7 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse) |
160 | 160 |
#if CONFIG_FFT_FLOAT |
161 | 161 |
if (ARCH_ARM) ff_fft_init_arm(s); |
162 | 162 |
if (HAVE_ALTIVEC) ff_fft_init_altivec(s); |
163 |
- if (HAVE_MMX) ff_fft_init_mmx(s); |
|
163 |
+ if (ARCH_X86) ff_fft_init_x86(s); |
|
164 | 164 |
if (CONFIG_MDCT) s->mdct_calcw = s->mdct_calc; |
165 | 165 |
#else |
166 | 166 |
if (CONFIG_MDCT) s->mdct_calcw = ff_mdct_calcw_c; |
... | ... |
@@ -135,7 +135,7 @@ int ff_fft_init(FFTContext *s, int nbits, int inverse); |
135 | 135 |
|
136 | 136 |
#if CONFIG_FFT_FLOAT |
137 | 137 |
void ff_fft_init_altivec(FFTContext *s); |
138 |
-void ff_fft_init_mmx(FFTContext *s); |
|
138 |
+void ff_fft_init_x86(FFTContext *s); |
|
139 | 139 |
void ff_fft_init_arm(FFTContext *s); |
140 | 140 |
#else |
141 | 141 |
void ff_fft_fixed_init_arm(FFTContext *s); |
... | ... |
@@ -85,5 +85,5 @@ av_cold void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx) |
85 | 85 |
|
86 | 86 |
if (ARCH_ARM) ff_fmt_convert_init_arm(c, avctx); |
87 | 87 |
if (HAVE_ALTIVEC) ff_fmt_convert_init_altivec(c, avctx); |
88 |
- if (HAVE_MMX) ff_fmt_convert_init_x86(c, avctx); |
|
88 |
+ if (ARCH_X86) ff_fmt_convert_init_x86(c, avctx); |
|
89 | 89 |
} |
... | ... |
@@ -114,5 +114,5 @@ void ff_h264dsp_init(H264DSPContext *c, const int bit_depth, const int chroma_fo |
114 | 114 |
|
115 | 115 |
if (ARCH_ARM) ff_h264dsp_init_arm(c, bit_depth, chroma_format_idc); |
116 | 116 |
if (HAVE_ALTIVEC) ff_h264dsp_init_ppc(c, bit_depth, chroma_format_idc); |
117 |
- if (HAVE_MMX) ff_h264dsp_init_x86(c, bit_depth, chroma_format_idc); |
|
117 |
+ if (ARCH_X86) ff_h264dsp_init_x86(c, bit_depth, chroma_format_idc); |
|
118 | 118 |
} |
... | ... |
@@ -533,5 +533,5 @@ void ff_h264_pred_init(H264PredContext *h, int codec_id, const int bit_depth, co |
533 | 533 |
} |
534 | 534 |
|
535 | 535 |
if (ARCH_ARM) ff_h264_pred_init_arm(h, codec_id, bit_depth, chroma_format_idc); |
536 |
- if (HAVE_MMX) ff_h264_pred_init_x86(h, codec_id, bit_depth, chroma_format_idc); |
|
536 |
+ if (ARCH_X86) ff_h264_pred_init_x86(h, codec_id, bit_depth, chroma_format_idc); |
|
537 | 537 |
} |
... | ... |
@@ -258,7 +258,7 @@ av_cold int ff_lpc_init(LPCContext *s, int blocksize, int max_order, |
258 | 258 |
s->lpc_apply_welch_window = lpc_apply_welch_window_c; |
259 | 259 |
s->lpc_compute_autocorr = lpc_compute_autocorr_c; |
260 | 260 |
|
261 |
- if (HAVE_MMX) |
|
261 |
+ if (ARCH_X86) |
|
262 | 262 |
ff_lpc_init_x86(s); |
263 | 263 |
|
264 | 264 |
return 0; |
... | ... |
@@ -41,6 +41,6 @@ void ff_mpadsp_init(MPADSPContext *s) |
41 | 41 |
s->imdct36_blocks_fixed = ff_imdct36_blocks_fixed; |
42 | 42 |
|
43 | 43 |
if (ARCH_ARM) ff_mpadsp_init_arm(s); |
44 |
- if (HAVE_MMX) ff_mpadsp_init_mmx(s); |
|
44 |
+ if (ARCH_X86) ff_mpadsp_init_x86(s); |
|
45 | 45 |
if (HAVE_ALTIVEC) ff_mpadsp_init_altivec(s); |
46 | 46 |
} |
... | ... |
@@ -55,7 +55,7 @@ void ff_mpa_synth_filter_float(MPADSPContext *s, |
55 | 55 |
float *sb_samples); |
56 | 56 |
|
57 | 57 |
void ff_mpadsp_init_arm(MPADSPContext *s); |
58 |
-void ff_mpadsp_init_mmx(MPADSPContext *s); |
|
58 |
+void ff_mpadsp_init_x86(MPADSPContext *s); |
|
59 | 59 |
void ff_mpadsp_init_altivec(MPADSPContext *s); |
60 | 60 |
|
61 | 61 |
void ff_mpa_synth_init_float(float *window); |
... | ... |
@@ -75,7 +75,7 @@ void ff_proresdsp_init(ProresDSPContext *dsp) |
75 | 75 |
dsp->idct_put = prores_idct_put_c; |
76 | 76 |
dsp->idct_permutation_type = FF_NO_IDCT_PERM; |
77 | 77 |
|
78 |
- if (HAVE_MMX) ff_proresdsp_x86_init(dsp); |
|
78 |
+ if (ARCH_X86) ff_proresdsp_x86_init(dsp); |
|
79 | 79 |
|
80 | 80 |
ff_init_scantable_permutation(dsp->idct_permutation, |
81 | 81 |
dsp->idct_permutation_type); |
... | ... |
@@ -603,7 +603,7 @@ av_cold void ff_rv40dsp_init(RV34DSPContext *c, DSPContext* dsp) { |
603 | 603 |
c->rv40_loop_filter_strength[0] = rv40_h_loop_filter_strength; |
604 | 604 |
c->rv40_loop_filter_strength[1] = rv40_v_loop_filter_strength; |
605 | 605 |
|
606 |
- if (HAVE_MMX) |
|
606 |
+ if (ARCH_X86) |
|
607 | 607 |
ff_rv40dsp_init_x86(c, dsp); |
608 | 608 |
if (HAVE_NEON) |
609 | 609 |
ff_rv40dsp_init_neon(c, dsp); |
... | ... |
@@ -1,38 +1,39 @@ |
1 |
+OBJS += x86/fmtconvert_init.o |
|
2 |
+ |
|
3 |
+OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp_init.o |
|
4 |
+OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o |
|
1 | 5 |
OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o |
6 |
+OBJS-$(CONFIG_FFT) += x86/fft_init.o |
|
7 |
+OBJS-$(CONFIG_H264DSP) += x86/h264dsp_init.o |
|
8 |
+OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o |
|
9 |
+OBJS-$(CONFIG_LPC) += x86/lpc.o |
|
2 | 10 |
OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o |
11 |
+OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodec.o |
|
3 | 12 |
OBJS-$(CONFIG_MPEGVIDEO) += x86/mpegvideo.o |
4 | 13 |
OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoenc.o |
14 |
+OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp_init.o |
|
15 |
+OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp_init.o |
|
16 |
+OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp_init.o |
|
17 |
+OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp_init.o \ |
|
18 |
+ x86/rv40dsp_init.o |
|
5 | 19 |
OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o |
6 | 20 |
OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp_init.o |
21 |
+OBJS-$(CONFIG_VP5_DECODER) += x86/vp56dsp_init.o |
|
22 |
+OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp_init.o |
|
23 |
+OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp_init.o |
|
7 | 24 |
OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o |
8 | 25 |
|
9 | 26 |
MMX-OBJS += x86/dsputil_mmx.o \ |
10 | 27 |
x86/fdct.o \ |
11 |
- x86/fmtconvert_init.o \ |
|
12 | 28 |
x86/idct_mmx_xvid.o \ |
13 | 29 |
x86/idct_sse2_xvid.o \ |
14 | 30 |
x86/simple_idct.o \ |
15 | 31 |
|
16 |
-MMX-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp_init.o |
|
17 |
-MMX-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o |
|
18 | 32 |
MMX-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp.o |
19 | 33 |
MMX-OBJS-$(CONFIG_DWT) += x86/snowdsp.o |
20 | 34 |
MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o \ |
21 | 35 |
x86/motion_est.o |
22 |
-MMX-OBJS-$(CONFIG_FFT) += x86/fft_init.o |
|
23 |
-MMX-OBJS-$(CONFIG_H264DSP) += x86/h264dsp_init.o |
|
24 |
-MMX-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o |
|
25 |
-MMX-OBJS-$(CONFIG_LPC) += x86/lpc.o |
|
26 |
-MMX-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodec.o |
|
27 |
-MMX-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp_init.o |
|
28 |
-MMX-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp_init.o |
|
29 |
-MMX-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp_init.o |
|
30 |
-MMX-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp_init.o \ |
|
31 |
- x86/rv40dsp_init.o |
|
32 | 36 |
MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o |
33 |
-MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp56dsp_init.o |
|
34 |
-MMX-OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp_init.o |
|
35 |
-MMX-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp_init.o |
|
36 | 37 |
|
37 | 38 |
YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o |
38 | 39 |
YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o |
... | ... |
@@ -22,7 +22,7 @@ |
22 | 22 |
#include "libavcodec/dct.h" |
23 | 23 |
#include "fft.h" |
24 | 24 |
|
25 |
-av_cold void ff_fft_init_mmx(FFTContext *s) |
|
25 |
+av_cold void ff_fft_init_x86(FFTContext *s) |
|
26 | 26 |
{ |
27 | 27 |
int has_vectors = av_get_cpu_flags(); |
28 | 28 |
#if ARCH_X86_32 |
... | ... |
@@ -56,7 +56,7 @@ av_cold void ff_fft_init_mmx(FFTContext *s) |
56 | 56 |
} |
57 | 57 |
|
58 | 58 |
#if CONFIG_DCT |
59 |
-av_cold void ff_dct_init_mmx(DCTContext *s) |
|
59 |
+av_cold void ff_dct_init_x86(DCTContext *s) |
|
60 | 60 |
{ |
61 | 61 |
int has_vectors = av_get_cpu_flags(); |
62 | 62 |
if (EXTERNAL_SSE(has_vectors)) |
... | ... |
@@ -195,12 +195,12 @@ void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp) |
195 | 195 |
if (EXTERNAL_MMX(mm_flags)) { |
196 | 196 |
c->put_chroma_pixels_tab[0] = ff_put_rv40_chroma_mc8_mmx; |
197 | 197 |
c->put_chroma_pixels_tab[1] = ff_put_rv40_chroma_mc4_mmx; |
198 |
-#if HAVE_INLINE_ASM |
|
198 |
+#if HAVE_MMX_INLINE |
|
199 | 199 |
c->put_pixels_tab[0][15] = ff_put_rv40_qpel16_mc33_mmx; |
200 | 200 |
c->put_pixels_tab[1][15] = ff_put_rv40_qpel8_mc33_mmx; |
201 | 201 |
c->avg_pixels_tab[0][15] = ff_avg_rv40_qpel16_mc33_mmx; |
202 | 202 |
c->avg_pixels_tab[1][15] = ff_avg_rv40_qpel8_mc33_mmx; |
203 |
-#endif /* HAVE_INLINE_ASM */ |
|
203 |
+#endif /* HAVE_MMX_INLINE */ |
|
204 | 204 |
#if ARCH_X86_32 |
205 | 205 |
QPEL_MC_SET(put_, _mmx) |
206 | 206 |
#endif |