diff options
Diffstat (limited to 'pkg/mpv/patch/0001-Add-generated-ebml-sources.patch')
| -rw-r--r-- | pkg/mpv/patch/0001-Add-generated-ebml-sources.patch | 84 |
1 files changed, 64 insertions, 20 deletions
diff --git a/pkg/mpv/patch/0001-Add-generated-ebml-sources.patch b/pkg/mpv/patch/0001-Add-generated-ebml-sources.patch index bfed482b..0512c987 100644 --- a/pkg/mpv/patch/0001-Add-generated-ebml-sources.patch +++ b/pkg/mpv/patch/0001-Add-generated-ebml-sources.patch @@ -1,4 +1,4 @@ -From 40fd44394eea4f9134436467ecd60b7b27eb76b3 Mon Sep 17 00:00:00 2001 +From e31e68e9600e2e2aff9191b3162ceaecc55f9910 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 python to generate. $ python TOOLS/matroska.py --generate-header > demux/ebml_types.h $ python TOOLS/matroska.py --generate-definitions > demux/ebml_defs.c --- - demux/ebml_defs.c | 547 +++++++++++++++++++++++++++++++++++++++++++++++ - demux/ebml_types.h | 608 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 1155 insertions(+) + demux/ebml_defs.c | 568 +++++++++++++++++++++++++++++++++++++++++++++++ + demux/ebml_types.h | 631 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 1199 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 000000000..5d80f7e21 +index 0000000000..ca45e862d8 --- /dev/null +++ b/demux/ebml_defs.c -@@ -0,0 +1,547 @@ +@@ -0,0 +1,568 @@ +// Generated by TOOLS/matroska.py, do not edit manually + + @@ -242,6 +242,26 @@ index 000000000..5d80f7e21 +}}; +#undef N + ++E("ProjectionPoseRoll", projection_pose_roll, EBML_TYPE_FLOAT) ++ ++E("ProjectionPosePitch", projection_pose_pitch, EBML_TYPE_FLOAT) ++ ++E("ProjectionPoseYaw", projection_pose_yaw, EBML_TYPE_FLOAT) ++ ++E("ProjectionPrivate", projection_private, EBML_TYPE_BINARY) ++ ++E("ProjectionType", projection_type, EBML_TYPE_UINT) ++ ++#define N projection ++E_S("Projection", 5) ++F(MATROSKA_ID_PROJECTIONTYPE, projection_type, 0) ++F(MATROSKA_ID_PROJECTIONPRIVATE, projection_private, 0) ++F(MATROSKA_ID_PROJECTIONPOSEYAW, projection_pose_yaw, 0) ++F(MATROSKA_ID_PROJECTIONPOSEPITCH, projection_pose_pitch, 0) ++F(MATROSKA_ID_PROJECTIONPOSEROLL, projection_pose_roll, 0) ++}}; ++#undef N ++ +E("LuminanceMin", luminance_min, EBML_TYPE_FLOAT) + +E("LuminanceMax", luminance_max, EBML_TYPE_FLOAT) @@ -341,7 +361,7 @@ index 000000000..5d80f7e21 +E("FlagInterlaced", flag_interlaced, EBML_TYPE_UINT) + +#define N video -+E_S("Video", 10) ++E_S("Video", 11) +F(MATROSKA_ID_FLAGINTERLACED, flag_interlaced, 0) +F(MATROSKA_ID_PIXELWIDTH, pixel_width, 0) +F(MATROSKA_ID_PIXELHEIGHT, pixel_height, 0) @@ -352,6 +372,7 @@ index 000000000..5d80f7e21 +F(MATROSKA_ID_COLOURSPACE, colour_space, 0) +F(MATROSKA_ID_STEREOMODE, stereo_mode, 0) +F(MATROSKA_ID_COLOUR, colour, 0) ++F(MATROSKA_ID_PROJECTION, projection, 0) +}}; +#undef N + @@ -569,10 +590,10 @@ index 000000000..5d80f7e21 +#undef N diff --git a/demux/ebml_types.h b/demux/ebml_types.h new file mode 100644 -index 000000000..590c6bdcd +index 0000000000..8622502d06 --- /dev/null +++ b/demux/ebml_types.h -@@ -0,0 +1,608 @@ +@@ -0,0 +1,631 @@ +// Generated by TOOLS/matroska.py, do not edit manually + +#define EBML_ID_EBML 0x1a45dfa3 @@ -669,6 +690,12 @@ index 000000000..590c6bdcd +#define MATROSKA_ID_WHITEPOINTCHROMATICITYY 0x55d8 +#define MATROSKA_ID_LUMINANCEMAX 0x55d9 +#define MATROSKA_ID_LUMINANCEMIN 0x55da ++#define MATROSKA_ID_PROJECTION 0x7670 ++#define MATROSKA_ID_PROJECTIONTYPE 0x7671 ++#define MATROSKA_ID_PROJECTIONPRIVATE 0x7672 ++#define MATROSKA_ID_PROJECTIONPOSEYAW 0x7673 ++#define MATROSKA_ID_PROJECTIONPOSEPITCH 0x7674 ++#define MATROSKA_ID_PROJECTIONPOSEROLL 0x7675 +#define MATROSKA_ID_AUDIO 0xe1 +#define MATROSKA_ID_SAMPLINGFREQUENCY 0xb5 +#define MATROSKA_ID_OUTPUTSAMPLINGFREQUENCY 0x78b5 @@ -901,6 +928,20 @@ index 000000000..590c6bdcd + int n_bit_depth; +}; + ++struct ebml_projection { ++ uint64_t projection_type; ++ bstr projection_private; ++ double projection_pose_yaw; ++ double projection_pose_pitch; ++ double projection_pose_roll; ++ ++ int n_projection_type; ++ int n_projection_private; ++ int n_projection_pose_yaw; ++ int n_projection_pose_pitch; ++ int n_projection_pose_roll; ++}; ++ +struct ebml_mastering_metadata { + double primary_r_chromaticity_x; + double primary_r_chromaticity_y; @@ -958,16 +999,17 @@ index 000000000..590c6bdcd +}; + +struct ebml_video { -+ uint64_t flag_interlaced; -+ uint64_t pixel_width; -+ uint64_t pixel_height; -+ uint64_t display_width; -+ uint64_t display_height; -+ uint64_t display_unit; -+ double frame_rate; -+ bstr colour_space; -+ uint64_t stereo_mode; -+ struct ebml_colour colour; ++ uint64_t flag_interlaced; ++ uint64_t pixel_width; ++ uint64_t pixel_height; ++ uint64_t display_width; ++ uint64_t display_height; ++ uint64_t display_unit; ++ double frame_rate; ++ bstr colour_space; ++ uint64_t stereo_mode; ++ struct ebml_colour colour; ++ struct ebml_projection projection; + + int n_flag_interlaced; + int n_pixel_width; @@ -979,6 +1021,7 @@ index 000000000..590c6bdcd + int n_colour_space; + int n_stereo_mode; + int n_colour; ++ int n_projection; +}; + +struct ebml_track_entry { @@ -1162,6 +1205,7 @@ index 000000000..590c6bdcd +extern const struct ebml_elem_desc ebml_video_desc; +extern const struct ebml_elem_desc ebml_colour_desc; +extern const struct ebml_elem_desc ebml_mastering_metadata_desc; ++extern const struct ebml_elem_desc ebml_projection_desc; +extern const struct ebml_elem_desc ebml_audio_desc; +extern const struct ebml_elem_desc ebml_content_encodings_desc; +extern const struct ebml_elem_desc ebml_content_encoding_desc; @@ -1182,5 +1226,5 @@ index 000000000..590c6bdcd + +#define MAX_EBML_SUBELEMENTS 23 -- -2.11.1 +2.14.1 |