diff options
Diffstat (limited to 'libswresample/resample_template.c')
| -rw-r--r-- | libswresample/resample_template.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/libswresample/resample_template.c b/libswresample/resample_template.c index 1982992e8a..2a64f50038 100644 --- a/libswresample/resample_template.c +++ b/libswresample/resample_template.c @@ -44,17 +44,15 @@ #elif defined(TEMPLATE_RESAMPLE_FLT) +# define RENAME(N) N ## _float # define FILTER_SHIFT 0 # define DELEM float # define FELEM float # define FELEM2 float # define OUT(d, v) d = v -# if defined(TEMPLATE_RESAMPLE_FLT) -# define RENAME(N) N ## _float -# endif - #elif defined(TEMPLATE_RESAMPLE_S32) + # define RENAME(N) N ## _int32 # define FILTER_SHIFT 30 # define DELEM int32_t @@ -65,10 +63,9 @@ # define OUT(d, v) v = (v + (1<<(FILTER_SHIFT-1)))>>FILTER_SHIFT;\ d = (uint64_t)(v + 0x80000000) > 0xFFFFFFFF ? (v>>63) ^ 0x7FFFFFFF : v -#elif defined(TEMPLATE_RESAMPLE_S16) \ - || defined(TEMPLATE_RESAMPLE_S16_MMX2) \ - || defined(TEMPLATE_RESAMPLE_S16_SSE2) +#elif defined(TEMPLATE_RESAMPLE_S16) +# define RENAME(N) N ## _int16 # define FILTER_SHIFT 15 # define DELEM int16_t # define FELEM int16_t @@ -79,18 +76,6 @@ # define OUT(d, v) v = (v + (1<<(FILTER_SHIFT-1)))>>FILTER_SHIFT;\ d = (unsigned)(v + 32768) > 65535 ? (v>>31) ^ 32767 : v -# if defined(TEMPLATE_RESAMPLE_S16) -# define RENAME(N) N ## _int16 -# elif defined(TEMPLATE_RESAMPLE_S16_MMX2) -# define COMMON_CORE COMMON_CORE_INT16_MMX2 -# define LINEAR_CORE LINEAR_CORE_INT16_MMX2 -# define RENAME(N) N ## _int16_mmx2 -# elif defined(TEMPLATE_RESAMPLE_S16_SSE2) -# define COMMON_CORE COMMON_CORE_INT16_SSE2 -# define LINEAR_CORE LINEAR_CORE_INT16_SSE2 -# define RENAME(N) N ## _int16_sse2 -# endif - #endif #if DO_RESAMPLE_ONE |