ffmpeg | branch: master | Anton Khirnov <an...@khirnov.net> | Sat Sep 9
20:31:48 2023 +0200| [61777c62d7e4065df055e44f89b72c2e00a4f58f] | committer:
Anton Khirnov
fftools/ffmpeg: stop accessing OutputStream.last_dropped in print_report()
That field is used by the framerate code to track whether any output has
been generated for the last input frame(*). Its use in the last
invocation of print_report() is meant to account for the very last
filtered frame being dropped in the number of dropped frames printed in
the log. However, that is a highly inappropriate place to do so, as it
makes assumptions about vsync logic in completely unrelated code. Move
the increment to encoder flush instead.
(*) the name is misleading, as the input frame has not yet been dropped
and may still be output in the future
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61777c62d7e4065df055e44f89b72c2e00a4f58f
---
fftools/ffmpeg.c | 3 ---
fftools/ffmpeg_enc.c | 3 +++
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 14f55cbec7..a854589bef 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -566,9 +566,6 @@ static void print_report(int is_last_report, int64_t
timer_start, int64_t cur_ti
pts -= copy_ts_first_pts;
}
}
-
- if (is_last_report)
- nb_frames_drop += ost->last_dropped;
}
us = FFABS64U(pts) % AV_TIME_BASE;
diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c
index 1379fe317a..5721aba2e6 100644
--- a/fftools/ffmpeg_enc.c
+++ b/fftools/ffmpeg_enc.c
@@ -749,6 +749,9 @@ static int encode_frame(OutputFile *of, OutputStream *ost,
AVFrame *frame)
if (frame->sample_aspect_ratio.num && !ost->frame_aspect_ratio.num)
enc->sample_aspect_ratio = frame->sample_aspect_ratio;
+ } else if (ost->last_dropped) {
+ ost->nb_frames_drop++;
+ ost->last_dropped = 0;
}
update_benchmark(NULL);
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
