diff options
author | Diego Biurrun <diego@biurrun.de> | 2013-03-26 21:41:24 +0400 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2013-03-27 17:21:45 +0400 |
commit | b6649ab5037fb55f78c2606f3d23cea0867cdeaa (patch) | |
tree | ee020173ff0d43fec1ee12adde1e8571ae003b79 /libavresample/x86 | |
parent | 1db6a080bddd14fed6b29140ecd2e21e42b1c022 (diff) |
cosmetics: Remove unnecessary extern keywords from function declarations
Diffstat (limited to 'libavresample/x86')
-rw-r--r-- | libavresample/x86/audio_convert_init.c | 184 | ||||
-rw-r--r-- | libavresample/x86/audio_mix_init.c | 138 | ||||
-rw-r--r-- | libavresample/x86/dither_init.c | 11 |
3 files changed, 166 insertions, 167 deletions
diff --git a/libavresample/x86/audio_convert_init.c b/libavresample/x86/audio_convert_init.c index 879108dff1..21104458d3 100644 --- a/libavresample/x86/audio_convert_init.c +++ b/libavresample/x86/audio_convert_init.c @@ -25,123 +25,123 @@ /* flat conversions */ -extern void ff_conv_s16_to_s32_sse2(int16_t *dst, const int32_t *src, int len); +void ff_conv_s16_to_s32_sse2(int16_t *dst, const int32_t *src, int len); -extern void ff_conv_s16_to_flt_sse2(float *dst, const int16_t *src, int len); -extern void ff_conv_s16_to_flt_sse4(float *dst, const int16_t *src, int len); +void ff_conv_s16_to_flt_sse2(float *dst, const int16_t *src, int len); +void ff_conv_s16_to_flt_sse4(float *dst, const int16_t *src, int len); -extern void ff_conv_s32_to_s16_mmx (int16_t *dst, const int32_t *src, int len); -extern void ff_conv_s32_to_s16_sse2(int16_t *dst, const int32_t *src, int len); +void ff_conv_s32_to_s16_mmx (int16_t *dst, const int32_t *src, int len); +void ff_conv_s32_to_s16_sse2(int16_t *dst, const int32_t *src, int len); -extern void ff_conv_s32_to_flt_sse2(float *dst, const int32_t *src, int len); -extern void ff_conv_s32_to_flt_avx (float *dst, const int32_t *src, int len); +void ff_conv_s32_to_flt_sse2(float *dst, const int32_t *src, int len); +void ff_conv_s32_to_flt_avx (float *dst, const int32_t *src, int len); -extern void ff_conv_flt_to_s16_sse2(int16_t *dst, const float *src, int len); +void ff_conv_flt_to_s16_sse2(int16_t *dst, const float *src, int len); -extern void ff_conv_flt_to_s32_sse2(int32_t *dst, const float *src, int len); -extern void ff_conv_flt_to_s32_avx (int32_t *dst, const float *src, int len); +void ff_conv_flt_to_s32_sse2(int32_t *dst, const float *src, int len); +void ff_conv_flt_to_s32_avx (int32_t *dst, const float *src, int len); /* interleave conversions */ -extern void ff_conv_s16p_to_s16_2ch_sse2(int16_t *dst, int16_t *const *src, - int len, int channels); -extern void ff_conv_s16p_to_s16_2ch_avx (int16_t *dst, int16_t *const *src, - int len, int channels); +void ff_conv_s16p_to_s16_2ch_sse2(int16_t *dst, int16_t *const *src, + int len, int channels); +void ff_conv_s16p_to_s16_2ch_avx (int16_t *dst, int16_t *const *src, + int len, int channels); -extern void ff_conv_s16p_to_s16_6ch_sse2(int16_t *dst, int16_t *const *src, - int len, int channels); -extern void ff_conv_s16p_to_s16_6ch_sse2slow(int16_t *dst, int16_t *const *src, - int len, int channels); -extern void ff_conv_s16p_to_s16_6ch_avx (int16_t *dst, int16_t *const *src, - int len, int channels); +void ff_conv_s16p_to_s16_6ch_sse2(int16_t *dst, int16_t *const *src, + int len, int channels); +void ff_conv_s16p_to_s16_6ch_sse2slow(int16_t *dst, int16_t *const *src, + int len, int channels); +void ff_conv_s16p_to_s16_6ch_avx (int16_t *dst, int16_t *const *src, + int len, int channels); -extern void ff_conv_s16p_to_flt_2ch_sse2(float *dst, int16_t *const *src, - int len, int channels); -extern void ff_conv_s16p_to_flt_2ch_avx (float *dst, int16_t *const *src, - int len, int channels); +void ff_conv_s16p_to_flt_2ch_sse2(float *dst, int16_t *const *src, + int len, int channels); +void ff_conv_s16p_to_flt_2ch_avx (float *dst, int16_t *const *src, + int len, int channels); -extern void ff_conv_s16p_to_flt_6ch_sse2 (float *dst, int16_t *const *src, - int len, int channels); -extern void ff_conv_s16p_to_flt_6ch_ssse3(float *dst, int16_t *const *src, - int len, int channels); -extern void ff_conv_s16p_to_flt_6ch_avx (float *dst, int16_t *const *src, - int len, int channels); +void ff_conv_s16p_to_flt_6ch_sse2 (float *dst, int16_t *const *src, + int len, int channels); +void ff_conv_s16p_to_flt_6ch_ssse3(float *dst, int16_t *const *src, + int len, int channels); +void ff_conv_s16p_to_flt_6ch_avx (float *dst, int16_t *const *src, + int len, int channels); -extern void ff_conv_fltp_to_s16_2ch_sse2 (int16_t *dst, float *const *src, - int len, int channels); -extern void ff_conv_fltp_to_s16_2ch_ssse3(int16_t *dst, float *const *src, - int len, int channels); +void ff_conv_fltp_to_s16_2ch_sse2 (int16_t *dst, float *const *src, + int len, int channels); +void ff_conv_fltp_to_s16_2ch_ssse3(int16_t *dst, float *const *src, + int len, int channels); -extern void ff_conv_fltp_to_s16_6ch_sse (int16_t *dst, float *const *src, - int len, int channels); -extern void ff_conv_fltp_to_s16_6ch_sse2(int16_t *dst, float *const *src, - int len, int channels); -extern void ff_conv_fltp_to_s16_6ch_avx (int16_t *dst, float *const *src, - int len, int channels); +void ff_conv_fltp_to_s16_6ch_sse (int16_t *dst, float *const *src, + int len, int channels); +void ff_conv_fltp_to_s16_6ch_sse2(int16_t *dst, float *const *src, + int len, int channels); +void ff_conv_fltp_to_s16_6ch_avx (int16_t *dst, float *const *src, + int len, int channels); -extern void ff_conv_fltp_to_flt_2ch_sse(float *dst, float *const *src, int len, - int channels); -extern void ff_conv_fltp_to_flt_2ch_avx(float *dst, float *const *src, int len, - int channels); +void ff_conv_fltp_to_flt_2ch_sse(float *dst, float *const *src, int len, + int channels); +void ff_conv_fltp_to_flt_2ch_avx(float *dst, float *const *src, int len, + int channels); -extern void ff_conv_fltp_to_flt_6ch_mmx (float *dst, float *const *src, int len, - int channels); -extern void ff_conv_fltp_to_flt_6ch_sse4(float *dst, float *const *src, int len, - int channels); -extern void ff_conv_fltp_to_flt_6ch_avx (float *dst, float *const *src, int len, - int channels); +void ff_conv_fltp_to_flt_6ch_mmx (float *dst, float *const *src, int len, + int channels); +void ff_conv_fltp_to_flt_6ch_sse4(float *dst, float *const *src, int len, + int channels); +void ff_conv_fltp_to_flt_6ch_avx (float *dst, float *const *src, int len, + int channels); /* deinterleave conversions */ -extern void ff_conv_s16_to_s16p_2ch_sse2(int16_t *const *dst, int16_t *src, - int len, int channels); -extern void ff_conv_s16_to_s16p_2ch_ssse3(int16_t *const *dst, int16_t *src, - int len, int channels); -extern void ff_conv_s16_to_s16p_2ch_avx (int16_t *const *dst, int16_t *src, - int len, int channels); +void ff_conv_s16_to_s16p_2ch_sse2(int16_t *const *dst, int16_t *src, + int len, int channels); +void ff_conv_s16_to_s16p_2ch_ssse3(int16_t *const *dst, int16_t *src, + int len, int channels); +void ff_conv_s16_to_s16p_2ch_avx (int16_t *const *dst, int16_t *src, + int len, int channels); -extern void ff_conv_s16_to_s16p_6ch_sse2 (int16_t *const *dst, int16_t *src, - int len, int channels); -extern void ff_conv_s16_to_s16p_6ch_ssse3(int16_t *const *dst, int16_t *src, - int len, int channels); -extern void ff_conv_s16_to_s16p_6ch_avx (int16_t *const *dst, int16_t *src, - int len, int channels); +void ff_conv_s16_to_s16p_6ch_sse2 (int16_t *const *dst, int16_t *src, + int len, int channels); +void ff_conv_s16_to_s16p_6ch_ssse3(int16_t *const *dst, int16_t *src, + int len, int channels); +void ff_conv_s16_to_s16p_6ch_avx (int16_t *const *dst, int16_t *src, + int len, int channels); -extern void ff_conv_s16_to_fltp_2ch_sse2(float *const *dst, int16_t *src, - int len, int channels); -extern void ff_conv_s16_to_fltp_2ch_avx (float *const *dst, int16_t *src, - int len, int channels); +void ff_conv_s16_to_fltp_2ch_sse2(float *const *dst, int16_t *src, + int len, int channels); +void ff_conv_s16_to_fltp_2ch_avx (float *const *dst, int16_t *src, + int len, int channels); -extern void ff_conv_s16_to_fltp_6ch_sse2 (float *const *dst, int16_t *src, - int len, int channels); -extern void ff_conv_s16_to_fltp_6ch_ssse3(float *const *dst, int16_t *src, - int len, int channels); -extern void ff_conv_s16_to_fltp_6ch_sse4 (float *const *dst, int16_t *src, - int len, int channels); -extern void ff_conv_s16_to_fltp_6ch_avx (float *const *dst, int16_t *src, - int len, int channels); +void ff_conv_s16_to_fltp_6ch_sse2 (float *const *dst, int16_t *src, + int len, int channels); +void ff_conv_s16_to_fltp_6ch_ssse3(float *const *dst, int16_t *src, + int len, int channels); +void ff_conv_s16_to_fltp_6ch_sse4 (float *const *dst, int16_t *src, + int len, int channels); +void ff_conv_s16_to_fltp_6ch_avx (float *const *dst, int16_t *src, + int len, int channels); -extern void ff_conv_flt_to_s16p_2ch_sse2(int16_t *const *dst, float *src, - int len, int channels); -extern void ff_conv_flt_to_s16p_2ch_avx (int16_t *const *dst, float *src, - int len, int channels); +void ff_conv_flt_to_s16p_2ch_sse2(int16_t *const *dst, float *src, + int len, int channels); +void ff_conv_flt_to_s16p_2ch_avx (int16_t *const *dst, float *src, + int len, int channels); -extern void ff_conv_flt_to_s16p_6ch_sse2 (int16_t *const *dst, float *src, - int len, int channels); -extern void ff_conv_flt_to_s16p_6ch_ssse3(int16_t *const *dst, float *src, - int len, int channels); -extern void ff_conv_flt_to_s16p_6ch_avx (int16_t *const *dst, float *src, - int len, int channels); +void ff_conv_flt_to_s16p_6ch_sse2 (int16_t *const *dst, float *src, + int len, int channels); +void ff_conv_flt_to_s16p_6ch_ssse3(int16_t *const *dst, float *src, + int len, int channels); +void ff_conv_flt_to_s16p_6ch_avx (int16_t *const *dst, float *src, + int len, int channels); -extern void ff_conv_flt_to_fltp_2ch_sse(float *const *dst, float *src, int len, - int channels); -extern void ff_conv_flt_to_fltp_2ch_avx(float *const *dst, float *src, int len, - int channels); +void ff_conv_flt_to_fltp_2ch_sse(float *const *dst, float *src, int len, + int channels); +void ff_conv_flt_to_fltp_2ch_avx(float *const *dst, float *src, int len, + int channels); -extern void ff_conv_flt_to_fltp_6ch_sse2(float *const *dst, float *src, int len, - int channels); -extern void ff_conv_flt_to_fltp_6ch_avx (float *const *dst, float *src, int len, - int channels); +void ff_conv_flt_to_fltp_6ch_sse2(float *const *dst, float *src, int len, + int channels); +void ff_conv_flt_to_fltp_6ch_avx (float *const *dst, float *src, int len, + int channels); av_cold void ff_audio_convert_init_x86(AudioConvert *ac) { diff --git a/libavresample/x86/audio_mix_init.c b/libavresample/x86/audio_mix_init.c index 72b2397ad6..9b977f892d 100644 --- a/libavresample/x86/audio_mix_init.c +++ b/libavresample/x86/audio_mix_init.c @@ -23,80 +23,80 @@ #include "libavutil/x86/cpu.h" #include "libavresample/audio_mix.h" -extern void ff_mix_2_to_1_fltp_flt_sse(float **src, float **matrix, int len, - int out_ch, int in_ch); -extern void ff_mix_2_to_1_fltp_flt_avx(float **src, float **matrix, int len, - int out_ch, int in_ch); +void ff_mix_2_to_1_fltp_flt_sse(float **src, float **matrix, int len, + int out_ch, int in_ch); +void ff_mix_2_to_1_fltp_flt_avx(float **src, float **matrix, int len, + int out_ch, int in_ch); -extern void ff_mix_2_to_1_s16p_flt_sse2(int16_t **src, float **matrix, int len, - int out_ch, int in_ch); -extern void ff_mix_2_to_1_s16p_flt_sse4(int16_t **src, float **matrix, int len, - int out_ch, int in_ch); +void ff_mix_2_to_1_s16p_flt_sse2(int16_t **src, float **matrix, int len, + int out_ch, int in_ch); +void ff_mix_2_to_1_s16p_flt_sse4(int16_t **src, float **matrix, int len, + int out_ch, int in_ch); -extern void ff_mix_2_to_1_s16p_q8_sse2(int16_t **src, int16_t **matrix, - int len, int out_ch, int in_ch); +void ff_mix_2_to_1_s16p_q8_sse2(int16_t **src, int16_t **matrix, + int len, int out_ch, int in_ch); -extern void ff_mix_1_to_2_fltp_flt_sse(float **src, float **matrix, int len, - int out_ch, int in_ch); -extern void ff_mix_1_to_2_fltp_flt_avx(float **src, float **matrix, int len, - int out_ch, int in_ch); +void ff_mix_1_to_2_fltp_flt_sse(float **src, float **matrix, int len, + int out_ch, int in_ch); +void ff_mix_1_to_2_fltp_flt_avx(float **src, float **matrix, int len, + int out_ch, int in_ch); -extern void ff_mix_1_to_2_s16p_flt_sse2(int16_t **src, float **matrix, int len, - int out_ch, int in_ch); -extern void ff_mix_1_to_2_s16p_flt_sse4(int16_t **src, float **matrix, int len, - int out_ch, int in_ch); -extern void ff_mix_1_to_2_s16p_flt_avx (int16_t **src, float **matrix, int len, - int out_ch, int in_ch); +void ff_mix_1_to_2_s16p_flt_sse2(int16_t **src, float **matrix, int len, + int out_ch, int in_ch); +void ff_mix_1_to_2_s16p_flt_sse4(int16_t **src, float **matrix, int len, + int out_ch, int in_ch); +void ff_mix_1_to_2_s16p_flt_avx (int16_t **src, float **matrix, int len, + int out_ch, int in_ch); -#define DEFINE_MIX_3_8_TO_1_2(chan) \ -extern void ff_mix_ ## chan ## _to_1_fltp_flt_sse(float **src, \ - float **matrix, int len, \ - int out_ch, int in_ch); \ -extern void ff_mix_ ## chan ## _to_2_fltp_flt_sse(float **src, \ - float **matrix, int len, \ - int out_ch, int in_ch); \ - \ -extern void ff_mix_ ## chan ## _to_1_s16p_flt_sse2(int16_t **src, \ - float **matrix, int len, \ - int out_ch, int in_ch); \ -extern void ff_mix_ ## chan ## _to_2_s16p_flt_sse2(int16_t **src, \ - float **matrix, int len, \ - int out_ch, int in_ch); \ - \ -extern void ff_mix_ ## chan ## _to_1_s16p_flt_sse4(int16_t **src, \ - float **matrix, int len, \ - int out_ch, int in_ch); \ -extern void ff_mix_ ## chan ## _to_2_s16p_flt_sse4(int16_t **src, \ - float **matrix, int len, \ - int out_ch, int in_ch); \ - \ -extern void ff_mix_ ## chan ## _to_1_fltp_flt_avx(float **src, \ - float **matrix, int len, \ - int out_ch, int in_ch); \ -extern void ff_mix_ ## chan ## _to_2_fltp_flt_avx(float **src, \ - float **matrix, int len, \ - int out_ch, int in_ch); \ - \ -extern void ff_mix_ ## chan ## _to_1_s16p_flt_avx(int16_t **src, \ - float **matrix, int len, \ - int out_ch, int in_ch); \ -extern void ff_mix_ ## chan ## _to_2_s16p_flt_avx(int16_t **src, \ - float **matrix, int len, \ - int out_ch, int in_ch); \ - \ -extern void ff_mix_ ## chan ## _to_1_fltp_flt_fma4(float **src, \ - float **matrix, int len, \ - int out_ch, int in_ch); \ -extern void ff_mix_ ## chan ## _to_2_fltp_flt_fma4(float **src, \ - float **matrix, int len, \ - int out_ch, int in_ch); \ - \ -extern void ff_mix_ ## chan ## _to_1_s16p_flt_fma4(int16_t **src, \ - float **matrix, int len, \ - int out_ch, int in_ch); \ -extern void ff_mix_ ## chan ## _to_2_s16p_flt_fma4(int16_t **src, \ - float **matrix, int len, \ - int out_ch, int in_ch); +#define DEFINE_MIX_3_8_TO_1_2(chan) \ +void ff_mix_ ## chan ## _to_1_fltp_flt_sse(float **src, \ + float **matrix, int len, \ + int out_ch, int in_ch); \ +void ff_mix_ ## chan ## _to_2_fltp_flt_sse(float **src, \ + float **matrix, int len, \ + int out_ch, int in_ch); \ + \ +void ff_mix_ ## chan ## _to_1_s16p_flt_sse2(int16_t **src, \ + float **matrix, int len, \ + int out_ch, int in_ch); \ +void ff_mix_ ## chan ## _to_2_s16p_flt_sse2(int16_t **src, \ + float **matrix, int len, \ + int out_ch, int in_ch); \ + \ +void ff_mix_ ## chan ## _to_1_s16p_flt_sse4(int16_t **src, \ + float **matrix, int len, \ + int out_ch, int in_ch); \ +void ff_mix_ ## chan ## _to_2_s16p_flt_sse4(int16_t **src, \ + float **matrix, int len, \ + int out_ch, int in_ch); \ + \ +void ff_mix_ ## chan ## _to_1_fltp_flt_avx(float **src, \ + float **matrix, int len, \ + int out_ch, int in_ch); \ +void ff_mix_ ## chan ## _to_2_fltp_flt_avx(float **src, \ + float **matrix, int len, \ + int out_ch, int in_ch); \ + \ +void ff_mix_ ## chan ## _to_1_s16p_flt_avx(int16_t **src, \ + float **matrix, int len, \ + int out_ch, int in_ch); \ +void ff_mix_ ## chan ## _to_2_s16p_flt_avx(int16_t **src, \ + float **matrix, int len, \ + int out_ch, int in_ch); \ + \ +void ff_mix_ ## chan ## _to_1_fltp_flt_fma4(float **src, \ + float **matrix, int len, \ + int out_ch, int in_ch); \ +void ff_mix_ ## chan ## _to_2_fltp_flt_fma4(float **src, \ + float **matrix, int len, \ + int out_ch, int in_ch); \ + \ +void ff_mix_ ## chan ## _to_1_s16p_flt_fma4(int16_t **src, \ + float **matrix, int len, \ + int out_ch, int in_ch); \ +void ff_mix_ ## chan ## _to_2_s16p_flt_fma4(int16_t **src, \ + float **matrix, int len, \ + int out_ch, int in_ch); DEFINE_MIX_3_8_TO_1_2(3) DEFINE_MIX_3_8_TO_1_2(4) diff --git a/libavresample/x86/dither_init.c b/libavresample/x86/dither_init.c index de38398891..cc7e4dc13b 100644 --- a/libavresample/x86/dither_init.c +++ b/libavresample/x86/dither_init.c @@ -23,14 +23,13 @@ #include "libavutil/x86/cpu.h" #include "libavresample/dither.h" -extern void ff_quantize_sse2(int16_t *dst, const float *src, float *dither, - int len); +void ff_quantize_sse2(int16_t *dst, const float *src, float *dither, int len); -extern void ff_dither_int_to_float_rectangular_sse2(float *dst, int *src, int len); -extern void ff_dither_int_to_float_rectangular_avx(float *dst, int *src, int len); +void ff_dither_int_to_float_rectangular_sse2(float *dst, int *src, int len); +void ff_dither_int_to_float_rectangular_avx(float *dst, int *src, int len); -extern void ff_dither_int_to_float_triangular_sse2(float *dst, int *src0, int len); -extern void ff_dither_int_to_float_triangular_avx(float *dst, int *src0, int len); +void ff_dither_int_to_float_triangular_sse2(float *dst, int *src0, int len); +void ff_dither_int_to_float_triangular_avx(float *dst, int *src0, int len); av_cold void ff_dither_init_x86(DitherDSPContext *ddsp, enum AVResampleDitherMethod method) |