mpv: Update to 0.22.0

1 files changed, 187 insertions, 21 deletions

diff --git a/media/mpv/patch/0002-Add-generated-ebml-sources.patch b/media/mpv/patch/0002-Add-generated-ebml-sources.patch
index 88f9d544..bb3be12e 100644
--- a/media/mpv/patch/0002-Add-generated-ebml-sources.patch
+++ b/media/mpv/patch/0002-Add-generated-ebml-sources.patch
@@ -1,4 +1,4 @@
-From 66c3084212b84095703b39c6c4bfc76dca03c564 Mon Sep 17 00:00:00 2001
+From 79a9af59e6865a39214f628186fd768165fa2329 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sat, 2 Jul 2016 17:32:27 -0700
 Subject: [PATCH] Add generated ebml sources
@@ -8,18 +8,18 @@ These require perl to generate.
 $ perl TOOLS/matroska.pl --generate-header demux/ebml.c demux/demux_mkv.c > demux/ebml_types.h
 $ perl TOOLS/matroska.pl --generate-definitions demux/ebml.c > demux/ebml_defs.c
 ---
- demux/ebml_defs.c  | 448 +++++++++++++++++++++++++++++++++++++++++++++++
- demux/ebml_types.h | 502 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 950 insertions(+)
+ demux/ebml_defs.c  | 529 +++++++++++++++++++++++++++++++++++++++++++++++
+ demux/ebml_types.h | 587 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 1116 insertions(+)
  create mode 100644 demux/ebml_defs.c
  create mode 100644 demux/ebml_types.h
 
 diff --git a/demux/ebml_defs.c b/demux/ebml_defs.c
 new file mode 100644
-index 0000000..230c184
+index 000000000..3fcbf8a5b
 --- /dev/null
 +++ b/demux/ebml_defs.c
-@@ -0,0 +1,448 @@
+@@ -0,0 +1,529 @@
 +/* Generated by TOOLS/matroska.pl, do not edit manually */
 +
 +
@@ -189,8 +189,89 @@ index 0000000..230c184
 +
 +E("StereoMode", stereo_mode, EBML_TYPE_UINT)
 +
++E("MatrixCoefficients", matrix_coefficients, EBML_TYPE_UINT)
++
++E("BitsPerChannel", bits_per_channel, EBML_TYPE_UINT)
++
++E("ChromaSubsamplingHorz", chroma_subsampling_horz, EBML_TYPE_UINT)
++
++E("ChromaSubsamplingVert", chroma_subsampling_vert, EBML_TYPE_UINT)
++
++E("CbSubsamplingHorz", cb_subsampling_horz, EBML_TYPE_UINT)
++
++E("CbSubsamplingVert", cb_subsampling_vert, EBML_TYPE_UINT)
++
++E("ChromaSitingHorz", chroma_siting_horz, EBML_TYPE_UINT)
++
++E("ChromaSitingVert", chroma_siting_vert, EBML_TYPE_UINT)
++
++E("Range", range, EBML_TYPE_UINT)
++
++E("TransferCharacteristics", transfer_characteristics, EBML_TYPE_UINT)
++
++E("Primaries", primaries, EBML_TYPE_UINT)
++
++E("MaxCLL", max_cll, EBML_TYPE_UINT)
++
++E("MaxFALL", max_fall, EBML_TYPE_UINT)
++
++E("PrimaryRChromaticityX", primary_r_chromaticity_x, EBML_TYPE_FLOAT)
++
++E("PrimaryRChromaticityY", primary_r_chromaticity_y, EBML_TYPE_FLOAT)
++
++E("PrimaryGChromaticityX", primary_g_chromaticity_x, EBML_TYPE_FLOAT)
++
++E("PrimaryGChromaticityY", primary_g_chromaticity_y, EBML_TYPE_FLOAT)
++
++E("PrimaryBChromaticityX", primary_b_chromaticity_x, EBML_TYPE_FLOAT)
++
++E("PrimaryBChromaticityY", primary_b_chromaticity_y, EBML_TYPE_FLOAT)
++
++E("WhitePointChromaticityX", white_point_chromaticity_x, EBML_TYPE_FLOAT)
++
++E("WhitePointChromaticityY", white_point_chromaticity_y, EBML_TYPE_FLOAT)
++
++E("LuminanceMax", luminance_max, EBML_TYPE_FLOAT)
++
++E("LuminanceMin", luminance_min, EBML_TYPE_FLOAT)
++
++#define N mastering_metadata
++E_S("MasteringMetadata", 10)
++F(MATROSKA_ID_LUMINANCEMAX, luminance_max, 0)
++F(MATROSKA_ID_LUMINANCEMIN, luminance_min, 0)
++F(MATROSKA_ID_PRIMARYBCHROMATICITYX, primary_b_chromaticity_x, 0)
++F(MATROSKA_ID_PRIMARYBCHROMATICITYY, primary_b_chromaticity_y, 0)
++F(MATROSKA_ID_PRIMARYGCHROMATICITYX, primary_g_chromaticity_x, 0)
++F(MATROSKA_ID_PRIMARYGCHROMATICITYY, primary_g_chromaticity_y, 0)
++F(MATROSKA_ID_PRIMARYRCHROMATICITYX, primary_r_chromaticity_x, 0)
++F(MATROSKA_ID_PRIMARYRCHROMATICITYY, primary_r_chromaticity_y, 0)
++F(MATROSKA_ID_WHITEPOINTCHROMATICITYX, white_point_chromaticity_x, 0)
++F(MATROSKA_ID_WHITEPOINTCHROMATICITYY, white_point_chromaticity_y, 0)
++}};
++#undef N
++
++#define N colour
++E_S("Colour", 14)
++F(MATROSKA_ID_BITSPERCHANNEL, bits_per_channel, 0)
++F(MATROSKA_ID_CBSUBSAMPLINGHORZ, cb_subsampling_horz, 0)
++F(MATROSKA_ID_CBSUBSAMPLINGVERT, cb_subsampling_vert, 0)
++F(MATROSKA_ID_CHROMASITINGHORZ, chroma_siting_horz, 0)
++F(MATROSKA_ID_CHROMASITINGVERT, chroma_siting_vert, 0)
++F(MATROSKA_ID_CHROMASUBSAMPLINGHORZ, chroma_subsampling_horz, 0)
++F(MATROSKA_ID_CHROMASUBSAMPLINGVERT, chroma_subsampling_vert, 0)
++F(MATROSKA_ID_MASTERINGMETADATA, mastering_metadata, 0)
++F(MATROSKA_ID_MATRIXCOEFFICIENTS, matrix_coefficients, 0)
++F(MATROSKA_ID_MAXCLL, max_cll, 0)
++F(MATROSKA_ID_MAXFALL, max_fall, 0)
++F(MATROSKA_ID_PRIMARIES, primaries, 0)
++F(MATROSKA_ID_RANGE, range, 0)
++F(MATROSKA_ID_TRANSFERCHARACTERISTICS, transfer_characteristics, 0)
++}};
++#undef N
++
 +#define N video
-+E_S("Video", 9)
++E_S("Video", 10)
++F(MATROSKA_ID_COLOUR, colour, 0)
 +F(MATROSKA_ID_COLOURSPACE, colour_space, 0)
 +F(MATROSKA_ID_DISPLAYHEIGHT, display_height, 0)
 +F(MATROSKA_ID_DISPLAYUNIT, display_unit, 0)
@@ -470,10 +551,10 @@ index 0000000..230c184
 +#undef N
 diff --git a/demux/ebml_types.h b/demux/ebml_types.h
 new file mode 100644
-index 0000000..3739ec5
+index 000000000..4c61d77a0
 --- /dev/null
 +++ b/demux/ebml_types.h
-@@ -0,0 +1,502 @@
+@@ -0,0 +1,587 @@
 +/* Generated by TOOLS/matroska.pl, do not edit manually */
 +
 +#define EBML_ID_EBMLVERSION                      0x4286
@@ -537,6 +618,31 @@ index 0000000..3739ec5
 +#define MATROSKA_ID_FRAMERATE                    0x2383e3
 +#define MATROSKA_ID_COLOURSPACE                  0x2eb524
 +#define MATROSKA_ID_STEREOMODE                   0x53b8
++#define MATROSKA_ID_MATRIXCOEFFICIENTS           0x55B1
++#define MATROSKA_ID_BITSPERCHANNEL               0x55B2
++#define MATROSKA_ID_CHROMASUBSAMPLINGHORZ        0x55B3
++#define MATROSKA_ID_CHROMASUBSAMPLINGVERT        0x55B4
++#define MATROSKA_ID_CBSUBSAMPLINGHORZ            0x55B5
++#define MATROSKA_ID_CBSUBSAMPLINGVERT            0x55B6
++#define MATROSKA_ID_CHROMASITINGHORZ             0x55B7
++#define MATROSKA_ID_CHROMASITINGVERT             0x55B8
++#define MATROSKA_ID_RANGE                        0x55B9
++#define MATROSKA_ID_TRANSFERCHARACTERISTICS      0x55BA
++#define MATROSKA_ID_PRIMARIES                    0x55BB
++#define MATROSKA_ID_MAXCLL                       0x55BC
++#define MATROSKA_ID_MAXFALL                      0x55BD
++#define MATROSKA_ID_PRIMARYRCHROMATICITYX        0x55D1
++#define MATROSKA_ID_PRIMARYRCHROMATICITYY        0x55D2
++#define MATROSKA_ID_PRIMARYGCHROMATICITYX        0x55D3
++#define MATROSKA_ID_PRIMARYGCHROMATICITYY        0x55D4
++#define MATROSKA_ID_PRIMARYBCHROMATICITYX        0x55D5
++#define MATROSKA_ID_PRIMARYBCHROMATICITYY        0x55D6
++#define MATROSKA_ID_WHITEPOINTCHROMATICITYX      0x55D7
++#define MATROSKA_ID_WHITEPOINTCHROMATICITYY      0x55D8
++#define MATROSKA_ID_LUMINANCEMAX                 0x55D9
++#define MATROSKA_ID_LUMINANCEMIN                 0x55DA
++#define MATROSKA_ID_MASTERINGMETADATA            0x55D0
++#define MATROSKA_ID_COLOUR                       0x55B0
 +#define MATROSKA_ID_VIDEO                        0xe0
 +#define MATROSKA_ID_SAMPLINGFREQUENCY            0xb5
 +#define MATROSKA_ID_OUTPUTSAMPLINGFREQUENCY      0x78b5
@@ -610,12 +716,12 @@ index 0000000..3739ec5
 +    uint64_t  ebml_read_version;
 +    uint64_t  ebml_version;
 +
-+    int n_doc_type_version;
-+    int n_doc_type_read_version;
 +    int n_ebml_version;
 +    int n_ebml_max_id_length;
 +    int n_ebml_max_size_length;
 +    int n_doc_type;
++    int n_doc_type_version;
++    int n_doc_type_read_version;
 +    int n_ebml_read_version;
 +};
 +
@@ -677,16 +783,73 @@ index 0000000..3739ec5
 +    int n_simple_block;
 +};
 +
++struct ebml_mastering_metadata {
++    double  luminance_max;
++    double  luminance_min;
++    double  primary_b_chromaticity_x;
++    double  primary_b_chromaticity_y;
++    double  primary_g_chromaticity_x;
++    double  primary_g_chromaticity_y;
++    double  primary_r_chromaticity_x;
++    double  primary_r_chromaticity_y;
++    double  white_point_chromaticity_x;
++    double  white_point_chromaticity_y;
++
++    int n_primary_r_chromaticity_x;
++    int n_primary_r_chromaticity_y;
++    int n_primary_g_chromaticity_x;
++    int n_primary_g_chromaticity_y;
++    int n_primary_b_chromaticity_x;
++    int n_primary_b_chromaticity_y;
++    int n_white_point_chromaticity_x;
++    int n_white_point_chromaticity_y;
++    int n_luminance_max;
++    int n_luminance_min;
++};
++
++struct ebml_colour {
++    uint64_t                        bits_per_channel;
++    uint64_t                        cb_subsampling_horz;
++    uint64_t                        cb_subsampling_vert;
++    uint64_t                        chroma_siting_horz;
++    uint64_t                        chroma_siting_vert;
++    uint64_t                        chroma_subsampling_horz;
++    uint64_t                        chroma_subsampling_vert;
++    struct ebml_mastering_metadata  mastering_metadata;
++    uint64_t                        matrix_coefficients;
++    uint64_t                        max_cll;
++    uint64_t                        max_fall;
++    uint64_t                        primaries;
++    uint64_t                        range;
++    uint64_t                        transfer_characteristics;
++
++    int n_matrix_coefficients;
++    int n_bits_per_channel;
++    int n_chroma_subsampling_horz;
++    int n_chroma_subsampling_vert;
++    int n_cb_subsampling_horz;
++    int n_cb_subsampling_vert;
++    int n_chroma_siting_horz;
++    int n_chroma_siting_vert;
++    int n_range;
++    int n_transfer_characteristics;
++    int n_primaries;
++    int n_max_cll;
++    int n_max_fall;
++    int n_mastering_metadata;
++};
++
 +struct ebml_video {
-+    struct bstr  colour_space;
-+    uint64_t     display_height;
-+    uint64_t     display_unit;
-+    uint64_t     display_width;
-+    uint64_t     flag_interlaced;
-+    double       frame_rate;
-+    uint64_t     pixel_height;
-+    uint64_t     pixel_width;
-+    uint64_t     stereo_mode;
++    struct ebml_colour  colour;
++    struct bstr         colour_space;
++    uint64_t            display_height;
++    uint64_t            display_unit;
++    uint64_t            display_width;
++    uint64_t            flag_interlaced;
++    double              frame_rate;
++    uint64_t            pixel_height;
++    uint64_t            pixel_width;
++    uint64_t            stereo_mode;
 +
 +    int n_flag_interlaced;
 +    int n_pixel_width;
@@ -697,6 +860,7 @@ index 0000000..3739ec5
 +    int n_frame_rate;
 +    int n_colour_space;
 +    int n_stereo_mode;
++    int n_colour;
 +};
 +
 +struct ebml_audio {
@@ -953,6 +1117,8 @@ index 0000000..3739ec5
 +extern const struct ebml_elem_desc ebml_info_desc;
 +extern const struct ebml_elem_desc ebml_block_group_desc;
 +extern const struct ebml_elem_desc ebml_cluster_desc;
++extern const struct ebml_elem_desc ebml_mastering_metadata_desc;
++extern const struct ebml_elem_desc ebml_colour_desc;
 +extern const struct ebml_elem_desc ebml_video_desc;
 +extern const struct ebml_elem_desc ebml_audio_desc;
 +extern const struct ebml_elem_desc ebml_content_compression_desc;
@@ -977,5 +1143,5 @@ index 0000000..3739ec5
 +
 +#define MAX_EBML_SUBELEMENTS 23
 -- 
-2.9.2
+2.11.0