diff options
| author | James Almer <jamrial@gmail.com> | 2014-06-15 02:21:44 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-15 03:33:17 +0400 |
| commit | 7f4dfbd0809db97f6abafba7b9361278dfa2e994 (patch) | |
| tree | 593b82465a0b24fb000f66ad149dd897621fb0cc /libswresample/x86 | |
| parent | 86a9370e2b91d67375e66a06d6eb573b5a017775 (diff) | |
swr: add prototypes for resample dsp functions
Should fix compilation failures with MSVC and any other compiler
without inline asm support.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/x86')
| -rw-r--r-- | libswresample/x86/resample_x86_dsp.c | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/libswresample/x86/resample_x86_dsp.c b/libswresample/x86/resample_x86_dsp.c index 02a7db51c2..e03713816b 100644 --- a/libswresample/x86/resample_x86_dsp.c +++ b/libswresample/x86/resample_x86_dsp.c @@ -27,6 +27,17 @@ #include "libswresample/resample.h" +int swri_resample_common_int16_mmx2 (ResampleContext *c, int16_t *dst, const int16_t *src, int n, int update_ctx); +int swri_resample_linear_int16_mmx2 (ResampleContext *c, int16_t *dst, const int16_t *src, int n, int update_ctx); +int swri_resample_common_int16_sse2 (ResampleContext *c, int16_t *dst, const int16_t *src, int n, int update_ctx); +int swri_resample_linear_int16_sse2 (ResampleContext *c, int16_t *dst, const int16_t *src, int n, int update_ctx); +int swri_resample_common_float_sse (ResampleContext *c, float *dst, const float *src, int n, int update_ctx); +int swri_resample_linear_float_sse (ResampleContext *c, float *dst, const float *src, int n, int update_ctx); +int swri_resample_common_float_avx (ResampleContext *c, float *dst, const float *src, int n, int update_ctx); +int swri_resample_linear_float_avx (ResampleContext *c, float *dst, const float *src, int n, int update_ctx); +int swri_resample_common_double_sse2(ResampleContext *c, double *dst, const double *src, int n, int update_ctx); +int swri_resample_linear_double_sse2(ResampleContext *c, double *dst, const double *src, int n, int update_ctx); + #if HAVE_MMXEXT_INLINE #define DO_RESAMPLE_ONE 0 @@ -69,21 +80,21 @@ void swresample_dsp_x86_init(ResampleContext *c) #define FNIDX(fmt) (AV_SAMPLE_FMT_##fmt - AV_SAMPLE_FMT_S16P) if (ARCH_X86_32 && HAVE_MMXEXT_INLINE && mm_flags & AV_CPU_FLAG_MMX2) { - c->dsp.resample_common[FNIDX(S16P)] = (resample_fn) resample_common_int16_mmx2; - c->dsp.resample_linear[FNIDX(S16P)] = (resample_fn) resample_linear_int16_mmx2; + c->dsp.resample_common[FNIDX(S16P)] = (resample_fn) swri_resample_common_int16_mmx2; + c->dsp.resample_linear[FNIDX(S16P)] = (resample_fn) swri_resample_linear_int16_mmx2; } if (HAVE_SSE_INLINE && mm_flags & AV_CPU_FLAG_SSE) { - c->dsp.resample_common[FNIDX(FLTP)] = (resample_fn) resample_common_float_sse; - c->dsp.resample_linear[FNIDX(FLTP)] = (resample_fn) resample_linear_float_sse; + c->dsp.resample_common[FNIDX(FLTP)] = (resample_fn) swri_resample_common_float_sse; + c->dsp.resample_linear[FNIDX(FLTP)] = (resample_fn) swri_resample_linear_float_sse; } if (HAVE_SSE2_INLINE && mm_flags & AV_CPU_FLAG_SSE2) { - c->dsp.resample_common[FNIDX(S16P)] = (resample_fn) resample_common_int16_sse2; - c->dsp.resample_linear[FNIDX(S16P)] = (resample_fn) resample_linear_int16_sse2; - c->dsp.resample_common[FNIDX(DBLP)] = (resample_fn) resample_common_double_sse2; - c->dsp.resample_linear[FNIDX(DBLP)] = (resample_fn) resample_linear_double_sse2; + c->dsp.resample_common[FNIDX(S16P)] = (resample_fn) swri_resample_common_int16_sse2; + c->dsp.resample_linear[FNIDX(S16P)] = (resample_fn) swri_resample_linear_int16_sse2; + c->dsp.resample_common[FNIDX(DBLP)] = (resample_fn) swri_resample_common_double_sse2; + c->dsp.resample_linear[FNIDX(DBLP)] = (resample_fn) swri_resample_linear_double_sse2; } if (HAVE_AVX_INLINE && mm_flags & AV_CPU_FLAG_AVX) { - c->dsp.resample_common[FNIDX(FLTP)] = (resample_fn) resample_common_float_avx; - c->dsp.resample_linear[FNIDX(FLTP)] = (resample_fn) resample_linear_float_avx; + c->dsp.resample_common[FNIDX(FLTP)] = (resample_fn) swri_resample_common_float_avx; + c->dsp.resample_linear[FNIDX(FLTP)] = (resample_fn) swri_resample_linear_float_avx; } } |