xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-23 19:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lavfi/avfilter.c: Correct guess_status_pts to account for differing link timebases.

Browse Source 
Signed-off-by: Sasi Inguva <isasi@google.com>
This commit is contained in:
Sasi Inguva 2017-10-06 09:31:13 -07:00 committed by Nicolas George
parent a20f64bee2
commit 123f6dc6b5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/avfilter.c
View File

@ -427,19 +427,19 @@ int ff_request_frame(AVFilterLink *link)
return 0; 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; unsigned i;
int64_t r = INT64_MAX; int64_t r = INT64_MAX;
for (i = 0; i < ctx->nb_inputs; i++) for (i = 0; i < ctx->nb_inputs; i++)
if (ctx->inputs[i]->status_out == status) 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) if (r < INT64_MAX)
return r; return r;
av_log(ctx, AV_LOG_WARNING, "EOF timestamp not reliable\n"); av_log(ctx, AV_LOG_WARNING, "EOF timestamp not reliable\n");
for (i = 0; i < ctx->nb_inputs; i++) 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) if (r < INT64_MAX)
return r; return r;
return AV_NOPTS_VALUE; 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]); ret = ff_request_frame(link->src->inputs[0]);
if (ret < 0) { if (ret < 0) {
if (ret != AVERROR(EAGAIN) && ret != link->status_in) 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) if (ret == AVERROR_EOF)
ret = 0; ret = 0;
} }