From patchwork Tue Feb 7 00:57:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 2439 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp2026176vsb; Mon, 6 Feb 2017 16:57:30 -0800 (PST) X-Received: by 10.28.136.13 with SMTP id k13mr11082355wmd.94.1486429049940; Mon, 06 Feb 2017 16:57: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 h19si2946448wrc.243.2017.02.06.16.57.29; Mon, 06 Feb 2017 16:57: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; 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 75A686809EB; Tue, 7 Feb 2017 02:57:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D4266804CA for ; Tue, 7 Feb 2017 02:57:18 +0200 (EET) Received: from mfilter18-d.gandi.net (mfilter18-d.gandi.net [217.70.178.146]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id 80979172095 for ; Tue, 7 Feb 2017 01:57:20 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter18-d.gandi.net Received: from relay4-d.mail.gandi.net ([IPv6:::ffff:217.70.183.196]) by mfilter18-d.gandi.net (mfilter18-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id 9iqKX6AzPFUA for ; Tue, 7 Feb 2017 01:57:19 +0100 (CET) X-Originating-IP: 213.47.41.20 Received: from localhost (213-47-41-20.cable.dynamic.surfer.at [213.47.41.20]) (Authenticated sender: michael@niedermayer.cc) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id D6C01172093 for ; Tue, 7 Feb 2017 01:57:18 +0100 (CET) Date: Tue, 7 Feb 2017 01:57:14 +0100 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20170207005714.GI5776@nb4> References: MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Subject: Re: [FFmpeg-devel] [PATCH] mov, matroskadec : Allow matroskadec & mov to share spherical parsing logic. 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 Mon, Feb 06, 2017 at 09:59:58PM +0000, Aaron Colwell wrote: > - Extracts common spherical metadata parsing logic. > - Adds checks to enforce that only non-tiled equirect & non-padded cubemaps > are accepted. > Makefile | 5 ++- > matroskadec.c | 39 ++++++++++++++-------------- > mov.c | 35 ++++++++++++++----------- > mov_spherical.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > mov_spherical.h | 61 +++++++++++++++++++++++++++++++++++++++++++ > 5 files changed, 182 insertions(+), 36 deletions(-) > ebec975d2645e6cde0902b8a966545617fc420dc 0001-mov-matroskadec-Allow-matroskadec-mov-to-share-spher.patch > From 218dfd7ca1924bc44a168b34ec3c07051823c2dc Mon Sep 17 00:00:00 2001 > From: Aaron Colwell > Date: Mon, 6 Feb 2017 13:48:58 -0800 > Subject: [PATCH] mov,matroskadec : Allow matroskadec & mov to share spherical > parsing logic. > > - Extracts common spherical metadata parsing logic. > - Adds checks to enforce that only non-tiled equirect & non-padded cubemaps > are accepted. > --- > libavformat/Makefile | 5 +-- > libavformat/matroskadec.c | 39 ++++++++++++----------- > libavformat/mov.c | 35 +++++++++++--------- > libavformat/mov_spherical.c | 78 +++++++++++++++++++++++++++++++++++++++++++++ > libavformat/mov_spherical.h | 61 +++++++++++++++++++++++++++++++++++ > 5 files changed, 182 insertions(+), 36 deletions(-) > create mode 100644 libavformat/mov_spherical.c > create mode 100644 libavformat/mov_spherical.h breaks fate-h264-direct-bff TEST h264-direct-bff Test h264-direct-bff failed. Look at tests/data/fate/h264-direct-bff.err for details. make: *** [fate-h264-direct-bff] Error 1 [...] --- ./tests/ref/fate/h264-direct-bff 2017-02-06 12:12:00.827925330 +0100 +++ tests/data/fate/h264-direct-bff 2017-02-07 01:54:38.584965163 +0100 @@ -1,16 +0,0 @@ -#tb 0: 1001/30000 -#media_type 0: video -#codec_id 0: rawvideo -#dimensions 0: 720x484 -#sar 0: 1/1 -0, 0, 0, 1, 522720, 0x1ccad503 -0, 1, 1, 1, 522720, 0xd266d6e8 -0, 2, 2, 1, 522720, 0x535473b3 -0, 3, 3, 1, 522720, 0xf8b53c53 -0, 4, 4, 1, 522720, 0x4e4cc04b -0, 5, 5, 1, 522720, 0x20ea3515 -0, 6, 6, 1, 522720, 0xb9c67e30 -0, 7, 7, 1, 522720, 0x03d2e35a -0, 8, 8, 1, 522720, 0xae2e7896 -0, 9, 9, 1, 522720, 0x6da37f41 -0, 12, 12, 1, 522720, 0x7caf4954