diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-17 21:07:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-17 21:07:25 +0200 |
| commit | 11d187b377be54de23f609592ce0f32d51ed9e6d (patch) | |
| tree | 15e5a6e0eb065a2eebfe5b0513ed458f873c6510 /libavresample | |
| parent | a3bd33af9edd71a8eb22b706b611661a096779ac (diff) | |
| parent | 21d8f4da91673051ad7055cf63d989488a56368e (diff) | |
| download | ffmpeg-11d187b377be54de23f609592ce0f32d51ed9e6d.tar.gz | |
Merge commit '21d8f4da91673051ad7055cf63d989488a56368e'
* commit '21d8f4da91673051ad7055cf63d989488a56368e':
resample: remove an unneeded context variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
| -rw-r--r-- | libavresample/resample.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/libavresample/resample.c b/libavresample/resample.c index 7eb14c0836..dc87095bc3 100644 --- a/libavresample/resample.c +++ b/libavresample/resample.c @@ -42,7 +42,6 @@ struct ResampleContext { int linear; enum AVResampleFilterType filter_type; int kaiser_beta; - double factor; void (*set_filter)(void *filter, double *tab, int phase, int tap_count); void (*resample_one)(struct ResampleContext *c, void *dst0, int dst_index, const void *src0, @@ -94,10 +93,10 @@ static double bessel(double x) } /* Build a polyphase filterbank. */ -static int build_filter(ResampleContext *c) +static int build_filter(ResampleContext *c, double factor) { int ph, i; - double x, y, w, factor; + double x, y, w; double *tab; int tap_count = c->filter_length; int phase_count = 1 << c->phase_shift; @@ -107,9 +106,6 @@ static int build_filter(ResampleContext *c) if (!tab) return AVERROR(ENOMEM); - /* if upsampling, only need to interpolate, no filter */ - factor = FFMIN(c->factor, 1.0); - for (ph = 0; ph < phase_count; ph++) { double norm = 0; for (i = 0; i < tap_count; i++) { @@ -176,7 +172,6 @@ ResampleContext *ff_audio_resample_init(AVAudioResampleContext *avr) c->phase_shift = avr->phase_shift; c->phase_mask = phase_count - 1; c->linear = avr->linear_interp; - c->factor = factor; c->filter_length = FFMAX((int)ceil(avr->filter_size / factor), 1); c->filter_type = avr->filter_type; c->kaiser_beta = avr->kaiser_beta; @@ -209,7 +204,7 @@ ResampleContext *ff_audio_resample_init(AVAudioResampleContext *avr) if (!c->filter_bank) goto error; - if (build_filter(c) < 0) + if (build_filter(c, factor) < 0) goto error; memcpy(&c->filter_bank[(c->filter_length * phase_count + 1) * felem_size], |