diff options
author | Anton Khirnov <anton@khirnov.net> | 2014-03-17 10:09:09 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2014-03-24 06:17:19 +0100 |
commit | a220b07b0f971f88213aef012aea51af2800be62 (patch) | |
tree | 64714aa7db2cd8e71a02e38549cc194260f0ab71 | |
parent | baeb59d89beda499688e528c6a269d2b255b66f2 (diff) | |
download | ffmpeg-a220b07b0f971f88213aef012aea51af2800be62.tar.gz |
avconv: split printing the final statistics into a separate function
-rw-r--r-- | avconv.c | 66 |
1 files changed, 36 insertions, 30 deletions
@@ -736,6 +736,40 @@ static int poll_filters(void) return ret; } +static void print_final_stats(int64_t total_size) +{ + uint64_t video_size = 0, audio_size = 0, extra_size = 0, other_size = 0; + uint64_t data_size = 0; + float percent = -1.0; + int i; + + for (i = 0; i < nb_output_streams; i++) { + OutputStream *ost = output_streams[i]; + switch (ost->st->codec->codec_type) { + case AVMEDIA_TYPE_VIDEO: video_size += ost->data_size; break; + case AVMEDIA_TYPE_AUDIO: audio_size += ost->data_size; break; + default: other_size += ost->data_size; break; + } + extra_size += ost->st->codec->extradata_size; + data_size += ost->data_size; + } + + if (data_size && total_size >= data_size) + percent = 100.0 * (total_size - data_size) / data_size; + + av_log(NULL, AV_LOG_INFO, "\n"); + av_log(NULL, AV_LOG_INFO, "video:%1.0fkB audio:%1.0fkB other streams:%1.0fkB global headers:%1.0fkB muxing overhead: ", + video_size / 1024.0, + audio_size / 1024.0, + other_size / 1024.0, + extra_size / 1024.0); + if (percent >= 0.0) + av_log(NULL, AV_LOG_INFO, "%f%%", percent); + else + av_log(NULL, AV_LOG_INFO, "unknown"); + av_log(NULL, AV_LOG_INFO, "\n"); +} + static void print_report(int is_last_report, int64_t timer_start) { char buf[1024]; @@ -852,37 +886,9 @@ static void print_report(int is_last_report, int64_t timer_start) fflush(stderr); - if (is_last_report) { - uint64_t video_size = 0, audio_size = 0, extra_size = 0, other_size = 0; - uint64_t data_size = 0; - float percent = -1.0; + if (is_last_report) + print_final_stats(total_size); - for (i = 0; i < nb_output_streams; i++) { - OutputStream *ost = output_streams[i]; - switch (ost->st->codec->codec_type) { - case AVMEDIA_TYPE_VIDEO: video_size += ost->data_size; break; - case AVMEDIA_TYPE_AUDIO: audio_size += ost->data_size; break; - default: other_size += ost->data_size; break; - } - extra_size += ost->st->codec->extradata_size; - data_size += ost->data_size; - } - - if (data_size && total_size >= data_size) - percent = 100.0 * (total_size - data_size) / data_size; - - av_log(NULL, AV_LOG_INFO, "\n"); - av_log(NULL, AV_LOG_INFO, "video:%1.0fkB audio:%1.0fkB other streams:%1.0fkB global headers:%1.0fkB muxing overhead: ", - video_size / 1024.0, - audio_size / 1024.0, - other_size / 1024.0, - extra_size / 1024.0); - if (percent >= 0.0) - av_log(NULL, AV_LOG_INFO, "%f%%", percent); - else - av_log(NULL, AV_LOG_INFO, "unknown"); - av_log(NULL, AV_LOG_INFO, "\n"); - } } static void flush_encoders(void) |