[SCM] libav/experimental: af_resample: Use avresample_get_out_samples
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:03:18 UTC 2014
The following commit has been merged in the experimental branch:
commit ad0fe2f4012031c47268f14b9835088c488e1998
Author: Luca Barbato <lu_zero at gentoo.org>
Date: Mon May 26 21:30:30 2014 +0200
af_resample: Use avresample_get_out_samples
diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c
index a89ab35..bc8fd8a 100644
--- a/libavfilter/af_resample.c
+++ b/libavfilter/af_resample.c
@@ -180,10 +180,7 @@ static int request_frame(AVFilterLink *outlink)
/* flush the lavr delay buffer */
if (ret == AVERROR_EOF && s->avr) {
AVFrame *frame;
- int nb_samples = av_rescale_rnd(avresample_get_delay(s->avr),
- outlink->sample_rate,
- ctx->inputs[0]->sample_rate,
- AV_ROUND_UP);
+ int nb_samples = avresample_get_out_samples(s->avr, 0);
if (!nb_samples)
return ret;
@@ -219,9 +216,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
/* maximum possible samples lavr can output */
delay = avresample_get_delay(s->avr);
- nb_samples = av_rescale_rnd(in->nb_samples + delay,
- outlink->sample_rate, inlink->sample_rate,
- AV_ROUND_UP);
+ nb_samples = avresample_get_out_samples(s->avr, in->nb_samples);
out = ff_get_audio_buffer(outlink, nb_samples);
if (!out) {
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list