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/avf_showfreqs.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/avf_showfreqs.c')
| -rw-r--r-- | libavfilter/avf_showfreqs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/avf_showfreqs.c b/libavfilter/avf_showfreqs.c index e2a923b864..21735ed075 100644 --- a/libavfilter/avf_showfreqs.c +++ b/libavfilter/avf_showfreqs.c @@ -326,12 +326,12 @@ static inline void plot_freq(ShowFreqsContext *s, int ch, switch (s->avg) { case 0: - y = s->avg_data[ch][f] = !outlink->frame_count ? y : FFMIN(avg, y); + y = s->avg_data[ch][f] = !outlink->frame_count_in ? y : FFMIN(avg, y); break; case 1: break; default: - s->avg_data[ch][f] = avg + y * (y - avg) / (FFMIN(outlink->frame_count + 1, s->avg) * y); + s->avg_data[ch][f] = avg + y * (y - avg) / (FFMIN(outlink->frame_count_in + 1, s->avg) * y); y = s->avg_data[ch][f]; break; } |