[FFmpeg-cvslog] avfilter/af_dynaudnorm: improve EOF timestamp precision

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Sep 12 23:41:49 2021 +0200| [f78d0f67be44e734ad4cc77efbbd2cf7cfd0b982] | committer: Paul B Mahol

avfilter/af_dynaudnorm: improve EOF timestamp precision

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f78d0f67be44e734ad4cc77efbbd2cf7cfd0b982
---

 libavfilter/af_dynaudnorm.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/libavfilter/af_dynaudnorm.c b/libavfilter/af_dynaudnorm.c
index 130555d1f0..b78b3df85e 100644
--- a/libavfilter/af_dynaudnorm.c
+++ b/libavfilter/af_dynaudnorm.c
@@ -706,7 +706,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
         cqueue_dequeue(s->is_enabled, &is_enabled);
 
         amplify_frame(s, out, is_enabled > 0.);
-        s->pts = out->pts + out->nb_samples;
+        s->pts = out->pts + av_rescale_q(out->nb_samples, av_make_q(1, outlink->sample_rate),
+                                         outlink->time_base);
         ret = ff_filter_frame(outlink, out);
     }
 
@@ -749,15 +750,17 @@ static int flush_buffer(DynamicAudioNormalizerContext *s, AVFilterLink *inlink,
 static int flush(AVFilterLink *outlink)
 {
     AVFilterContext *ctx = outlink->src;
+    AVFilterLink *inlink = ctx->inputs[0];
     DynamicAudioNormalizerContext *s = ctx->priv;
     int ret = 0;
 
     if (!cqueue_empty(s->gain_history_smoothed[0])) {
-        ret = flush_buffer(s, ctx->inputs[0], outlink);
+        ret = flush_buffer(s, inlink, outlink);
     } else if (s->queue.available) {
         AVFrame *out = ff_bufqueue_get(&s->queue);
 
-        s->pts = out->pts + out->nb_samples;
+        s->pts = out->pts + av_rescale_q(out->nb_samples, av_make_q(1, outlink->sample_rate),
+                                         outlink->time_base);
         ret = ff_filter_frame(outlink, out);
     }