From patchwork Thu Jul 18 22:55:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 13986 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 6261C449525 for ; Fri, 19 Jul 2019 02:01:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E48668A56C; Fri, 19 Jul 2019 02:01:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f68.google.com (mail-ot1-f68.google.com [209.85.210.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A761868A417 for ; Fri, 19 Jul 2019 02:01:16 +0300 (EEST) Received: by mail-ot1-f68.google.com with SMTP id r6so30831030oti.3 for ; Thu, 18 Jul 2019 16:01:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7yHHdrjemYznSp7Oar+TPgiL4P5nma1YuNStzCO/tJk=; b=DfRK8iDdwSfRK3wov1dYBTi2djSHHlFlmiSbONYTAFCLn7/Ed4C1Dr3VdWwMEICFCw CRD5jyoDwgWdo2Mc1wlg7YJrRvompxWUpHzgapSvfq+lwTHFH9RglwU4hF3+0yhXsx0D poNR7APGb6MdvUNMJncURqsPae2gets6n3MrhoSgMrTPObVnmYawn+0peExnY2dd7Gyi DbhUFSULg5b1q85Dc6fFuAe094DtXi8GRSKesL4NJOiE3p4MO8cklIh3Z5yn08CRziwq ZfXdYR0mJYVpkJMMqWqpdx4QMWDh/q2k3+q0KObmUM49b0VWxV03kyqavmvM/CoxFsUC baHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=7yHHdrjemYznSp7Oar+TPgiL4P5nma1YuNStzCO/tJk=; b=rkXAJk6CnX7mrAdKPsTS0EC0NzNdLCI5BVL6dh6B57UbdH/S1wHpHgCT4nbbJh3mG2 2mh2xNsskH7gkCoT03Jc8ugYVTLYYLHISoRVPFM6otS4riuxPk64sssWL5F64IACOATU 4+QW7BKsgeeARBb59gXt1CjRRjmtca2JnAyXHmTNXp8unRIBbsV/C+trusxbelNMgxaV wJxNexBwB4ATgwiaFwvnDbEKZTG9e+xVOM3C6KuwMstcI2O48ZI8BrmtGRihaAnfgvC6 TVjcYF1dOSJE/26C2/W+wYKKc+0bVeaLRKEJXyPZrucG3UKyDhthM07dkuzzql9eySnU F+mw== X-Gm-Message-State: APjAAAW2jK4606qAS9TuLyu8RJ7Imp1WnU0hAO9daBGbJZlVsT9B4HPB v7w53gjaoVUdEx+TU+EWC4oVdMYdxWM= X-Google-Smtp-Source: APXvYqxDeQR4cwIa1eSTIZKyrv6cVZP+4/OL4atcGi3EdCyY4wHoNvOhCl4MlJcEgyjUkz4EbrLong== X-Received: by 2002:a9d:4c8b:: with SMTP id m11mr13783710otf.293.1563490515129; Thu, 18 Jul 2019 15:55:15 -0700 (PDT) Received: from tmm1-imac.lan (ip184-189-221-177.sb.sd.cox.net. [184.189.221.177]) by smtp.gmail.com with ESMTPSA id z69sm9764432oia.48.2019.07.18.15.55.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Jul 2019 15:55:14 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Jul 2019 15:55:11 -0700 Message-Id: <20190718225511.71099-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffprobe: process show_frame/show_packets last 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: Aman Gupta Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta When using `ffprobe -show_format -show_streams -show_packets`, it makes more sense to omit static data about the file format and streams before the long list of packets instead of at the end. Signed-off-by: Aman Gupta --- fftools/ffprobe.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 5aaddb0308..c9c10b143d 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -3003,6 +3003,26 @@ static int probe_file(WriterContext *wctx, const char *filename) ifile.fmt_ctx->streams[i]->discard = AVDISCARD_ALL; } + if (do_show_format) { + ret = show_format(wctx, &ifile); + CHECK_END; + } + + if (do_show_streams) { + ret = show_streams(wctx, &ifile); + CHECK_END; + } + + if (do_show_programs) { + ret = show_programs(wctx, &ifile); + CHECK_END; + } + + if (do_show_chapters) { + ret = show_chapters(wctx, &ifile); + CHECK_END; + } + if (do_read_frames || do_read_packets) { if (do_show_frames && do_show_packets && wctx->writer->flags & WRITER_FLAG_PUT_PACKETS_AND_FRAMES_IN_SAME_CHAPTER) @@ -3019,24 +3039,6 @@ static int probe_file(WriterContext *wctx, const char *filename) CHECK_END; } - if (do_show_programs) { - ret = show_programs(wctx, &ifile); - CHECK_END; - } - - if (do_show_streams) { - ret = show_streams(wctx, &ifile); - CHECK_END; - } - if (do_show_chapters) { - ret = show_chapters(wctx, &ifile); - CHECK_END; - } - if (do_show_format) { - ret = show_format(wctx, &ifile); - CHECK_END; - } - end: if (ifile.fmt_ctx) close_input_file(&ifile);