diff options
| author | Ben Boeckel <mathstuf@gmail.com> | 2013-10-06 20:49:12 -0400 |
|---|---|---|
| committer | Ben Boeckel <mathstuf@gmail.com> | 2013-10-07 22:40:39 -0400 |
| commit | 07fbba3935e9d4327d3ae946b747486693d9d0f7 (patch) | |
| tree | 010116fd240cbe7e628ebb6c341b1d1ac3d83db6 /demux/demux.h | |
| parent | ccdaecfc5cc53b6c6ca3f46ca37ff74a36eb58dd (diff) | |
| download | mpv-07fbba3935e9d4327d3ae946b747486693d9d0f7.tar.bz2 mpv-07fbba3935e9d4327d3ae946b747486693d9d0f7.tar.xz | |
matroska: store segment/edition uids in a single structure
To support edition references in matroska chapters, editions need to be
remembered for each chapter and source. To facilitate easier management
of these now-paired uids, a single structure is used.
Diffstat (limited to 'demux/demux.h')
| -rw-r--r-- | demux/demux.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/demux/demux.h b/demux/demux.h index 1e0546a6d0..0c8f9cb3f8 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -128,14 +128,19 @@ typedef struct demux_chapter uint64_t demuxer_id; // for mapping to internal demuxer data structures } demux_chapter_t; +struct matroska_segment_uid { + unsigned char segment[16]; + uint64_t edition; +}; + struct matroska_data { - unsigned char segment_uid[16]; + struct matroska_segment_uid uid; // Ordered chapter information if any struct matroska_chapter { uint64_t start; uint64_t end; bool has_segment_uid; - unsigned char segment_uid[16]; + struct matroska_segment_uid uid; char *name; } *ordered_chapters; int num_ordered_chapters; @@ -151,7 +156,7 @@ typedef struct demux_attachment struct demuxer_params { int matroska_num_wanted_uids; - unsigned char (*matroska_wanted_uids)[16]; + struct matroska_segment_uid *matroska_wanted_uids; int matroska_wanted_segment; bool *matroska_was_valid; struct ass_library *ass_library; @@ -301,4 +306,7 @@ void mp_tags_set_bstr(struct mp_tags *tags, bstr key, bstr value); char *mp_tags_get_str(struct mp_tags *tags, const char *key); char *mp_tags_get_bstr(struct mp_tags *tags, bstr key); +bool demux_matroska_uid_cmp(struct matroska_segment_uid *a, + struct matroska_segment_uid *b); + #endif /* MPLAYER_DEMUXER_H */ |