From patchwork Thu Oct 13 06:45:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Rapp X-Patchwork-Id: 984 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp137184vsd; Wed, 12 Oct 2016 23:46:08 -0700 (PDT) X-Received: by 10.28.51.134 with SMTP id z128mr924864wmz.96.1476341168402; Wed, 12 Oct 2016 23:46:08 -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 uo4si15651418wjc.195.2016.10.12.23.46.07; Wed, 12 Oct 2016 23:46:08 -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; 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 981D7689931; Thu, 13 Oct 2016 09:46:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from p1002.netstorage.at (p1002.netstorage.at [89.207.146.186]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FFDB6891E3 for ; Thu, 13 Oct 2016 09:45:58 +0300 (EEST) Received: from mailix (noaport.de [46.237.252.213]) by p1002.netstorage.at (Postfix) with ESMTPA id 3360981CF1 for ; Thu, 13 Oct 2016 08:45:58 +0200 (CEST) Received: from [127.0.0.1] (HSI-KBW-46-237-252-214.hsi.kabel-badenwuerttemberg.de [46.237.252.214]) by mailix with ESMTPSA (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128) ; Thu, 13 Oct 2016 08:45:58 +0200 To: ffmpeg-devel@ffmpeg.org References: <20161004044939.22351-1-rodger.combs@gmail.com> <20161004044939.22351-4-rodger.combs@gmail.com> <20161004061544.GF2116@kimiko.pkh.me> From: Tobias Rapp Organization: NOA GmbH Message-ID: <7e8a270f-32c4-e984-c8b6-9c1fae980497@noa-archive.com> Date: Thu, 13 Oct 2016 08:45:57 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <20161004061544.GF2116@kimiko.pkh.me> Subject: Re: [FFmpeg-devel] [PATCH 4/4] ffprobe: report field order for video streams 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" On 04.10.2016 08:15, Clément Bœsch wrote: > On Mon, Oct 03, 2016 at 11:49:39PM -0500, Rodger Combs wrote: >> --- >> ffprobe.c | 13 +++++++++++++ >> tests/ref/fate/concat-demuxer-extended-lavf-mxf | 2 +- >> tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 | 2 +- >> tests/ref/fate/concat-demuxer-simple1-lavf-mxf | 2 +- >> tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 | 2 +- >> tests/ref/fate/concat-demuxer-simple2-lavf-ts | 2 +- >> tests/ref/fate/ffprobe_compact | 4 ++-- >> tests/ref/fate/ffprobe_csv | 4 ++-- >> tests/ref/fate/ffprobe_default | 2 ++ >> tests/ref/fate/ffprobe_flat | 2 ++ >> tests/ref/fate/ffprobe_ini | 2 ++ >> 11 files changed, 28 insertions(+), 9 deletions(-) >> >> diff --git a/ffprobe.c b/ffprobe.c >> index bb3979c..3118e80 100644 >> --- a/ffprobe.c >> +++ b/ffprobe.c >> @@ -2268,6 +2268,19 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id >> else >> print_str_opt("chroma_location", av_chroma_location_name(par->chroma_location)); >> >> + if (par->field_order == AV_FIELD_PROGRESSIVE) >> + print_str("field_order", "progressive"); >> + else if (par->field_order == AV_FIELD_TT) >> + print_str("field_order", "tt"); >> + else if (par->field_order == AV_FIELD_BB) >> + print_str("field_order", "bb"); >> + else if (par->field_order == AV_FIELD_TB) >> + print_str("field_order", "tb"); >> + else if (par->field_order == AV_FIELD_BT) >> + print_str("field_order", "bt"); >> + else >> + print_str_opt("field_order", "unknown"); >> + > > This probably needs an update of doc/ffprobe.xsd @Rodger: I guess the XSD update will look like: I'd love to see the patch included in FFmpeg 3.2. Regards, Tobias diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd index 757de12..ac0347f 100644 --- a/doc/ffprobe.xsd +++ b/doc/ffprobe.xsd @@ -201,6 +201,7 @@ +