diff options
author | Anton Khirnov <anton@khirnov.net> | 2021-12-16 11:10:58 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2022-05-24 13:46:57 +0200 |
commit | 3d4d3553752b34ff97ccc6e16e74b82524b0f404 (patch) | |
tree | f4019324187236cb429804d927e834cf572667da /fftools/ffmpeg.c | |
parent | 19d1e1fb065acc66b5cbfc664be67202a0b9c400 (diff) | |
download | ffmpeg-3d4d3553752b34ff97ccc6e16e74b82524b0f404.tar.gz |
fftools/ffmpeg: stop using AVStream.nb_frames in do_video_stats()
Its use for muxing is not documented, in practice it is incremented per
each packet successfully passed to the muxer's write_packet(). Since
there is a lot of indirection between ffmpeg receiving a packet from the
encoder and it actually being written (e.g. bitstream filters, the
interleaving queue), using nb_frames here is incorrect.
Add a new counter for packets received from encoder instead.
Diffstat (limited to 'fftools/ffmpeg.c')
-rw-r--r-- | fftools/ffmpeg.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 7af24b4de2..f58258d45f 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -851,7 +851,7 @@ static void do_video_stats(OutputStream *ost, int frame_size) } enc = ost->enc_ctx; - frame_number = ost->st->nb_frames; + frame_number = ost->packets_encoded; if (vstats_version <= 1) { fprintf(vstats_file, "frame= %5d q= %2.1f ", frame_number, ost->quality / (float)FF_QP2LAMBDA); @@ -950,6 +950,8 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame) if (enc->codec_type == AVMEDIA_TYPE_VIDEO && vstats_filename) do_video_stats(ost, pkt->size); + ost->packets_encoded++; + output_packet(of, pkt, ost, 0); } |