X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libswresample%2Fresample_dsp.c;h=a811b8b6fa8eab8c1568a29f633136aed3ece2bb;hp=b792d420ca823a1289c3e91457b9b4bc1599f667;hb=857cd1f33bcf86005529af2a77f861f884327be5;hpb=23a9edf531fdbca929dfaa494eb7b8df2b1ca338 diff --git a/libswresample/resample_dsp.c b/libswresample/resample_dsp.c index b792d420ca..a811b8b6fa 100644 --- a/libswresample/resample_dsp.c +++ b/libswresample/resample_dsp.c @@ -43,23 +43,26 @@ #include "resample_template.c" #undef TEMPLATE_RESAMPLE_DBL -void swresample_dsp_init(ResampleContext *c) +void swri_resample_dsp_init(ResampleContext *c) { -#define FNIDX(fmt) (AV_SAMPLE_FMT_##fmt - AV_SAMPLE_FMT_S16P) - c->dsp.resample_one[FNIDX(S16P)] = (resample_one_fn) resample_one_int16; - c->dsp.resample_one[FNIDX(S32P)] = (resample_one_fn) resample_one_int32; - c->dsp.resample_one[FNIDX(FLTP)] = (resample_one_fn) resample_one_float; - c->dsp.resample_one[FNIDX(DBLP)] = (resample_one_fn) resample_one_double; + switch(c->format){ + case AV_SAMPLE_FMT_S16P: + c->dsp.resample_one = resample_one_int16; + c->dsp.resample = c->linear ? resample_linear_int16 : resample_common_int16; + break; + case AV_SAMPLE_FMT_S32P: + c->dsp.resample_one = resample_one_int32; + c->dsp.resample = c->linear ? resample_linear_int32 : resample_common_int32; + break; + case AV_SAMPLE_FMT_FLTP: + c->dsp.resample_one = resample_one_float; + c->dsp.resample = c->linear ? resample_linear_float : resample_common_float; + break; + case AV_SAMPLE_FMT_DBLP: + c->dsp.resample_one = resample_one_double; + c->dsp.resample = c->linear ? resample_linear_double : resample_common_double; + break; + } - 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) 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); + if (ARCH_X86) swri_resample_dsp_x86_init(c); }