@ -274,6 +274,11 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
}
}
ost - > frame_number + + ;
ost - > frame_number + + ;
}
}
if ( avctx - > codec_type = = AVMEDIA_TYPE_VIDEO ) {
uint8_t * sd = av_packet_get_side_data ( pkt , AV_PKT_DATA_QUALITY_FACTOR ,
NULL ) ;
ost - > quality = sd ? * ( int * ) sd : - 1 ;
}
while ( bsfc ) {
while ( bsfc ) {
AVPacket new_pkt = * pkt ;
AVPacket new_pkt = * pkt ;
@ -561,7 +566,8 @@ static void do_video_stats(OutputStream *ost, int frame_size)
enc = ost - > enc_ctx ;
enc = ost - > enc_ctx ;
if ( enc - > codec_type = = AVMEDIA_TYPE_VIDEO ) {
if ( enc - > codec_type = = AVMEDIA_TYPE_VIDEO ) {
frame_number = ost - > frame_number ;
frame_number = ost - > frame_number ;
fprintf ( vstats_file , " frame= %5d q= %2.1f " , frame_number , enc - > coded_frame - > quality / ( float ) FF_QP2LAMBDA ) ;
fprintf ( vstats_file , " frame= %5d q= %2.1f " , frame_number ,
ost - > quality / ( float ) FF_QP2LAMBDA ) ;
if ( enc - > flags & CODEC_FLAG_PSNR )
if ( enc - > flags & CODEC_FLAG_PSNR )
fprintf ( vstats_file , " PSNR= %6.2f " , psnr ( enc - > coded_frame - > error [ 0 ] / ( enc - > width * enc - > height * 255.0 * 255.0 ) ) ) ;
fprintf ( vstats_file , " PSNR= %6.2f " , psnr ( enc - > coded_frame - > error [ 0 ] / ( enc - > width * enc - > height * 255.0 * 255.0 ) ) ) ;
@ -846,8 +852,9 @@ static void print_report(int is_last_report, int64_t timer_start)
float q = - 1 ;
float q = - 1 ;
ost = output_streams [ i ] ;
ost = output_streams [ i ] ;
enc = ost - > enc_ctx ;
enc = ost - > enc_ctx ;
if ( ! ost - > stream_copy & & enc - > coded_frame )
if ( ! ost - > stream_copy )
q = enc - > coded_frame - > quality / ( float ) FF_QP2LAMBDA ;
q = ost - > quality / ( float ) FF_QP2LAMBDA ;
if ( vid & & enc - > codec_type = = AVMEDIA_TYPE_VIDEO ) {
if ( vid & & enc - > codec_type = = AVMEDIA_TYPE_VIDEO ) {
snprintf ( buf + strlen ( buf ) , sizeof ( buf ) - strlen ( buf ) , " q=%2.1f " , q ) ;
snprintf ( buf + strlen ( buf ) , sizeof ( buf ) - strlen ( buf ) , " q=%2.1f " , q ) ;
}
}