MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi: guess a timestamp for compat status change.

Browse Source 
Use the earliest input with the same status.
If that fails, print a warning and use the earliest source.
With this change, simple filter forward correctly the timestamp
of EOF.
Filters that are supposed to change it should be updated to
actually forward it.
This commit is contained in:
Nicolas George 2017-09-07 10:45:54 +02:00
parent d47159a42d
commit f5a9c63401
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavfilter/avfilter.c
View File

@ -427,6 +427,24 @@ int ff_request_frame(AVFilterLink *link)
return 0;
}
static int64_t guess_status_pts(AVFilterContext *ctx, int status)
{
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);
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);
if (r < INT64_MAX)
return r;
return AV_NOPTS_VALUE;
}
static int ff_request_frame_to_filter(AVFilterLink *link)
{
int ret = -1;
@ -440,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, AV_NOPTS_VALUE);
ff_avfilter_link_set_in_status(link, ret, guess_status_pts(link->src, ret));
if (ret == AVERROR_EOF)
ret = 0;
}