lavfi/aevalsrc: try to honor specified duration
authorMatthieu Bouron <matthieu.bouron@gmail.com>
Sat, 12 Jan 2013 13:32:03 +0000 (14:32 +0100)
committerStefano Sabatini <stefasab@gmail.com>
Sat, 12 Jan 2013 16:26:35 +0000 (17:26 +0100)
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 <stefasab@gmail.com>
libavfilter/asrc_aevalsrc.c

index 3315f1f..2e5fa98 100644 (file)
@@ -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);