Skip to content

Commit

Permalink
Merge pull request #640 from wader/matroska-update-spec
Browse files Browse the repository at this point in the history 
matroska: Update ebml specification
  • Loading branch information
@wader
wader authored Apr 13, 2023
2 parents a6fe711 + 2a2b64d commit ec2b967
Show file tree
Hide file tree
Showing 16 changed files with 52 additions and 54 deletions.
3 changes: 3 additions & 0 deletions format/matroska/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Generated code is based on ebml_matroska.xml from http://ietf-wg-cellar.github.io/matroska-specification/

It's licensed under the Creative Commons Attribution 4.0 International (CC BY 4.0). See http://ietf-wg-cellar.github.io/matroska-specification/LICENSE.html
63 changes: 29 additions & 34 deletions format/matroska/ebml_matroska/ebml_matroska.xml
View file

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions format/matroska/ebml_matroska/ebml_matroska_gen.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ var SegmentUUIDElement = &ebml.Binary{
ID: SegmentUUIDID,
ParentID: InfoID,
Name: "segment_uuid",
Definition: "A randomly generated unique ID to identify the Segment amongst many others (128 bits)",
Definition: "A randomly generated unique ID to identify the Segment amongst many others chosen",
},
}
var SegmentFilenameElement = &ebml.UTF8{
Expand All @@ -387,7 +387,7 @@ var PrevUUIDElement = &ebml.Binary{
ID: PrevUUIDID,
ParentID: InfoID,
Name: "prev_uuid",
Definition: "A unique ID to identify the previous Segment of a Linked Segment (128 bits)",
Definition: "An ID to identify the previous Segment of a Linked Segment",
},
}
var PrevFilenameElement = &ebml.UTF8{
Expand All @@ -403,7 +403,7 @@ var NextUUIDElement = &ebml.Binary{
ID: NextUUIDID,
ParentID: InfoID,
Name: "next_uuid",
Definition: "A unique ID to identify the next Segment of a Linked Segment (128 bits)",
Definition: "An ID to identify the next Segment of a Linked Segment",
},
}
var NextFilenameElement = &ebml.UTF8{
Expand All @@ -419,7 +419,7 @@ var SegmentFamilyElement = &ebml.Binary{
ID: SegmentFamilyID,
ParentID: InfoID,
Name: "segment_family",
Definition: "A randomly generated unique ID that all Segments of a Linked Segment **MUST** share (128 bits)",
Definition: "A unique ID that all Segments of a Linked Segment **MUST** share chosen",
},
}
var TimestampScaleElement = &ebml.Uinteger{
Expand Down Expand Up @@ -992,7 +992,7 @@ var MinCacheElement = &ebml.Uinteger{
ID: MinCacheID,
ParentID: TrackEntryID,
Name: "min_cache",
Definition: "The minimum number of frames a player **SHOULD** be able to cache during playback",
Definition: "The minimum number of frames a player should be able to cache during playback",
},
}
var MaxCacheElement = &ebml.Uinteger{
Expand Down Expand Up @@ -2643,7 +2643,7 @@ var ChapterSegmentUUIDElement = &ebml.Binary{
ID: ChapterSegmentUUIDID,
ParentID: ChapterAtomID,
Name: "chapter_segment_uuid",
Definition: "The SegmentUUID of another Segment to play during this chapter (128 bits)",
Definition: "The SegmentUUID of another Segment to play during this chapter",
},
}
var ChapterSkipTypeElement = &ebml.Uinteger{
Expand Down Expand Up @@ -2865,7 +2865,7 @@ var TargetTypeValueElement = &ebml.Uinteger{
50: {Name: "album_opera_concert_movie_episode", Description: "The most common grouping level of music and video"},
40: {Name: "part_session", Description: "When an album or episode has different logical parts"},
30: {Name: "track_song_chapter", Description: "The common parts of an album or movie"},
20: {Name: "subtrack_part_movement_scene", Description: "Corresponds to parts of a track for audio (like a movement)"},
20: {Name: "subtrack_movement_scene", Description: "Corresponds to parts of a track for audio like a movement"},
10: {Name: "shot", Description: "The lowest hierarchy found in music or movies"},
},
}
Expand Down
2 changes: 1 addition & 1 deletion format/matroska/testdata/aac.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ $ fq -d matroska dv aac.mkv
0x0f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x106.7 (13)
0x100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x119.7 (19)
0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others (128 bits)) 0x107-0x108.7 (2)
0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x108.7 (2)
| | | type: "binary" 0x109-NA (0)
0x100| 90 | . | size: 16 0x109-0x109.7 (1)
0x100| 17 bd f9 34 6e 97| ...4n.| value: raw bits 0x10a-0x119.7 (16)
Expand Down
2 changes: 1 addition & 1 deletion format/matroska/testdata/av1.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ $ fq -d matroska dv av1.mkv
0x00f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x106.7 (13)
0x0100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x119.7 (19)
0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others (128 bits)) 0x107-0x108.7 (2)
0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x108.7 (2)
| | | type: "binary" 0x109-NA (0)
0x0100| 90 | . | size: 16 0x109-0x109.7 (1)
0x0100| 46 bd 6f 31 1c 40| F.o1.@| value: raw bits 0x10a-0x119.7 (16)
Expand Down
2 changes: 1 addition & 1 deletion format/matroska/testdata/avc.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ $ fq -d matroska dv avc.mkv
0x000f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x106.7 (13)
0x00100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x119.7 (19)
0x00100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others (128 bits)) 0x107-0x108.7 (2)
0x00100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x108.7 (2)
| | | type: "binary" 0x109-NA (0)
0x00100| 90 | . | size: 16 0x109-0x109.7 (1)
0x00100| 7c 01 b0 2d a3 3f| |..-.?| value: raw bits 0x10a-0x119.7 (16)
Expand Down
2 changes: 1 addition & 1 deletion format/matroska/testdata/flac.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ $ fq -d matroska dv flac.mkv
0x0f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x106.7 (13)
0x100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x119.7 (19)
0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others (128 bits)) 0x107-0x108.7 (2)
0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x108.7 (2)
| | | type: "binary" 0x109-NA (0)
0x100| 90 | . | size: 16 0x109-0x109.7 (1)
0x100| 57 0f ef b3 6f 8c| W...o.| value: raw bits 0x10a-0x119.7 (16)
Expand Down
2 changes: 1 addition & 1 deletion format/matroska/testdata/hevc.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ $ fq -d matroska dv hevc.mkv
0x00f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x106.7 (13)
0x0100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x119.7 (19)
0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others (128 bits)) 0x107-0x108.7 (2)
0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x108.7 (2)
| | | type: "binary" 0x109-NA (0)
0x0100| 90 | . | size: 16 0x109-0x109.7 (1)
0x0100| 64 a4 6f b2 71 ea| d.o.q.| value: raw bits 0x10a-0x119.7 (16)
Expand Down
2 changes: 1 addition & 1 deletion format/matroska/testdata/mp3.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ $ fq -d matroska dv mp3.mkv
0x0f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x106.7 (13)
0x100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x119.7 (19)
0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others (128 bits)) 0x107-0x108.7 (2)
0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x108.7 (2)
| | | type: "binary" 0x109-NA (0)
0x100| 90 | . | size: 16 0x109-0x109.7 (1)
0x100| ed af 16 3e 3c c6| ...><.| value: raw bits 0x10a-0x119.7 (16)
Expand Down
2 changes: 1 addition & 1 deletion format/matroska/testdata/mpeg2.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ $ fq -d matroska dv mpeg2.mkv
0x00f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x106.7 (13)
0x0100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x119.7 (19)
0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others (128 bits)) 0x107-0x108.7 (2)
0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x108.7 (2)
| | | type: "binary" 0x109-NA (0)
0x0100| 90 | . | size: 16 0x109-0x109.7 (1)
0x0100| 97 68 53 5b 2a ea| .hS[*.| value: raw bits 0x10a-0x119.7 (16)
Expand Down
2 changes: 1 addition & 1 deletion format/matroska/testdata/opus.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ $ fq -d matroska dv opus.mkv
0x0f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x106.7 (13)
0x100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x119.7 (19)
0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others (128 bits)) 0x107-0x108.7 (2)
0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x108.7 (2)
| | | type: "binary" 0x109-NA (0)
0x100| 90 | . | size: 16 0x109-0x109.7 (1)
0x100| a0 33 a6 65 a7 8d| .3.e..| value: raw bits 0x10a-0x119.7 (16)
Expand Down
2 changes: 1 addition & 1 deletion format/matroska/testdata/sweep-with-DC.mkvmerge13.mka.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x10a0| 88 | . | size: 8 0x10a7-0x10a7.7 (1)
0x10a0| 09 7b f0 a0 97 43 d2 00| .{...C..| value: raw bits 0x10a8-0x10af.7 (8)
| | | [5]{}: element 0x10b0-0x10c2.7 (19)
0x10b0|73 a4 |s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others (128 bits)) 0x10b0-0x10b1.7 (2)
0x10b0|73 a4 |s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x10b0-0x10b1.7 (2)
| | | type: "binary" 0x10b2-NA (0)
0x10b0| 90 | . | size: 16 0x10b2-0x10b2.7 (1)
0x10b0| 3b 9f 28 c7 c4 90 8a e0 cd 66 8f 11 8f| ;.(......f...| value: raw bits 0x10b3-0x10c2.7 (16)
Expand Down
2 changes: 1 addition & 1 deletion format/matroska/testdata/unknown_size.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ $ fq -o decode_samples=false dv unknown_size.mkv
0x0f0| 4c 61 76 66 35 39| Lavf59| value: "Lavf59.27.100" 0xfa-0x106.7 (13)
0x100|2e 32 37 2e 31 30 30 |.27.100 |
| | | [4]{}: element 0x107-0x119.7 (19)
0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others (128 bits)) 0x107-0x108.7 (2)
0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x108.7 (2)
| | | type: "binary" 0x109-NA (0)
0x100| 90 | . | size: 16 0x109-0x109.7 (1)
0x100| 9c a2 35 00 05 c2| ..5...| value: raw bits 0x10a-0x119.7 (16)
Expand Down
2 changes: 1 addition & 1 deletion format/matroska/testdata/vorbis.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ $ fq -d matroska dv vorbis.mkv
0x00f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x106.7 (13)
0x0100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x119.7 (19)
0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others (128 bits)) 0x107-0x108.7 (2)
0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x108.7 (2)
| | | type: "binary" 0x109-NA (0)
0x0100| 90 | . | size: 16 0x109-0x109.7 (1)
0x0100| 55 86 bb 9d 18 21| U....!| value: raw bits 0x10a-0x119.7 (16)
Expand Down
2 changes: 1 addition & 1 deletion format/matroska/testdata/vp8.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ $ fq -d matroska dv vp8.mkv
0x00f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x106.7 (13)
0x0100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x119.7 (19)
0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others (128 bits)) 0x107-0x108.7 (2)
0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x108.7 (2)
| | | type: "binary" 0x109-NA (0)
0x0100| 90 | . | size: 16 0x109-0x109.7 (1)
0x0100| b6 f7 5d 8a 6f c3| ..].o.| value: raw bits 0x10a-0x119.7 (16)
Expand Down
2 changes: 1 addition & 1 deletion format/matroska/testdata/vp9.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ $ fq -d matroska dv vp9.mkv
0x00f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x106.7 (13)
0x0100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x119.7 (19)
0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others (128 bits)) 0x107-0x108.7 (2)
0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x108.7 (2)
| | | type: "binary" 0x109-NA (0)
0x0100| 90 | . | size: 16 0x109-0x109.7 (1)
0x0100| 79 44 d8 c6 65 1a| yD..e.| value: raw bits 0x10a-0x119.7 (16)
Expand Down

0 comments on commit ec2b967

Please sign in to comment.