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/avfilter.c | |
| parent | 22aa649c13b452f11353958a51f073f5fbc3bcaa (diff) | |
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/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 1d469c3334..662f933041 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -1120,7 +1120,7 @@ static int ff_filter_frame_framed(AVFilterLink *link, AVFrame *frame) pts = out->pts; if (dstctx->enable_str) { int64_t pos = av_frame_get_pkt_pos(out); - dstctx->var_values[VAR_N] = link->frame_count; + dstctx->var_values[VAR_N] = link->frame_count_out; dstctx->var_values[VAR_T] = pts == AV_NOPTS_VALUE ? NAN : pts * av_q2d(link->time_base); dstctx->var_values[VAR_W] = link->w; dstctx->var_values[VAR_H] = link->h; @@ -1132,7 +1132,7 @@ static int ff_filter_frame_framed(AVFilterLink *link, AVFrame *frame) filter_frame = default_filter_frame; } ret = filter_frame(link, out); - link->frame_count++; + link->frame_count_out++; ff_update_link_current_pts(link, pts); return ret; @@ -1221,6 +1221,7 @@ int ff_filter_frame(AVFilterLink *link, AVFrame *frame) } link->frame_wanted_out = 0; + link->frame_count_in++; /* Go directly to actual filtering if possible */ if (link->type == AVMEDIA_TYPE_AUDIO && link->min_samples && |