avfilter/aeval: trim last frame's number of samples to match requested duration

Fixes #6181.

Paul B Mahol committed 9 years ago

Commit dbc7f021 parent 353f5093 files · +1544 −1156Browse files

Showing the changes to libavfilter (1 of 3 files). Show all

Unified · Split

     AVFrame *samplesref;
     int i, j;
     int64_t t = av_rescale(eval->n, AV_TIME_BASE, eval->sample_rate);
+    int nb_samples;
     if (eval->duration >= 0 && t >= eval->duration)
         return AVERROR_EOF;
-    samplesref = ff_get_audio_buffer(outlink, eval->nb_samples);
+    if (eval->duration >= 0) {
+        nb_samples = FFMIN(eval->nb_samples, av_rescale(eval->duration, eval->sample_rate, AV_TIME_BASE) - eval->pts);
+        if (!nb_samples)
+            return AVERROR_EOF;
+    } else {
+        nb_samples = eval->nb_samples;
+    }
+    samplesref = ff_get_audio_buffer(outlink, nb_samples);
     if (!samplesref)
         return AVERROR(ENOMEM);
     /* evaluate expression for each single sample and for each channel */
-    for (i = 0; i < eval->nb_samples; i++, eval->n++) {
+    for (i = 0; i < nb_samples; i++, eval->n++) {
         eval->var_values[VAR_N] = eval->n;
         eval->var_values[VAR_T] = eval->var_values[VAR_N] * (double)1/eval->sample_rate;
     samplesref->pts = eval->pts;
     samplesref->sample_rate = eval->sample_rate;
-    eval->pts += eval->nb_samples;
+    eval->pts += nb_samples;
     return ff_filter_frame(outlink, samplesref);
 }

Keyboard shortcuts