From patchwork Thu Jan 26 00:43:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasi Inguva X-Patchwork-Id: 2311 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp2464679vsb; Wed, 25 Jan 2017 16:50:29 -0800 (PST) X-Received: by 10.223.179.15 with SMTP id j15mr102867wrd.159.1485391829551; Wed, 25 Jan 2017 16:50:29 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 33si28980214wrb.160.2017.01.25.16.50.29; Wed, 25 Jan 2017 16:50:29 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A939689E01; Thu, 26 Jan 2017 02:50:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7BE8768A126 for ; Thu, 26 Jan 2017 02:50:18 +0200 (EET) Received: by mail-wm0-f42.google.com with SMTP id r126so51071837wmr.0 for ; Wed, 25 Jan 2017 16:50:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=5ks7J7F64AvDI7zsyV6sptEcXwQjjw2p7HmuVI8v57g=; b=ux1uDhmt1bm4EJVfcuURcG9lFt2uJ4ybrEYC4LfUwfKh0eGl++7T7tp9P6QqsHPx4b OiubQOcHLWKZpJR/UNuXd3m/RKfWdDTQhGgnKj6/rjeFIm/iqNYs2pKUOX1mqgnXoXVG NZdUHySn36Ti2aSzRydYbNccJC1OM72IPJmp2SQZHDex6uJBRhw1+RlS3HLdRZkcsigK KCBWn6zDo6eHISyOvKobPJE7vZzaXrMncnoeK6sM8sRJ2G2I0uRmi8KhapctAWaUBPNH SDpQDFxIfznS2CLnLnfPYJzXCKHYXdTP942kMhx3lZa8TMc7KEKTHmgp5pVjAMECDB2m FjLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=5ks7J7F64AvDI7zsyV6sptEcXwQjjw2p7HmuVI8v57g=; b=hxiZ0r8wY1uf02UylgvCMuqXHjRlPbzPQEasPtEGXjPGSGtJTNeIKdiSms2OUsMZ/m 7XAXlg0Y1dI7GKGjmrpUs4uKyYmd1SSnKqryW1e8QgLCJKSyFrKhUpixqbjDJX12QZt4 p0vFZvxYgfTDYqOnCQ0IcIvk5VWeeDWDaAeF/zbbYayOsWr/jDzod//uj1TBvm9kIYJC 6ls+znibh5qv2iG6T6Ny9lJgjft4Kuw5s8CfaJes+KQNeVipFYyhea7SGil2qzsReWfx MIk3V402SKgj6m4kMyZrcQCj3Ph4u6tPi2eq4Pg+UV9sai2aXvPECjPtEWjzEpOfMJXn uMKw== X-Gm-Message-State: AIkVDXLKl09bcxCkTslMAMUAVz3s/MZKiLgbYzmFN/nzht5pU7rPEY4lXg9wwpndjTHK7VA3NGqvdBXHcNGePl2N X-Received: by 10.28.61.136 with SMTP id k130mr352939wma.128.1485391427764; Wed, 25 Jan 2017 16:43:47 -0800 (PST) MIME-Version: 1.0 Received: by 10.28.94.139 with HTTP; Wed, 25 Jan 2017 16:43:46 -0800 (PST) In-Reply-To: <20170121115230.GS4698@nb4> References: <20170119223414.28516-1-isasi@google.com> <20170121001808.GP4698@nb4> <20170121115230.GS4698@nb4> From: Sasi Inguva Date: Wed, 25 Jan 2017 16:43:46 -0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH] ffmpeg.c: Add output file index and stream index to vstats file. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Updated the patch with using vstats_version. PTAL. On Sat, Jan 21, 2017 at 3:52 AM, Michael Niedermayer wrote: > On Fri, Jan 20, 2017 at 07:31:09PM -0800, Sasi Inguva wrote: > > Couldn't find any version that relates to vstats. There is nothing that > > says format may change any time , but there is no defined format either. > > Let me know the version enum I have to update if I need to. > > i dont think theres a enum > I think the way to resolve this is to send a patch that updates the > docs and either state that vstats format can change at any time or > that it cannot in which case something like a -vtstats_version > parameter would need to be added > > When the docs patch passes review, that is everyone is happy with the > solution it describes then the change with or without a version > check which either way then matches the docs can be pushed > > thx > > [...] > > -- > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > Dictatorship: All citizens are under surveillance, all their steps and > actions recorded, for the politicians to enforce control. > Democracy: All politicians are under surveillance, all their steps and > actions recorded, for the citizens to enforce control. > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > From 9bc4d038af3478467eddc45a634b0e03e163dc39 Mon Sep 17 00:00:00 2001 From: Sasi Inguva Date: Thu, 19 Jan 2017 14:33:32 -0800 Subject: [PATCH] ffmpeg.c: Add output file index and stream index to vstats file. Signed-off-by: Sasi Inguva --- doc/ffmpeg.texi | 8 +++++++- ffmpeg.c | 9 +++++++-- ffmpeg_opt.c | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index cdea1a271f..996d6a6cc4 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -637,9 +637,15 @@ Dump video coding statistics to @file{vstats_HHMMSS.log}. @item -vstats_file @var{file} Dump video coding statistics to @var{file}. @item -vstats_version @var{file} -Specifies which version of the vstats format to use. If version is 1, format is +Specifies which version of the vstats format to use. Default is 2. + +version = 1 : @code{frame= %5d q= %2.1f PSNR= %6.2f f_size= %6d s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s} + +version > 1: + +@code{out= %2d st= %2d frame= %5d q= %2.1f PSNR= %6.2f f_size= %6d s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s} @item -top[:@var{stream_specifier}] @var{n} (@emph{output,per-stream}) top=1/bottom=0/auto=-1 field first @item -dc @var{precision} diff --git a/ffmpeg.c b/ffmpeg.c index 977708c069..0a8f448995 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1347,8 +1347,13 @@ static void do_video_stats(OutputStream *ost, int frame_size) enc = ost->enc_ctx; if (enc->codec_type == AVMEDIA_TYPE_VIDEO) { frame_number = ost->st->nb_frames; - fprintf(vstats_file, "frame= %5d q= %2.1f ", frame_number, - ost->quality / (float)FF_QP2LAMBDA); + if (vstats_version <= 1) { + fprintf(vstats_file, "frame= %5d q= %2.1f ", frame_number, + ost->quality / (float)FF_QP2LAMBDA); + } else { + fprintf(vstats_file, "out= %2d st= %2d frame= %5d q= %2.1f ", ost->file_index, ost->index, frame_number, + ost->quality / (float)FF_QP2LAMBDA); + } if (ost->error[0]>=0 && (enc->flags & AV_CODEC_FLAG_PSNR)) fprintf(vstats_file, "PSNR= %6.2f ", psnr(ost->error[0] / (enc->width * enc->height * 255.0 * 255.0))); diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index b1a62e8620..6a47d32b53 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -121,7 +121,7 @@ int frame_bits_per_raw_sample = 0; float max_error_rate = 2.0/3; int filter_nbthreads = 0; int filter_complex_nbthreads = 0; -int vstats_version = 1; +int vstats_version = 2; static int intra_only = 0; -- 2.11.0.483.g087da7b7c-goog