diff options
author | Anton Khirnov <anton@khirnov.net> | 2014-03-05 00:18:27 +0400 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2014-04-11 18:21:25 +0400 |
commit | b9dea23766f52b8e059e72d34980bb7b456efe8f (patch) | |
tree | 2282563932588cb4a286ec693a6b6bfac123ab2f | |
parent | 71c32ed5335add04cbe44896f4b3d748b9b1153c (diff) |
resample: fix avresample_get_delay() return value
The correct "next" input sample is not the first sample of the
resampling buffer, but the center sample of the filter_length-sized
block at the beginning.
CC:libav-stable@libav.org
-rw-r--r-- | libavresample/resample.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavresample/resample.c b/libavresample/resample.c index 69c9bab893..d9c4e019ec 100644 --- a/libavresample/resample.c +++ b/libavresample/resample.c @@ -47,6 +47,7 @@ struct ResampleContext { void (*resample_one)(struct ResampleContext *c, int no_filter, void *dst0, int dst_index, const void *src0, int src_size, int index, int frac); + int padding_size; }; @@ -212,6 +213,7 @@ ResampleContext *ff_audio_resample_init(AVAudioResampleContext *avr) goto error; c->ideal_dst_incr = c->dst_incr; + c->padding_size = (c->filter_length - 1) / 2; c->index = -phase_count * ((c->filter_length - 1) / 2); c->frac = 0; @@ -462,8 +464,10 @@ int ff_audio_resample(ResampleContext *c, AudioData *dst, AudioData *src) int avresample_get_delay(AVAudioResampleContext *avr) { + ResampleContext *c = avr->resample; + if (!avr->resample_needed || !avr->resample) return 0; - return avr->resample->buffer->nb_samples; + return FFMAX(c->buffer->nb_samples - c->padding_size, 0); } |