From f801d8aa868ac6af5116900882f71e68e7f9ec61 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Wed, 25 Apr 2007 09:32:45 +0000 Subject: [PATCH] add a vstats_file command line option patch by Stefano Sabatini stefano sabatini-lala poste it Originally committed as revision 8807 to svn://svn.ffmpeg.org/ffmpeg/trunk --- doc/ffmpeg-doc.texi | 2 ++ ffmpeg.c | 50 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi index b72e7a0..2d6ad54 100644 --- a/doc/ffmpeg-doc.texi +++ b/doc/ffmpeg-doc.texi @@ -585,6 +585,8 @@ The alternative is to deinterlace the input stream with Calculate PSNR of compressed frames. @item -vstats Dump video coding statistics to @file{vstats_HHMMSS.log}. +@item -vstats_file file +Dump video coding statistics to @var{file}. @item -vhook module Insert video processing @var{module}. @var{module} contains the module name and its parameters separated by spaces. diff --git a/ffmpeg.c b/ffmpeg.c index e54947f..575a4f7 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -166,7 +166,6 @@ static int do_benchmark = 0; static int do_hex_dump = 0; static int do_pkt_dump = 0; static int do_psnr = 0; -static int do_vstats = 0; static int do_pass = 0; static char *pass_logfilename = NULL; static int audio_stream_copy = 0; @@ -177,6 +176,7 @@ static int audio_sync_method= 0; static int copy_ts= 0; static int opt_shortest = 0; // static int video_global_header = 0; +static FILE *fvstats= NULL; static int rate_emu = 0; @@ -841,28 +841,11 @@ static double psnr(double d){ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, int frame_size) { - static FILE *fvstats=NULL; - char filename[40]; - time_t today2; - struct tm *today; AVCodecContext *enc; int frame_number; int64_t ti; double ti1, bitrate, avg_bitrate; - if (!fvstats) { - today2 = time(NULL); - today = localtime(&today2); - snprintf(filename, sizeof(filename), "vstats_%02d%02d%02d.log", today->tm_hour, - today->tm_min, - today->tm_sec); - fvstats = fopen(filename,"w"); - if (!fvstats) { - perror("fopen"); - exit(1); - } - } - ti = INT64_MAX; enc = ost->st->codec; if (enc->codec_type == CODEC_TYPE_VIDEO) { @@ -1197,7 +1180,7 @@ static int output_packet(AVInputStream *ist, int ist_index, case CODEC_TYPE_VIDEO: do_video_out(os, ost, ist, &picture, &frame_size); video_size += frame_size; - if (do_vstats && frame_size) + if (fvstats && frame_size) do_video_stats(os, ost, frame_size); break; case CODEC_TYPE_SUBTITLE: @@ -3449,6 +3432,32 @@ static void opt_target(const char *arg) } } +static void opt_vstats_file (const char *arg) +{ + if (!fvstats) + { + fvstats = fopen(arg ,"w"); + if (!fvstats) { + perror("fopen"); + exit(1); + } + } +} + +static void opt_vstats (void) +{ + if (!fvstats) { + char filename[40]; + time_t today2 = time(NULL); + struct tm *today = localtime(&today2); + + snprintf(filename, sizeof(filename), "vstats_%02d%02d%02d.log", today->tm_hour, + today->tm_min, + today->tm_sec); + opt_vstats_file(filename); + } +} + static void opt_video_bsf(const char *arg) { AVBitStreamFilterContext *bsfc= av_bitstream_filter_init(arg); //FIXME split name and args for filter at '=' @@ -3610,7 +3619,8 @@ const OptionDef options[] = { { "deinterlace", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_deinterlace}, "deinterlace pictures" }, { "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" }, - { "vstats", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_vstats}, "dump video coding statistics to file" }, + { "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" }, + { "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" }, { "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" }, { "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" }, { "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" }, -- 2.7.4