lavfi/avfilter.c: Correct guess_status_pts to account for differing link timebases.
authorSasi Inguva <isasi-at-google.com@ffmpeg.org>
Fri, 6 Oct 2017 16:31:13 +0000 (09:31 -0700)
committerNicolas George <george@nsup.org>
Sat, 7 Oct 2017 09:17:23 +0000 (11:17 +0200)
Signed-off-by: Sasi Inguva <isasi@google.com>
libavfilter/avfilter.c

index 58917ed..f0f849b 100644 (file)
@@ -427,19 +427,19 @@ int ff_request_frame(AVFilterLink *link)
     return 0;
 }
 
-static int64_t guess_status_pts(AVFilterContext *ctx, int status)
+static int64_t guess_status_pts(AVFilterContext *ctx, int status, AVRational link_time_base)
 {
     unsigned i;
     int64_t r = INT64_MAX;
 
     for (i = 0; i < ctx->nb_inputs; i++)
         if (ctx->inputs[i]->status_out == status)
-            r = FFMIN(r, ctx->inputs[i]->current_pts);
+            r = FFMIN(r, av_rescale_q(ctx->inputs[i]->current_pts, ctx->inputs[i]->time_base, link_time_base));
     if (r < INT64_MAX)
         return r;
     av_log(ctx, AV_LOG_WARNING, "EOF timestamp not reliable\n");
     for (i = 0; i < ctx->nb_inputs; i++)
-        r = FFMIN(r, ctx->inputs[i]->status_in_pts);
+        r = FFMIN(r, av_rescale_q(ctx->inputs[i]->status_in_pts, ctx->inputs[i]->time_base, link_time_base));
     if (r < INT64_MAX)
         return r;
     return AV_NOPTS_VALUE;
@@ -458,7 +458,7 @@ static int ff_request_frame_to_filter(AVFilterLink *link)
         ret = ff_request_frame(link->src->inputs[0]);
     if (ret < 0) {
         if (ret != AVERROR(EAGAIN) && ret != link->status_in)
-            ff_avfilter_link_set_in_status(link, ret, guess_status_pts(link->src, ret));
+            ff_avfilter_link_set_in_status(link, ret, guess_status_pts(link->src, ret, link->time_base));
         if (ret == AVERROR_EOF)
             ret = 0;
     }