From f9eed5d7e6200a076f2a38c20692d3a002419781 Mon Sep 17 00:00:00 2001 From: Matthieu Bouron Date: Sat, 12 Jan 2013 14:32:03 +0100 Subject: lavfi/aevalsrc: try to honor specified duration If nb_samples divide sample_rate and if nb_samples allow it, aevalsrc should generate the exact amount of samples according to duration. Example: aevalsrc=0::n=480:s=48000:d=5.21 should generate 250080 samples. Signed-off-by: Stefano Sabatini --- libavfilter/asrc_aevalsrc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/asrc_aevalsrc.c b/libavfilter/asrc_aevalsrc.c index 3315f1f563..2e5fa98fd7 100644 --- a/libavfilter/asrc_aevalsrc.c +++ b/libavfilter/asrc_aevalsrc.c @@ -214,9 +214,9 @@ static int request_frame(AVFilterLink *outlink) EvalContext *eval = outlink->src->priv; AVFilterBufferRef *samplesref; int i, j; - double t = eval->var_values[VAR_N] * (double)1/eval->sample_rate; + double t = eval->n * (double)1/eval->sample_rate; - if (eval->duration >= 0 && t > eval->duration) + if (eval->duration >= 0 && t >= eval->duration) return AVERROR_EOF; samplesref = ff_get_audio_buffer(outlink, AV_PERM_WRITE, eval->nb_samples); -- cgit v1.2.3