virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

fftools/ffmpeg: stop using AVStream.nb_frames in do_video_stats()

Browse Source 
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.
This commit is contained in:
Anton Khirnov 2021-12-16 11:10:58 +01:00
parent 19d1e1fb06
commit 3d4d355375
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fftools/ffmpeg.c
View File

@ -851,7 +851,7 @@ static void do_video_stats(OutputStream *ost, int frame_size)
} }
enc = ost->enc_ctx; enc = ost->enc_ctx;
frame_number = ost->st->nb_frames; frame_number = ost->packets_encoded;
if (vstats_version <= 1) { if (vstats_version <= 1) {
fprintf(vstats_file, "frame= %5d q= %2.1f ", frame_number, fprintf(vstats_file, "frame= %5d q= %2.1f ", frame_number,
ost->quality / (float)FF_QP2LAMBDA); 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) if (enc->codec_type == AVMEDIA_TYPE_VIDEO && vstats_filename)
do_video_stats(ost, pkt->size); do_video_stats(ost, pkt->size);
ost->packets_encoded++;
output_packet(of, pkt, ost, 0); output_packet(of, pkt, ost, 0);
} }

2
fftools/ffmpeg.h
View File

@ -551,6 +551,8 @@ typedef struct OutputStream {
// number of frames/samples sent to the encoder // number of frames/samples sent to the encoder
uint64_t frames_encoded; uint64_t frames_encoded;
uint64_t samples_encoded; uint64_t samples_encoded;
// number of packets received from the encoder
uint64_t packets_encoded;
/* packet quality factor */ /* packet quality factor */
int quality; int quality;