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

fftools/ffmpeg_mux: make data_size_mux private to ffmpeg_mux 

It is no longer used outside of this file.
This commit is contained in:
Anton Khirnov 2023-03-28 11:24:42 +02:00
parent 37b118096a
commit 0288951174
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fftools/ffmpeg.h
View File

@ -649,8 +649,6 @@ typedef struct OutputStream {
int keep_pix_fmt; int keep_pix_fmt;
/* stats */ /* stats */
// combined size of all the packets sent to the muxer
uint64_t data_size_mux;
// combined size of all the packets received from the encoder // combined size of all the packets received from the encoder
uint64_t data_size_enc; uint64_t data_size_enc;
// number of packets send to the muxer // number of packets send to the muxer

5
fftools/ffmpeg_mux.c
View File

@ -128,7 +128,7 @@ static int write_packet(Muxer *mux, OutputStream *ost, AVPacket *pkt)
} }
ms->last_mux_dts = pkt->dts; ms->last_mux_dts = pkt->dts;
ost->data_size_mux += pkt->size; ms->data_size_mux += pkt->size;
frame_num = atomic_fetch_add(&ost->packets_written, 1); frame_num = atomic_fetch_add(&ost->packets_written, 1);
pkt->stream_index = ost->index; pkt->stream_index = ost->index;
@ -652,9 +652,10 @@ static void mux_final_stats(Muxer *mux)
for (int j = 0; j < of->nb_streams; j++) { for (int j = 0; j < of->nb_streams; j++) {
OutputStream *ost = of->streams[j]; OutputStream *ost = of->streams[j];
MuxStream *ms = ms_from_ost(ost);
const AVCodecParameters *par = ost->st->codecpar; const AVCodecParameters *par = ost->st->codecpar;
const enum AVMediaType type = par->codec_type; const enum AVMediaType type = par->codec_type;
const uint64_t s = ost->data_size_mux; const uint64_t s = ms->data_size_mux;
switch (type) { switch (type) {
case AVMEDIA_TYPE_VIDEO: video_size += s; break; case AVMEDIA_TYPE_VIDEO: video_size += s; break;

3
fftools/ffmpeg_mux.h
View File

@ -63,6 +63,9 @@ typedef struct MuxStream {
/* dts of the last packet sent to the muxer, in the stream timebase /* dts of the last packet sent to the muxer, in the stream timebase
* used for making up missing dts values */ * used for making up missing dts values */
int64_t last_mux_dts; int64_t last_mux_dts;
// combined size of all the packets sent to the muxer
uint64_t data_size_mux;
} MuxStream; } MuxStream;
typedef struct Muxer { typedef struct Muxer {