diff options
| author | Nicolas George <george@nsup.org> | 2016-08-30 15:28:41 +0200 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2016-11-13 10:41:16 +0100 |
| commit | 183ce55b0de0a597b838d08bbac67f54c27ed42f (patch) | |
| tree | ffd40aaf4f522d18b6b87b35e1b49f276cff913d /libavfilter/f_metadata.c | |
| parent | 22aa649c13b452f11353958a51f073f5fbc3bcaa (diff) | |
| download | ffmpeg-183ce55b0de0a597b838d08bbac67f54c27ed42f.tar.gz | |
lavfi: split frame_count between input and output.
AVFilterLink.frame_count is supposed to count the number of frames
that were passed on the link, but with min_samples, that number is
not always the same for the source and destination filters.
With the addition of a FIFO on the link, the difference will become
more significant.
Split the variable in two: frame_count_in counts the number of
frames that entered the link, frame_count_out counts the number
of frames that were sent to the destination filter.
Diffstat (limited to 'libavfilter/f_metadata.c')
| -rw-r--r-- | libavfilter/f_metadata.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c index f2c71d98b4..24deccfb2c 100644 --- a/libavfilter/f_metadata.c +++ b/libavfilter/f_metadata.c @@ -315,14 +315,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) case METADATA_PRINT: if (!s->key && e) { s->print(ctx, "frame:%-4"PRId64" pts:%-7s pts_time:%-7s\n", - inlink->frame_count, av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base)); + inlink->frame_count_out, av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base)); s->print(ctx, "%s=%s\n", e->key, e->value); while ((e = av_dict_get(*metadata, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL) { s->print(ctx, "%s=%s\n", e->key, e->value); } } else if (e && e->value && (!s->value || (e->value && s->compare(s, e->value, s->value)))) { s->print(ctx, "frame:%-4"PRId64" pts:%-7s pts_time:%-7s\n", - inlink->frame_count, av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base)); + inlink->frame_count_out, av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base)); s->print(ctx, "%s=%s\n", s->key, e->value); } return ff_filter_frame(outlink, frame); |