mirror of https://git.ffmpeg.org/ffmpeg.git
fftools/ffmpeg: move processing AV_PKT_DATA_QUALITY_STATS to do_video_stats()
This is a more appropriate place for this code, since the values we read from AV_PKT_DATA_QUALITY_STATS side data are primarily written into video stats. This ensures that the values written into stats actually apply to the right packet. Rename the function to update_video_stats() to better reflect its new purpose.
This commit is contained in:
parent
0c914ebd53
commit
b033913d1c
|
@ -835,13 +835,28 @@ static double psnr(double d)
|
||||||
return -10.0 * log10(d);
|
return -10.0 * log10(d);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void do_video_stats(OutputStream *ost, const AVPacket *pkt)
|
static void update_video_stats(OutputStream *ost, const AVPacket *pkt, int write_vstats)
|
||||||
{
|
{
|
||||||
|
const uint8_t *sd = av_packet_get_side_data(pkt, AV_PKT_DATA_QUALITY_STATS,
|
||||||
|
NULL);
|
||||||
AVCodecContext *enc = ost->enc_ctx;
|
AVCodecContext *enc = ost->enc_ctx;
|
||||||
int frame_number;
|
int frame_number;
|
||||||
double ti1, bitrate, avg_bitrate;
|
double ti1, bitrate, avg_bitrate;
|
||||||
|
|
||||||
/* this is executed just the first time do_video_stats is called */
|
ost->quality = sd ? AV_RL32(sd) : -1;
|
||||||
|
ost->pict_type = sd ? sd[4] : AV_PICTURE_TYPE_NONE;
|
||||||
|
|
||||||
|
for (int i = 0; i<FF_ARRAY_ELEMS(ost->error); i++) {
|
||||||
|
if (sd && i < sd[5])
|
||||||
|
ost->error[i] = AV_RL64(sd + 8 + 8*i);
|
||||||
|
else
|
||||||
|
ost->error[i] = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!write_vstats)
|
||||||
|
return;
|
||||||
|
|
||||||
|
/* this is executed just the first time update_video_stats is called */
|
||||||
if (!vstats_file) {
|
if (!vstats_file) {
|
||||||
vstats_file = fopen(vstats_filename, "w");
|
vstats_file = fopen(vstats_filename, "w");
|
||||||
if (!vstats_file) {
|
if (!vstats_file) {
|
||||||
|
@ -946,8 +961,8 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame)
|
||||||
av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &enc->time_base));
|
av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &enc->time_base));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (enc->codec_type == AVMEDIA_TYPE_VIDEO && vstats_filename)
|
if (enc->codec_type == AVMEDIA_TYPE_VIDEO)
|
||||||
do_video_stats(ost, pkt);
|
update_video_stats(ost, pkt, !!vstats_filename);
|
||||||
|
|
||||||
ost->packets_encoded++;
|
ost->packets_encoded++;
|
||||||
|
|
||||||
|
|
|
@ -101,19 +101,6 @@ void of_write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost,
|
||||||
pkt->pts = pkt->dts = AV_NOPTS_VALUE;
|
pkt->pts = pkt->dts = AV_NOPTS_VALUE;
|
||||||
|
|
||||||
if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
|
if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
|
||||||
int i;
|
|
||||||
uint8_t *sd = av_packet_get_side_data(pkt, AV_PKT_DATA_QUALITY_STATS,
|
|
||||||
NULL);
|
|
||||||
ost->quality = sd ? AV_RL32(sd) : -1;
|
|
||||||
ost->pict_type = sd ? sd[4] : AV_PICTURE_TYPE_NONE;
|
|
||||||
|
|
||||||
for (i = 0; i<FF_ARRAY_ELEMS(ost->error); i++) {
|
|
||||||
if (sd && i < sd[5])
|
|
||||||
ost->error[i] = AV_RL64(sd + 8 + 8*i);
|
|
||||||
else
|
|
||||||
ost->error[i] = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ost->frame_rate.num && ost->is_cfr) {
|
if (ost->frame_rate.num && ost->is_cfr) {
|
||||||
if (pkt->duration > 0)
|
if (pkt->duration > 0)
|
||||||
av_log(NULL, AV_LOG_WARNING, "Overriding packet duration by frame rate, this should not happen\n");
|
av_log(NULL, AV_LOG_WARNING, "Overriding packet duration by frame rate, this should not happen\n");
|
||||||
|
|
Loading…
Reference in New Issue