diff options
| author | James Almer <jamrial@gmail.com> | 2014-07-02 01:45:21 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-02 05:14:36 +0400 |
| commit | 23a9edf531fdbca929dfaa494eb7b8df2b1ca338 (patch) | |
| tree | bc6740348d48f681258dcc3dc1301f523b9c14da /libswresample/resample_dsp.c | |
| parent | c45b7f0d806ed4120b27c02bad0242958e8414fb (diff) | |
Partially revert "swr: add prototypes for resample dsp functions"
Prototypes are not needed anymore now that the x86 functions don't
include resample_template.c
The DO_RESAMPLE_ONE macro is removed for that same reason as well.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/resample_dsp.c')
| -rw-r--r-- | libswresample/resample_dsp.c | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/libswresample/resample_dsp.c b/libswresample/resample_dsp.c index a3b600f12f..b792d420ca 100644 --- a/libswresample/resample_dsp.c +++ b/libswresample/resample_dsp.c @@ -27,17 +27,6 @@ #include "resample.h" -int swri_resample_common_int16 (ResampleContext *c, int16_t *dst, const int16_t *src, int n, int update_ctx); -int swri_resample_common_int32 (ResampleContext *c, int32_t *dst, const int32_t *src, int n, int update_ctx); -int swri_resample_common_float (ResampleContext *c, float *dst, const float *src, int n, int update_ctx); -int swri_resample_common_double(ResampleContext *c, double *dst, const double *src, int n, int update_ctx); -int swri_resample_linear_int16 (ResampleContext *c, int16_t *dst, const int16_t *src, int n, int update_ctx); -int swri_resample_linear_int32 (ResampleContext *c, int32_t *dst, const int32_t *src, int n, int update_ctx); -int swri_resample_linear_float (ResampleContext *c, float *dst, const float *src, int n, int update_ctx); -int swri_resample_linear_double(ResampleContext *c, double *dst, const double *src, int n, int update_ctx); - -#define DO_RESAMPLE_ONE 1 - #define TEMPLATE_RESAMPLE_S16 #include "resample_template.c" #undef TEMPLATE_RESAMPLE_S16 @@ -54,8 +43,6 @@ int swri_resample_linear_double(ResampleContext *c, double *dst, const double #include "resample_template.c" #undef TEMPLATE_RESAMPLE_DBL -#undef DO_RESAMPLE_ONE - void swresample_dsp_init(ResampleContext *c) { #define FNIDX(fmt) (AV_SAMPLE_FMT_##fmt - AV_SAMPLE_FMT_S16P) @@ -64,15 +51,15 @@ void swresample_dsp_init(ResampleContext *c) c->dsp.resample_one[FNIDX(FLTP)] = (resample_one_fn) resample_one_float; c->dsp.resample_one[FNIDX(DBLP)] = (resample_one_fn) resample_one_double; - c->dsp.resample_common[FNIDX(S16P)] = (resample_fn) swri_resample_common_int16; - c->dsp.resample_common[FNIDX(S32P)] = (resample_fn) swri_resample_common_int32; - c->dsp.resample_common[FNIDX(FLTP)] = (resample_fn) swri_resample_common_float; - c->dsp.resample_common[FNIDX(DBLP)] = (resample_fn) swri_resample_common_double; + c->dsp.resample_common[FNIDX(S16P)] = (resample_fn) resample_common_int16; + c->dsp.resample_common[FNIDX(S32P)] = (resample_fn) resample_common_int32; + c->dsp.resample_common[FNIDX(FLTP)] = (resample_fn) resample_common_float; + c->dsp.resample_common[FNIDX(DBLP)] = (resample_fn) resample_common_double; - c->dsp.resample_linear[FNIDX(S16P)] = (resample_fn) swri_resample_linear_int16; - c->dsp.resample_linear[FNIDX(S32P)] = (resample_fn) swri_resample_linear_int32; - c->dsp.resample_linear[FNIDX(FLTP)] = (resample_fn) swri_resample_linear_float; - c->dsp.resample_linear[FNIDX(DBLP)] = (resample_fn) swri_resample_linear_double; + c->dsp.resample_linear[FNIDX(S16P)] = (resample_fn) resample_linear_int16; + c->dsp.resample_linear[FNIDX(S32P)] = (resample_fn) resample_linear_int32; + c->dsp.resample_linear[FNIDX(FLTP)] = (resample_fn) resample_linear_float; + c->dsp.resample_linear[FNIDX(DBLP)] = (resample_fn) resample_linear_double; if (ARCH_X86) swresample_dsp_x86_init(c); } |