Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avfilter/framesync: fix forward EOF pts

Browse source 
Note1: when the EOF pts is not accurate enough, the last frame
can be dropped by vf_fps with default rounding.

Note2: vf_scale use framesync since e82a3997cd,
so this is a very commonplace scenario.

For example:
./ffprobe -f lavfi testsrc=d=1,scale,fps -of flat \
  -count_frames -show_entries stream=nb_read_frames

Before:
streams.stream.0.nb_read_frames="24"

After:
streams.stream.0.nb_read_frames="25"

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Nicolas Gaullier 2024-10-04 11:02:49 +02:00 • committed by Anton Khirnov
parent 31a63e4e01
commit de976eaf30
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libavfilter/framesync.c
View file

@ -103,14 +103,14 @@ int ff_framesync_init(FFFrameSync *fs, AVFilterContext *parent, unsigned nb_in)
return 0; return 0;
} }
static void framesync_eof(FFFrameSync *fs) static void framesync_eof(FFFrameSync *fs, int64_t pts)
{ {
fs->eof = 1; fs->eof = 1;
fs->frame_ready = 0; fs->frame_ready = 0;
ff_outlink_set_status(fs->parent->outputs[0], AVERROR_EOF, AV_NOPTS_VALUE); ff_outlink_set_status(fs->parent->outputs[0], AVERROR_EOF, pts);
} }
static void framesync_sync_level_update(FFFrameSync *fs) static void framesync_sync_level_update(FFFrameSync *fs, int64_t eof_pts)
{ {
unsigned i, level = 0; unsigned i, level = 0;
@ -131,7 +131,7 @@ static void framesync_sync_level_update(FFFrameSync *fs)
if (level) if (level)
fs->sync_level = level; fs->sync_level = level;
else else
framesync_eof(fs); framesync_eof(fs, eof_pts);
} }
int ff_framesync_configure(FFFrameSync *fs) int ff_framesync_configure(FFFrameSync *fs)
@ -179,7 +179,7 @@ int ff_framesync_configure(FFFrameSync *fs)
for (i = 0; i < fs->nb_in; i++) for (i = 0; i < fs->nb_in; i++)
fs->in[i].pts = fs->in[i].pts_next = AV_NOPTS_VALUE; fs->in[i].pts = fs->in[i].pts_next = AV_NOPTS_VALUE;
fs->sync_level = UINT_MAX; fs->sync_level = UINT_MAX;
framesync_sync_level_update(fs); framesync_sync_level_update(fs, AV_NOPTS_VALUE);
return 0; return 0;
} }
@ -200,7 +200,7 @@ static int framesync_advance(FFFrameSync *fs)
if (fs->in[i].have_next && fs->in[i].pts_next < pts) if (fs->in[i].have_next && fs->in[i].pts_next < pts)
pts = fs->in[i].pts_next; pts = fs->in[i].pts_next;
if (pts == INT64_MAX) { if (pts == INT64_MAX) {
framesync_eof(fs); framesync_eof(fs, AV_NOPTS_VALUE);
break; break;
} }
for (i = 0; i < fs->nb_in; i++) { for (i = 0; i < fs->nb_in; i++) {
@ -222,7 +222,7 @@ static int framesync_advance(FFFrameSync *fs)
fs->frame_ready = 1; fs->frame_ready = 1;
if (fs->in[i].state == STATE_EOF && if (fs->in[i].state == STATE_EOF &&
fs->in[i].after == EXT_STOP) fs->in[i].after == EXT_STOP)
framesync_eof(fs); framesync_eof(fs, AV_NOPTS_VALUE);
} }
} }
if (fs->frame_ready) if (fs->frame_ready)
@ -255,15 +255,14 @@ static void framesync_inject_frame(FFFrameSync *fs, unsigned in, AVFrame *frame)
fs->in[in].have_next = 1; fs->in[in].have_next = 1;
} }
static void framesync_inject_status(FFFrameSync *fs, unsigned in, int status, int64_t pts) static void framesync_inject_status(FFFrameSync *fs, unsigned in, int status, int64_t eof_pts)
{ {
av_assert0(!fs->in[in].have_next); av_assert0(!fs->in[in].have_next);
pts = fs->in[in].state != STATE_RUN || fs->in[in].after == EXT_INFINITY
? INT64_MAX : framesync_pts_extrapolate(fs, in, fs->in[in].pts);
fs->in[in].sync = 0; fs->in[in].sync = 0;
framesync_sync_level_update(fs); framesync_sync_level_update(fs, status == AVERROR_EOF ? eof_pts : AV_NOPTS_VALUE);
fs->in[in].frame_next = NULL; fs->in[in].frame_next = NULL;
fs->in[in].pts_next = pts; fs->in[in].pts_next = fs->in[in].state != STATE_RUN || fs->in[in].after == EXT_INFINITY
? INT64_MAX : framesync_pts_extrapolate(fs, in, fs->in[in].pts);
fs->in[in].have_next = 1; fs->in[in].have_next = 1;
} }