mirror of https://git.ffmpeg.org/ffmpeg.git
fftools/ffmpeg: drop OutputStream.pict_type
It is no longer used outside of update_video_stats(), so make it a stack variable in that function.
This commit is contained in:
parent
f4a60b8ddc
commit
52b632b65b
|
@ -671,9 +671,6 @@ typedef struct OutputStream {
|
||||||
/* packet quality factor */
|
/* packet quality factor */
|
||||||
int quality;
|
int quality;
|
||||||
|
|
||||||
/* packet picture type */
|
|
||||||
int pict_type;
|
|
||||||
|
|
||||||
/* frame encode sum of squared error values */
|
/* frame encode sum of squared error values */
|
||||||
int64_t error[4];
|
int64_t error[4];
|
||||||
|
|
||||||
|
|
|
@ -587,11 +587,12 @@ static void update_video_stats(OutputStream *ost, const AVPacket *pkt, int write
|
||||||
const uint8_t *sd = av_packet_get_side_data(pkt, AV_PKT_DATA_QUALITY_STATS,
|
const uint8_t *sd = av_packet_get_side_data(pkt, AV_PKT_DATA_QUALITY_STATS,
|
||||||
NULL);
|
NULL);
|
||||||
AVCodecContext *enc = ost->enc_ctx;
|
AVCodecContext *enc = ost->enc_ctx;
|
||||||
|
enum AVPictureType pict_type;
|
||||||
int64_t frame_number;
|
int64_t frame_number;
|
||||||
double ti1, bitrate, avg_bitrate;
|
double ti1, bitrate, avg_bitrate;
|
||||||
|
|
||||||
ost->quality = sd ? AV_RL32(sd) : -1;
|
ost->quality = sd ? AV_RL32(sd) : -1;
|
||||||
ost->pict_type = sd ? sd[4] : AV_PICTURE_TYPE_NONE;
|
pict_type = sd ? sd[4] : AV_PICTURE_TYPE_NONE;
|
||||||
|
|
||||||
for (int i = 0; i<FF_ARRAY_ELEMS(ost->error); i++) {
|
for (int i = 0; i<FF_ARRAY_ELEMS(ost->error); i++) {
|
||||||
if (sd && i < sd[5])
|
if (sd && i < sd[5])
|
||||||
|
@ -634,7 +635,7 @@ static void update_video_stats(OutputStream *ost, const AVPacket *pkt, int write
|
||||||
avg_bitrate = (double)(e->data_size * 8) / ti1 / 1000.0;
|
avg_bitrate = (double)(e->data_size * 8) / ti1 / 1000.0;
|
||||||
fprintf(vstats_file, "s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ",
|
fprintf(vstats_file, "s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ",
|
||||||
(double)e->data_size / 1024, ti1, bitrate, avg_bitrate);
|
(double)e->data_size / 1024, ti1, bitrate, avg_bitrate);
|
||||||
fprintf(vstats_file, "type= %c\n", av_get_picture_type_char(ost->pict_type));
|
fprintf(vstats_file, "type= %c\n", av_get_picture_type_char(pict_type));
|
||||||
}
|
}
|
||||||
|
|
||||||
static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame)
|
static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame)
|
||||||
|
|
Loading…
Reference in New Issue