xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-25 20:50:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

af_resample: Use avresample_get_out_samples

Browse Source
This commit is contained in:
Luca Barbato 2014-05-26 21:30:30 +02:00
parent b2d4565422
commit ad0fe2f401
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavfilter/af_resample.c
View File

@ -180,10 +180,7 @@ static int request_frame(AVFilterLink *outlink)
/* flush the lavr delay buffer */ /* flush the lavr delay buffer */
if (ret == AVERROR_EOF && s->avr) { if (ret == AVERROR_EOF && s->avr) {
AVFrame *frame; AVFrame *frame;
int nb_samples = av_rescale_rnd(avresample_get_delay(s->avr), int nb_samples = avresample_get_out_samples(s->avr, 0);
outlink->sample_rate,
ctx->inputs[0]->sample_rate,
AV_ROUND_UP);
if (!nb_samples) if (!nb_samples)
return ret; return ret;
@ -219,9 +216,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
/* maximum possible samples lavr can output */ /* maximum possible samples lavr can output */
delay = avresample_get_delay(s->avr); delay = avresample_get_delay(s->avr);
nb_samples = av_rescale_rnd(in->nb_samples + delay, nb_samples = avresample_get_out_samples(s->avr, in->nb_samples);
outlink->sample_rate, inlink->sample_rate,
AV_ROUND_UP);
out = ff_get_audio_buffer(outlink, nb_samples); out = ff_get_audio_buffer(outlink, nb_samples);
if (!out) { if (!out) {