From patchwork Sun Sep 4 16:24:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 413 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp2366915vsd; Sun, 4 Sep 2016 09:39:17 -0700 (PDT) X-Received: by 10.194.134.101 with SMTP id pj5mr5722383wjb.59.1473007157759; Sun, 04 Sep 2016 09:39:17 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bs1si21085969wjc.28.2016.09.04.09.39.14; Sun, 04 Sep 2016 09:39:17 -0700 (PDT) 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=@gmail.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; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7B696689E29; Sun, 4 Sep 2016 19:39:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 696AF689CBC for ; Sun, 4 Sep 2016 19:38:57 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id l65so2102234wmf.3 for ; Sun, 04 Sep 2016 09:39:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=tuwG6nAiNExjbO3tvQS814/ONqOkRYfEra1CiJkn5JM=; b=Tf0CiJxYUP7vuUWke6vlL2TGVFcM0KaXIcuC7wfYuI6udWkxKjngZBf5ZpXb8ysd7Q uRsAjlnAi+8FXsQU9ircfbzE5v0/crKAlWikxyd5vSJN88gPJ+CWK6RPmONFuYAgNxfx HCaAGL/4Ud5yLxrarvrAY7YT8KOQasJyeumYuZOr8WvfshwwJsZHQ0L49G6W2JT6fzhm d4vV6ZzjCbbCkZs02R2kvlkuIICmM023f9EsC2+Tnv0tTwQJtl0I0z7zuMEgFcvRXdDQ TpH4K0fvLP7EVTLP/eRVAHqyG7Nq6I1YGkjKzUm9t8dvn7Ck5kWYy95fHxR1z1urvQN8 6tHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=tuwG6nAiNExjbO3tvQS814/ONqOkRYfEra1CiJkn5JM=; b=FObSSQWskHV4yaajX3Jr5SsTOGpaRqFqA9WieWCv3v9wOkbX/V8ghVL5yW8ptxABmg j5uX/iJRob1aabwTApVJ3vspM6lHlgqSz/5AjmtRdQ762R2ps+uSj39tvj21YIxsuxGZ SRoLAEFeR3If0mVRQVCgo/kx1EilBkKXdVKri96Q+Wz74iSh1gil/xu4mRKaWze1KffS yqV7KLfsX6vzmamrAyeN4KYQZLMAeWhWfg1xzKeRU7mluNLuagdRvG1WT7B2g/blCaZU y2u2iuJgu6Bd7Tn8NORNZp9P+9Dy65w10zHcZHieolV2Otv2s1OPzHcz9Bcaz9MoZKFK ydcA== X-Gm-Message-State: AE9vXwNUlU4JXyi9HDIgnNT2N2G5b5ARBihzdcgoF+cYIeJJmxGDLWdXpL+LKtZS87cN6A== X-Received: by 10.194.21.229 with SMTP id y5mr27599353wje.170.1473006273673; Sun, 04 Sep 2016 09:24:33 -0700 (PDT) Received: from barisone ([151.56.79.219]) by smtp.gmail.com with ESMTPSA id vh6sm22085907wjb.0.2016.09.04.09.24.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Sep 2016 09:24:33 -0700 (PDT) Received: by barisone (Postfix, from userid 1000) id A7B1A1A8354; Sun, 4 Sep 2016 18:24:31 +0200 (CEST) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Sun, 4 Sep 2016 18:24:31 +0200 Message-Id: <1473006271-16114-1-git-send-email-stefasab@gmail.com> X-Mailer: git-send-email 1.9.1 Subject: [FFmpeg-devel] [PATCH] ffprobe: add -show_compact_data option 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 Cc: Stefano Sabatini MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This is meant to slightly reduce the output size. --- ffprobe.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ffprobe.c b/ffprobe.c index 42a8d8e..f2c542a 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -99,6 +99,7 @@ static int use_byte_value_binary_prefix = 0; static int use_value_sexagesimal_format = 0; static int show_private_data = 1; static int show_headers_first = 0; +static int show_compact_data = 0; static char *print_format; static char *stream_specifier; @@ -723,16 +724,19 @@ static void writer_print_data(WriterContext *wctx, const char *name, av_bprint_init(&bp, 0, AV_BPRINT_SIZE_UNLIMITED); av_bprintf(&bp, "\n"); while (size) { + if (!show_compact_data) av_bprintf(&bp, "%08x: ", offset); - l = FFMIN(size, 16); + l = FFMIN(size, show_compact_data ? 40 : 16); for (i = 0; i < l; i++) { av_bprintf(&bp, "%02x", data[i]); - if (i & 1) + if (!show_compact_data && (i & 1)) av_bprintf(&bp, " "); } + if (!show_compact_data) { av_bprint_chars(&bp, ' ', 41 - 2 * i - i / 2); for (i = 0; i < l; i++) av_bprint_chars(&bp, data[i] - 32U < 95 ? data[i] : '.', 1); + } av_bprintf(&bp, "\n"); offset += l; data += l; @@ -3235,6 +3239,7 @@ static const OptionDef real_options[] = { { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {.func_arg = opt_default}, "generic catch all option", "" }, { "i", HAS_ARG, {.func_arg = opt_input_file_i}, "read specified file", "input_file"}, { "show_headers_first", OPT_BOOL, {&show_headers_first}, "show headers before the packets/frames" }, + { "show_compact_data", OPT_BOOL, {&show_compact_data}, "show packet data in a compact format" }, { NULL, }, };