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

[Aaron Colwell]

I've attached an updated patch and modified test suite files so that the
code now passes FATE on my local machine.

The media files needed to be updated because they contained fields that
indicated tiled-equirect.  Based on the discussion in another thread,
tiled-equirect is supposed to get its own enum value so technically
the existing code was being more permissive than it should have been and
was signalling full sphere equirect when it shouldn't have been. Full
sphere equirect is actually what most people use so it seems reasonable to
adjust the test files to reflect that case instead.

Aaron

On Mon, Feb 6, 2017 at 4:57 PM Michael Niedermayer <michael at niedermayer.cc>
wrote:

> 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 at 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
> --- ./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
> Test h264-direct-bff failed. Look at tests/data/fate/h264-direct-bff.err
> for details.
> make: *** [fate-h264-direct-bff] Error 1
> [...]
>
> --
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> Asymptotically faster algorithms should always be preferred if you have
> asymptotical amounts of data
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-mov-matroskadec-Allow-matroskadec-mov-to-share-spher.patch
Type: text/x-patch
Size: 12783 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20170207/49fd39b2/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: spherical.mov
Type: video/quicktime
Size: 81985 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20170207/49fd39b2/attachment.mov>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: spherical.mkv
Type: video/x-matroska
Size: 81036 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20170207/49fd39b2/attachment.mkv>