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 | 88 |
1 files changed, 65 insertions, 23 deletions
diff --git a/pkg/mpv/patch/0001-Add-generated-ebml-sources.patch b/pkg/mpv/patch/0001-Add-generated-ebml-sources.patch index 30c8c601..1b5a0bb8 100644 --- a/pkg/mpv/patch/0001-Add-generated-ebml-sources.patch +++ b/pkg/mpv/patch/0001-Add-generated-ebml-sources.patch @@ -1,25 +1,25 @@ -From d17ae31bdd9b5fb7f3a12cca8561e6b6d3947d5d Mon Sep 17 00:00:00 2001 +From 500b8f9510babd4e5d2d9cd35af689617946a1d9 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> -Date: Sat, 2 Jul 2016 17:32:27 -0700 +Date: Wed, 14 Aug 2024 20:07:19 -0700 Subject: [PATCH] Add generated ebml sources These require python to generate. -$ python TOOLS/matroska.py --generate-header > generated/ebml_types.h -$ python TOOLS/matroska.py --generate-definitions > generated/ebml_defs.inc +$ python TOOLS/matroska.py --generate-header ebml_types.h +$ python TOOLS/matroska.py --generate-definitions ebml_defs.inc --- - generated/ebml_defs.inc | 574 ++++++++++++++++++++++++++++++++++++ - generated/ebml_types.h | 637 ++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 1211 insertions(+) - create mode 100644 generated/ebml_defs.inc - create mode 100644 generated/ebml_types.h + ebml_defs.inc | 595 +++++++++++++++++++++++++++++++++++++++++++++ + ebml_types.h | 658 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 1253 insertions(+) + create mode 100644 ebml_defs.inc + create mode 100644 ebml_types.h -diff --git a/generated/ebml_defs.inc b/generated/ebml_defs.inc +diff --git a/ebml_defs.inc b/ebml_defs.inc new file mode 100644 -index 0000000000..db4eb9c2a7 +index 0000000000..da65194639 --- /dev/null -+++ b/generated/ebml_defs.inc -@@ -0,0 +1,574 @@ ++++ b/ebml_defs.inc +@@ -0,0 +1,595 @@ +// Generated by TOOLS/matroska.py, do not edit manually + + @@ -27,14 +27,17 @@ index 0000000000..db4eb9c2a7 + +E("TagString", tag_string, EBML_TYPE_STR) + ++E("TagLanguageBCP47", tag_language_bcp47, EBML_TYPE_STR) ++ +E("TagLanguage", tag_language, EBML_TYPE_STR) + +E("TagName", tag_name, EBML_TYPE_STR) + +#define N simple_tag -+E_S("SimpleTag", 4) ++E_S("SimpleTag", 5) +F(MATROSKA_ID_TAGNAME, tag_name, 0) +F(MATROSKA_ID_TAGLANGUAGE, tag_language, 0) ++F(MATROSKA_ID_TAGLANGUAGEBCP47, tag_language_bcp47, 0) +F(MATROSKA_ID_TAGSTRING, tag_string, 0) +F(MATROSKA_ID_TAGDEFAULT, tag_default, 0) +}}; @@ -78,14 +81,17 @@ index 0000000000..db4eb9c2a7 + +E("ChapCountry", chap_country, EBML_TYPE_STR) + ++E("ChapLanguageBCP47", chap_language_bcp47, EBML_TYPE_STR) ++ +E("ChapLanguage", chap_language, EBML_TYPE_STR) + +E("ChapString", chap_string, EBML_TYPE_STR) + +#define N chapter_display -+E_S("ChapterDisplay", 3) ++E_S("ChapterDisplay", 4) +F(MATROSKA_ID_CHAPSTRING, chap_string, 0) +F(MATROSKA_ID_CHAPLANGUAGE, chap_language, 1) ++F(MATROSKA_ID_CHAPLANGUAGEBCP47, chap_language_bcp47, 1) +F(MATROSKA_ID_CHAPCOUNTRY, chap_country, 1) +}}; +#undef N @@ -354,6 +360,14 @@ index 0000000000..db4eb9c2a7 + +E("FrameRate", frame_rate, EBML_TYPE_FLOAT) + ++E("PixelCropBottom", pixel_crop_bottom, EBML_TYPE_UINT) ++ ++E("PixelCropRight", pixel_crop_right, EBML_TYPE_UINT) ++ ++E("PixelCropLeft", pixel_crop_left, EBML_TYPE_UINT) ++ ++E("PixelCropTop", pixel_crop_top, EBML_TYPE_UINT) ++ +E("DisplayUnit", display_unit, EBML_TYPE_UINT) + +E("DisplayHeight", display_height, EBML_TYPE_UINT) @@ -367,13 +381,17 @@ index 0000000000..db4eb9c2a7 +E("FlagInterlaced", flag_interlaced, EBML_TYPE_UINT) + +#define N video -+E_S("Video", 11) ++E_S("Video", 15) +F(MATROSKA_ID_FLAGINTERLACED, flag_interlaced, 0) +F(MATROSKA_ID_PIXELWIDTH, pixel_width, 0) +F(MATROSKA_ID_PIXELHEIGHT, pixel_height, 0) +F(MATROSKA_ID_DISPLAYWIDTH, display_width, 0) +F(MATROSKA_ID_DISPLAYHEIGHT, display_height, 0) +F(MATROSKA_ID_DISPLAYUNIT, display_unit, 0) ++F(MATROSKA_ID_PIXELCROPTOP, pixel_crop_top, 0) ++F(MATROSKA_ID_PIXELCROPLEFT, pixel_crop_left, 0) ++F(MATROSKA_ID_PIXELCROPRIGHT, pixel_crop_right, 0) ++F(MATROSKA_ID_PIXELCROPBOTTOM, pixel_crop_bottom, 0) +F(MATROSKA_ID_FRAMERATE, frame_rate, 0) +F(MATROSKA_ID_COLOURSPACE, colour_space, 0) +F(MATROSKA_ID_STEREOMODE, stereo_mode, 0) @@ -394,6 +412,8 @@ index 0000000000..db4eb9c2a7 + +E("CodecID", codec_id, EBML_TYPE_STR) + ++E("LanguageBCP47", language_bcp47, EBML_TYPE_STR) ++ +E("Language", language, EBML_TYPE_STR) + +E("Name", name, EBML_TYPE_STR) @@ -423,7 +443,7 @@ index 0000000000..db4eb9c2a7 +E("TrackNumber", track_number, EBML_TYPE_UINT) + +#define N track_entry -+E_S("TrackEntry", 23) ++E_S("TrackEntry", 24) +F(MATROSKA_ID_TRACKNUMBER, track_number, 0) +F(MATROSKA_ID_TRACKUID, track_uid, 0) +F(MATROSKA_ID_TRACKTYPE, track_type, 0) @@ -438,6 +458,7 @@ index 0000000000..db4eb9c2a7 +F(MATROSKA_ID_MAXBLOCKADDITIONID, max_block_addition_id, 0) +F(MATROSKA_ID_NAME, name, 0) +F(MATROSKA_ID_LANGUAGE, language, 0) ++F(MATROSKA_ID_LANGUAGEBCP47, language_bcp47, 0) +F(MATROSKA_ID_CODECID, codec_id, 0) +F(MATROSKA_ID_CODECPRIVATE, codec_private, 0) +F(MATROSKA_ID_CODECNAME, codec_name, 0) @@ -594,12 +615,12 @@ index 0000000000..db4eb9c2a7 +F(EBML_ID_DOCTYPEREADVERSION, doc_type_read_version, 0) +}}; +#undef N -diff --git a/generated/ebml_types.h b/generated/ebml_types.h +diff --git a/ebml_types.h b/ebml_types.h new file mode 100644 -index 0000000000..d32af2d6c1 +index 0000000000..d544694d48 --- /dev/null -+++ b/generated/ebml_types.h -@@ -0,0 +1,637 @@ ++++ b/ebml_types.h +@@ -0,0 +1,658 @@ +// Generated by TOOLS/matroska.py, do not edit manually + +#define EBML_ID_EBML 0x1a45dfa3 @@ -655,6 +676,7 @@ index 0000000000..d32af2d6c1 +#define MATROSKA_ID_MAXBLOCKADDITIONID 0x55ee +#define MATROSKA_ID_NAME 0x536e +#define MATROSKA_ID_LANGUAGE 0x22b59c ++#define MATROSKA_ID_LANGUAGEBCP47 0x22b59d +#define MATROSKA_ID_CODECID 0x86 +#define MATROSKA_ID_CODECPRIVATE 0x63a2 +#define MATROSKA_ID_CODECNAME 0x258688 @@ -668,6 +690,10 @@ index 0000000000..d32af2d6c1 +#define MATROSKA_ID_DISPLAYWIDTH 0x54b0 +#define MATROSKA_ID_DISPLAYHEIGHT 0x54ba +#define MATROSKA_ID_DISPLAYUNIT 0x54b2 ++#define MATROSKA_ID_PIXELCROPTOP 0x54bb ++#define MATROSKA_ID_PIXELCROPLEFT 0x54cc ++#define MATROSKA_ID_PIXELCROPRIGHT 0x54dd ++#define MATROSKA_ID_PIXELCROPBOTTOM 0x54aa +#define MATROSKA_ID_FRAMERATE 0x2383e3 +#define MATROSKA_ID_COLOURSPACE 0x2eb524 +#define MATROSKA_ID_STEREOMODE 0x53b8 @@ -747,6 +773,7 @@ index 0000000000..d32af2d6c1 +#define MATROSKA_ID_CHAPTERDISPLAY 0x80 +#define MATROSKA_ID_CHAPSTRING 0x85 +#define MATROSKA_ID_CHAPLANGUAGE 0x437c ++#define MATROSKA_ID_CHAPLANGUAGEBCP47 0x437d +#define MATROSKA_ID_CHAPCOUNTRY 0x437e +#define MATROSKA_ID_TAGS 0x1254c367 +#define MATROSKA_ID_TAG 0x7373 @@ -760,6 +787,7 @@ index 0000000000..d32af2d6c1 +#define MATROSKA_ID_SIMPLETAG 0x67c8 +#define MATROSKA_ID_TAGNAME 0x45a3 +#define MATROSKA_ID_TAGLANGUAGE 0x447a ++#define MATROSKA_ID_TAGLANGUAGEBCP47 0x447b +#define MATROSKA_ID_TAGSTRING 0x4487 +#define MATROSKA_ID_TAGDEFAULT 0x4484 + @@ -767,11 +795,13 @@ index 0000000000..d32af2d6c1 +struct ebml_simple_tag { + char * tag_name; + char * tag_language; ++ char * tag_language_bcp47; + char * tag_string; + uint64_t tag_default; + + int n_tag_name; + int n_tag_language; ++ int n_tag_language_bcp47; + int n_tag_string; + int n_tag_default; +}; @@ -809,10 +839,12 @@ index 0000000000..d32af2d6c1 +struct ebml_chapter_display { + char * chap_string; + char * *chap_language; ++ char * *chap_language_bcp47; + char * *chap_country; + + int n_chap_string; + int n_chap_language; ++ int n_chap_language_bcp47; + int n_chap_country; +}; + @@ -1017,6 +1049,10 @@ index 0000000000..d32af2d6c1 + uint64_t display_width; + uint64_t display_height; + uint64_t display_unit; ++ uint64_t pixel_crop_top; ++ uint64_t pixel_crop_left; ++ uint64_t pixel_crop_right; ++ uint64_t pixel_crop_bottom; + double frame_rate; + bstr colour_space; + uint64_t stereo_mode; @@ -1029,6 +1065,10 @@ index 0000000000..d32af2d6c1 + int n_display_width; + int n_display_height; + int n_display_unit; ++ int n_pixel_crop_top; ++ int n_pixel_crop_left; ++ int n_pixel_crop_right; ++ int n_pixel_crop_bottom; + int n_frame_rate; + int n_colour_space; + int n_stereo_mode; @@ -1051,6 +1091,7 @@ index 0000000000..d32af2d6c1 + uint64_t max_block_addition_id; + char * name; + char * language; ++ char * language_bcp47; + char * codec_id; + bstr codec_private; + char * codec_name; @@ -1075,6 +1116,7 @@ index 0000000000..d32af2d6c1 + int n_max_block_addition_id; + int n_name; + int n_language; ++ int n_language_bcp47; + int n_codec_id; + int n_codec_private; + int n_codec_name; @@ -1236,7 +1278,7 @@ index 0000000000..d32af2d6c1 +extern const struct ebml_elem_desc ebml_targets_desc; +extern const struct ebml_elem_desc ebml_simple_tag_desc; + -+#define MAX_EBML_SUBELEMENTS 23 ++#define MAX_EBML_SUBELEMENTS 24 -- -2.37.3 +2.44.0 |