diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-11 21:19:39 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-11 22:04:00 +0100 |
commit | ae5a55e77a209ebbac6201ffd790dc7841634266 (patch) | |
tree | dd6cf348b7bb7ddd239d669ccc6fe734f5dc6087 /libswresample/resample.c | |
parent | 431dcc49d2dca8e01e766a4a36e3aa6becbaeb55 (diff) | |
download | ffmpeg-ae5a55e77a209ebbac6201ffd790dc7841634266.tar.gz |
swr: move flush into Resampler
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/resample.c')
-rw-r--r-- | libswresample/resample.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/libswresample/resample.c b/libswresample/resample.c index f3881cdd57..9599421cc3 100644 --- a/libswresample/resample.c +++ b/libswresample/resample.c @@ -344,10 +344,27 @@ static int64_t get_delay(struct SwrContext *s, int64_t base){ return av_rescale(num, base, s->in_sample_rate*(int64_t)c->src_incr << c->phase_shift); } +static int resample_flush(struct SwrContext *s) { + AudioData *a= &s->in_buffer; + int i, j, ret; + if((ret = swri_realloc_audio(a, s->in_buffer_index + 2*s->in_buffer_count)) < 0) + return ret; + av_assert0(a->planar); + for(i=0; i<a->ch_count; i++){ + for(j=0; j<s->in_buffer_count; j++){ + memcpy(a->ch[i] + (s->in_buffer_index+s->in_buffer_count+j )*a->bps, + a->ch[i] + (s->in_buffer_index+s->in_buffer_count-j-1)*a->bps, a->bps); + } + } + s->in_buffer_count += (s->in_buffer_count+1)/2; + return 0; +} + struct Resampler const swri_resampler={ resample_init, resample_free, multiple_resample, + resample_flush, set_compensation, get_delay, }; |