diff mbox

[FFmpeg-devel] mov, matroskadec : Allow matroskadec & mov to share spherical parsing logic.

Message ID 20170207005714.GI5776@nb4
State Not Applicable
Headers show

Commit Message

Michael Niedermayer Feb. 7, 2017, 12:57 a.m. UTC 
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 <acolwell@google.com>
> 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
[...]
diff mbox

Patch

--- ./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