RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg: move OutputStream.packets_encoded to Encoder 

It is no longer used outside of ffmpeg_enc.
This commit is contained in:
Anton Khirnov 2023-04-27 16:02:30 +02:00
parent 6e487a50a1
commit 7e3eb24123
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fftools/ffmpeg.h
View File

@ -665,8 +665,6 @@ 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;

9
fftools/ffmpeg_enc.c
View File

@ -59,6 +59,9 @@ struct Encoder {
// combined size of all the packets received from the encoder // combined size of all the packets received from the encoder
uint64_t data_size; uint64_t data_size;
// number of packets received from the encoder
uint64_t packets_encoded;
}; };
static uint64_t dup_warning = 1000; static uint64_t dup_warning = 1000;
@ -619,7 +622,7 @@ static void update_video_stats(OutputStream *ost, const AVPacket *pkt, int write
} }
} }
frame_number = ost->packets_encoded; frame_number = e->packets_encoded;
if (vstats_version <= 1) { if (vstats_version <= 1) {
fprintf(vstats_file, "frame= %5"PRId64" q= %2.1f ", frame_number, fprintf(vstats_file, "frame= %5"PRId64" q= %2.1f ", frame_number,
ost->quality / (float)FF_QP2LAMBDA); ost->quality / (float)FF_QP2LAMBDA);
@ -708,7 +711,7 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame)
update_video_stats(ost, pkt, !!vstats_filename); update_video_stats(ost, pkt, !!vstats_filename);
if (ost->enc_stats_post.io) if (ost->enc_stats_post.io)
enc_stats_write(ost, &ost->enc_stats_post, NULL, pkt, enc_stats_write(ost, &ost->enc_stats_post, NULL, pkt,
ost->packets_encoded); e->packets_encoded);
if (debug_ts) { if (debug_ts) {
av_log(ost, AV_LOG_INFO, "encoder -> type:%s " av_log(ost, AV_LOG_INFO, "encoder -> type:%s "
@ -742,7 +745,7 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame)
e->data_size += pkt->size; e->data_size += pkt->size;
ost->packets_encoded++; e->packets_encoded++;
of_output_packet(of, pkt, ost, 0); of_output_packet(of, pkt, ost, 0);
} }