diff --git a/format/matroska/ebml/gen/main.go b/format/matroska/ebml/gen/main.go
index 862655f03..a5fe95a0f 100644
--- a/format/matroska/ebml/gen/main.go
+++ b/format/matroska/ebml/gen/main.go
@@ -248,10 +248,10 @@ func main() {
switch c.Type {
case "integer":
- n, _ := strconv.ParseInt(e.Value, 10, 64)
+ n, _ := strconv.ParseInt(e.Value, 0, 64)
fmt.Printf(" %d:{", n)
case "uinteger":
- n, _ := strconv.ParseUint(e.Value, 10, 64)
+ n, _ := strconv.ParseUint(e.Value, 0, 64)
fmt.Printf(" %d:{", n)
case "string":
fmt.Printf(" %q:{", e.Value)
diff --git a/format/matroska/ebml_matroska/ebml_matroska.xml b/format/matroska/ebml_matroska/ebml_matroska.xml
index d98d67729..0eef46dfe 100644
--- a/format/matroska/ebml_matroska/ebml_matroska.xml
+++ b/format/matroska/ebml_matroska/ebml_matroska.xml
@@ -4,10 +4,11 @@
- The Root Element that contains all other Top-Level Elements; see (#data-layout).
+ The `Root Element` that contains all other `Top-Level Elements`; see (#data-layout).
+
- Contains seeking information of Top-Level Elements; see (#data-layout).
+ Contains seeking information of `Top-Level Elements`; see (#data-layout).
@@ -15,94 +16,88 @@
- The binary EBML ID of a Top-Level Element.
+ The binary EBML ID of a `Top-Level Element`.
- The Segment Position ((#segment-position)) of a Top-Level Element.
+ The `Segment Position` ((#segment-position)) of a `Top-Level Element`.
- Contains general information about the Segment.
+ Contains general information about the `Segment`.
- A randomly generated unique ID to identify the Segment amongst many others (128 bits). It is equivalent to a UUID v4 [@!RFC4122] with all bits randomly (or pseudo-randomly) chosen. An actual UUID v4 value, where some bits are not random, **MAY** also be used.
- If the Segment is a part of a Linked Segment, then this Element is **REQUIRED**.
-The value of the unique ID **MUST** contain at least one bit set to 1.
+ A randomly generated UID that identifies the `Segment` amongst many others (128 bits). It is equivalent to a Universally Unique Identifier (UUID) v4 [@!RFC4122] with all bits randomly (or pseudorandomly) chosen. An actual UUID v4 value, where some bits are not random, **MAY** also be used.
+ If the `Segment` is a part of a `Linked Segment`, then this element is **REQUIRED**.
+The value of the UID **MUST** contain at least one bit set to 1.
- A filename corresponding to this Segment.
+ A filename corresponding to this `Segment`.
- An ID to identify the previous Segment of a Linked Segment.
- If the Segment is a part of a Linked Segment that uses Hard Linking ((#hard-linking)),
-then either the PrevUUID or the NextUUID Element is **REQUIRED**. If a Segment contains a PrevUUID but not a NextUUID,
-then it **MAY** be considered as the last Segment of the Linked Segment. The PrevUUID **MUST NOT** be equal to the SegmentUUID.
+ An ID that identifies the previous `Segment` of a `Linked Segment`.
+ If the `Segment` is a part of a `Linked Segment` that uses
+Hard Linking ((#hard-linking)),
+then either the `PrevUUID` or the `NextUUID` element is **REQUIRED**. If a `Segment` contains a `PrevUUID` but not a `NextUUID`,
+then it **MAY** be considered as the last `Segment` of the `Linked Segment`. The `PrevUUID` **MUST NOT** be equal to the `SegmentUUID`.
- A filename corresponding to the file of the previous Linked Segment.
+ A filename corresponding to the file of the previous `Linked Segment`.
Provision of the previous filename is for display convenience,
-but PrevUUID **SHOULD** be considered authoritative for identifying the previous Segment in a Linked Segment.
+but `PrevUUID` **SHOULD** be considered authoritative for identifying the previous `Segment` in a `Linked Segment`.
- An ID to identify the next Segment of a Linked Segment.
- If the Segment is a part of a Linked Segment that uses Hard Linking ((#hard-linking)),
-then either the PrevUUID or the NextUUID Element is **REQUIRED**. If a Segment contains a NextUUID but not a PrevUUID,
-then it **MAY** be considered as the first Segment of the Linked Segment. The NextUUID **MUST NOT** be equal to the SegmentUUID.
+ An ID that identifies the next `Segment` of a `Linked Segment`.
+ If the `Segment` is a part of a `Linked Segment` that uses Hard Linking ((#hard-linking)),
+then either the `PrevUUID` or the `NextUUID` element is **REQUIRED**. If a `Segment` contains a `NextUUID` but not a `PrevUUID`,
+then it **MAY** be considered as the first `Segment` of the `Linked Segment`. The `NextUUID` **MUST NOT** be equal to the `SegmentUUID`.
- A filename corresponding to the file of the next Linked Segment.
+ A filename corresponding to the file of the next `Linked Segment`.
Provision of the next filename is for display convenience,
-but NextUUID **SHOULD** be considered authoritative for identifying the Next Segment.
+but `NextUUID` **SHOULD** be considered authoritative for identifying the Next `Segment`.
- A unique ID that all Segments of a Linked Segment **MUST** share (128 bits). It is equivalent to a UUID v4 [@!RFC4122] with all bits randomly (or pseudo-randomly) chosen. An actual UUID v4 value, where some bits are not random, **MAY** also be used.
- If the Segment Info contains a `ChapterTranslate` element, this Element is **REQUIRED**.
+ A UID that all `Segments` of a `Linked Segment` **MUST** share (128 bits). It is equivalent to a UUID v4 [@!RFC4122] with all bits randomly (or pseudorandomly) chosen. An actual UUID v4 value, where some bits are not random, **MAY** also be used.
+ If the `Segment` `Info` contains a `ChapterTranslate` element, this element is **REQUIRED**.
The mapping between this `Segment` and a segment value in the given Chapter Codec.
- Chapter Codec may need to address different segments, but they may not know of the way to identify such segment when stored in Matroska.
-This element and its child elements add a way to map the internal segments known to the Chapter Codec to the Segment IDs in Matroska.
-This allows remuxing a file with Chapter Codec without changing the content of the codec data, just the Segment mapping.
+ Chapter Codecs may need to address different segments, but they may not know of the way to identify such segments when stored in Matroska.
+This element and its child elements add a way to map the internal segments known to the Chapter Codec to the `SegmentUUID`s in Matroska.
+This allows remuxing a file with Chapter Codec without changing the content of the codec data, just the `Segment` mapping.
- The binary value used to represent this Segment in the chapter codec data.
-The format depends on the ChapProcessCodecID used; see (#chapprocesscodecid-element).
+ The binary value used to represent this `Segment` in the chapter codec data.
+The format depends on the `ChapProcessCodecID` used; see (#chapprocesscodecid-element).
- This `ChapterTranslate` applies to this chapter codec of the given chapter edition(s); see (#chapprocesscodecid-element).
-
-
- Chapter commands using the Matroska Script codec.
-
-
- Chapter commands using the DVD-like codec.
-
-
+ Applies to the chapter codec of the given chapter edition(s); see (#chapprocesscodecid-element).
+
- Specify a chapter edition UID on which this `ChapterTranslate` applies.
- When no `ChapterTranslateEditionUID` is specified in the `ChapterTranslate`, the `ChapterTranslate` applies to all chapter editions found in the Segment using the given `ChapterTranslateCodec`.
+ Specifies a chapter edition UID to which this `ChapterTranslate` applies.
+ When no `ChapterTranslateEditionUID` is specified in the `ChapterTranslate`, the `ChapterTranslate` applies to all chapter editions found in the `Segment` using the given `ChapterTranslateCodec`.
- Base unit for Segment Ticks and Track Ticks, in nanoseconds. A TimestampScale value of 1000000 means scaled timestamps in the Segment are expressed in milliseconds; see (#timestamps) on how to interpret timestamps.
+ Base unit for Segment Ticks and Track Ticks, in nanoseconds. A `TimestampScale` value of 1000000 means scaled timestamps in the `Segment` are expressed in milliseconds; see (#timestamps) on how to interpret timestamps.
- Duration of the Segment, expressed in Segment Ticks which is based on TimestampScale; see (#timestamp-ticks).
+ Duration of the `Segment`, expressed in `Segment` Ticks, which are based on `TimestampScale`; see (#timestamp-ticks).
- The date and time that the Segment was created by the muxing application or library.
+ The date and time that the `Segment` was created by the muxing application or library.
- General name of the Segment.
+ General name of the `Segment`.
@@ -116,177 +111,180 @@ The format depends on the ChapProcessCodecID used; see (#chapprocesscodecid-elem
- The Top-Level Element containing the (monolithic) Block structure.
+ The `Top-Level Element` containing the (monolithic) `Block` structure.
- Absolute timestamp of the cluster, expressed in Segment Ticks which is based on TimestampScale; see (#timestamp-ticks).
- This element **SHOULD** be the first child element of the Cluster it belongs to,
-or the second if that Cluster contains a CRC-32 element ((#crc-32)).
+ Absolute timestamp of the cluster, expressed in Segment Ticks, which are based on `TimestampScale`; see (#timestamp-ticks).
+ This element **SHOULD** be the first child element of the `Cluster` it belongs to
+or the second if that `Cluster` contains a `CRC-32` element ((#crc-32)).
The list of tracks that are not used in that part of the stream.
-It is useful when using overlay tracks on seeking or to decide what track to use.
+It is useful when using overlay tracks for seeking or deciding what track to use.
- One of the track number that are not used from now on in the stream.
-It could change later if not specified as silent in a further Cluster.
+ One of the track numbers that is not used from now on in the stream.
+It could change later if not specified as silent in a further `Cluster`.
- The Segment Position of the Cluster in the Segment (0 in live streams).
-It might help to resynchronise offset on damaged streams.
+ The `Segment Position` of the `Cluster` in the `Segment` (0 in live streams).
+It might help to resynchronize the offset on damaged streams.
+
- Size of the previous Cluster, in octets. Can be useful for backward playing.
+ Size of the previous `Cluster`, in octets. Can be useful for backward playing.
- Similar to Block, see (#block-structure), but without all the extra information,
-mostly used to reduced overhead when no extra feature is needed; see (#simpleblock-structure) on SimpleBlock Structure.
+ Similar to `Block` (see (#block-structure)) but without all the extra information.
+Mostly used to reduce overhead when no extra feature is needed; see (#simpleblock-structure) on `SimpleBlock` Structure.
- Basic container of information containing a single Block and information specific to that Block.
+ Basic container of information containing a single `Block` and information specific to that `Block`.
- Block containing the actual data to be rendered and a timestamp relative to the Cluster Timestamp;
-see (#block-structure) on Block Structure.
+ `Block` containing the actual data to be rendered and a timestamp relative to the `Cluster` Timestamp;
+see (#block-structure) on `Block` Structure.
- A Block with no data. It must be stored in the stream at the place the real Block would be in display order.
+ A `Block` with no data. It must be stored in the stream at the place the real `Block` would be in display order.
- Contain additional binary data to complete the main one; see Codec BlockAdditions section of [@?MatroskaCodec] for more information.
-An EBML parser that has no knowledge of the Block structure could still see and use/skip these data.
+ Contains additional binary data to complete the `Block` element; see [@?I-D.ietf-cellar-codec, section 4.1.5] for more information.
+An EBML parser that has no knowledge of the `Block` structure could still see and use/skip these data.
- Contain the BlockAdditional and some parameters.
+ Contains the `BlockAdditional` and some parameters.
- Interpreted by the codec as it wishes (using the BlockAddID).
+ Interpreted by the codec as it wishes (using the `BlockAddID`).
- An ID to identify how to interpret the BlockAdditional data; see Codec BlockAdditions section of [@?MatroskaCodec] for more information.
-A value of 1 indicates that the meaning of the BlockAdditional data is defined by the codec.
-Any other value indicates the meaning of the BlockAdditional data is found in the BlockAddIDType found in the TrackEntry.
- Each BlockAddID value **MUST** be unique between all BlockMore elements found in a BlockAdditions.
- To keep MaxBlockAdditionID as low as possible, small values **SHOULD** be used.
+ An ID that identifies how to interpret the `BlockAdditional` data; see [@?I-D.ietf-cellar-codec, section 4.1.5] for more information.
+A value of 1 indicates that the `BlockAdditional` data is defined by the codec.
+Any other value indicates that the `BlockAdditional` data should be handled according to the `BlockAddIDType` that is located in the
+`TrackEntry`.
+ Each `BlockAddID` value **MUST** be unique between all `BlockMore` elements found in a `BlockAdditions` element. To keep `MaxBlockAdditionID` as low as possible, small values **SHOULD** be used.
- The duration of the Block, expressed in Track Ticks; see (#timestamp-ticks).
-The BlockDuration Element can be useful at the end of a Track to define the duration of the last frame (as there is no subsequent Block available),
+ The duration of the `Block`, expressed in Track Ticks; see (#timestamp-ticks).
+The `BlockDuration` element can be useful at the end of a `Track` to define the duration of the last frame (as there is no subsequent `Block` available)
or when there is a break in a track like for subtitle tracks.
- BlockDuration **MUST** be set (minOccurs=1) if the associated TrackEntry stores a DefaultDuration value.
- When not written and with no DefaultDuration, the value is assumed to be the difference between the timestamp of this Block and the timestamp of the next Block in "display" order (not coding order).
+ `BlockDuration` **MUST** be set (minOccurs=1) if the associated `TrackEntry` stores a `DefaultDuration` value.
+ If a value is not present and no `DefaultDuration` is defined, the value is assumed to be the difference between the timestamp of this `Block` and the timestamp of the next `Block` in "display" order (not coding order).
This frame is referenced and has the specified cache priority.
-In cache only a frame of the same or higher priority can replace this frame. A value of 0 means the frame is not referenced.
+In the cache, only a frame of the same or higher priority can replace this frame. A value of 0 means the frame is not referenced.
- A timestamp value, relative to the timestamp of the Block in this BlockGroup, expressed in Track Ticks; see (#timestamp-ticks).
+ A timestamp value, relative to the timestamp of the `Block` in this `BlockGroup`, expressed in Track Ticks; see (#timestamp-ticks).
This is used to reference other frames necessary to decode this frame.
-The relative value **SHOULD** correspond to a valid `Block` this `Block` depends on.
-Historically Matroska Writer didn't write the actual `Block(s)` this `Block` depends on, but *some* `Block` in the past.
+The relative value **SHOULD** correspond to a valid `Block` that this `Block` depends on.
+Historically, `Matroska Writers` didn't write the actual `Block(s)` that this `Block` depends on, but they did write *some* `Block(s)` in the past.
-The value "0" **MAY** also be used to signify this `Block` cannot be decoded on its own, but without knownledge of which `Block` is necessary. In this case, other `ReferenceBlock` **MUST NOT** be found in the same `BlockGroup`.
+The value "0" **MAY** also be used to signify that this `Block` cannot be decoded on its own, but the necessary reference `Block(s)` is unknown. In this case, other `ReferenceBlock` elements **MUST NOT** be found in the same `BlockGroup`.
-If the `BlockGroup` doesn't have any `ReferenceBlock` element, then the `Block` it contains can be decoded without using any other `Block` data.
+If the `BlockGroup` doesn't have a `ReferenceBlock` element, then the `Block` it contains can be decoded without using any other `Block` data.
- The Segment Position of the data that would otherwise be in position of the virtual block.
+ The `Segment Position` of the data that would otherwise be in position of the virtual block.
The new codec state to use. Data interpretation is private to the codec.
This information **SHOULD** always be referenced by a seek entry.
- Duration of the silent data added to the Block, expressed in Matroska Ticks -- i.e., in nanoseconds; see (#timestamp-ticks)
-(padding at the end of the Block for positive value, at the beginning of the Block for negative value).
-The duration of DiscardPadding is not calculated in the duration of the TrackEntry and **SHOULD** be discarded during playback.
+ Duration of the silent data added to the `Block`, expressed in Matroska Ticks -- i.e., in nanoseconds; see (#timestamp-ticks)
+(padding at the end of the `Block` for positive values and at the beginning of the `Block` for negative values).
+The duration of `DiscardPadding` is not calculated in the duration of the `TrackEntry` and **SHOULD** be discarded during playback.
Contains slices description.
- Contains extra time information about the data contained in the Block.
-Being able to interpret this Element is not required for playback.
+ Contains extra time information about the data contained in the `Block`.
+Being able to interpret this element is not required for playback.
The reverse number of the frame in the lace (0 is the last frame, 1 is the next to last, etc.).
-Being able to interpret this Element is not required for playback.
+Being able to interpret this element is not required for playback.
The number of the frame to generate from this lace with this delay
-(allow you to generate many frames from the same Block/Frame).
+(allows for the generation of many frames from the same Block/Frame).
- The ID of the BlockAdditional Element (0 is the main Block).
+ The ID of the `BlockAdditional` element (0 is the main `Block`).
- The delay to apply to the Element, expressed in Track Ticks; see (#timestamp-ticks).
+ The delay to apply to the element, expressed in Track Ticks; see (#timestamp-ticks).
- The duration to apply to the Element, expressed in Track Ticks; see (#timestamp-ticks).
+ The duration to apply to the element, expressed in Track Ticks; see (#timestamp-ticks).
Contains information about the last reference frame. See [@?DivXTrickTrack].
- The relative offset, in bytes, from the previous BlockGroup element for this Smooth FF/RW video track to the containing BlockGroup element. See [@?DivXTrickTrack].
+ The relative offset, in bytes, from the previous `BlockGroup` element for this Smooth FF/RW video track to the containing `BlockGroup`
+element. See [@?DivXTrickTrack].
- The timestamp of the BlockGroup pointed to by ReferenceOffset, expressed in Track Ticks; see (#timestamp-ticks). See [@?DivXTrickTrack].
+ The timestamp of the `BlockGroup` pointed to by ReferenceOffset, expressed in Track Ticks; see (#timestamp-ticks). See [@?DivXTrickTrack].
- Similar to SimpleBlock, see (#simpleblock-structure),
-but the data inside the Block are Transformed (encrypt and/or signed).
+ Similar to `SimpleBlock` (see (#simpleblock-structure)),
+but the data inside the `Block` are Transformed (encrypted and/or signed).
- A Top-Level Element of information with many tracks described.
+ A `Top-Level Element` of information with many tracks described.
- Describes a track with all Elements.
+ Describes a track with all elements.
- The track number as used in the Block Header.
+ The track number as used in the `Block` Header.
- A unique ID to identify the Track.
+ A UID that identifies the `Track`.
-
- The `TrackType` defines the type of each frame found in the Track.
+
+ The `TrackType` defines the type of each frame found in the `Track`.
The value **SHOULD** be stored on 1 octet.
+
An image.
@@ -295,7 +293,7 @@ The value **SHOULD** be stored on 1 octet.
Audio samples.
- A mix of different other TrackType. The codec needs to define how the `Matroska Player` should interpret such data.
+ A mix of different other `TrackType`. The codec needs to define how the `Matroska Player` should interpret such data.
An image to be rendered over the video track(s).
@@ -317,40 +315,40 @@ The value **SHOULD** be stored on 1 octet.
- Set to 1 if the track is usable. It is possible to turn a not usable track into a usable track using chapter codecs or control tracks.
+ Set to 1 if the track is usable. It is possible to turn a track that is not usable into a usable track using chapter codecs or control tracks.
- Set if that track (audio, video or subs) is eligible for automatic selection by the player; see (#default-track-selection) for more details.
+ Set to 1 if the track (audio, video, or subtitles) is eligible for automatic selection by the player; see (#default-track-selection) for more details.
- Applies only to subtitles. Set if that track is eligible for automatic selection by the player if it matches the user's language preference,
-even if the user's preferences would normally not enable subtitles with the selected audio track;
-this can be used for tracks containing only translations of foreign-language audio or onscreen text.
+ Applies only to subtitles. Set to 1 if the track is eligible for automatic selection by the player if it matches the user's language preference,
+even if the user's preferences would not normally enable subtitles with the selected audio track;
+this can be used for tracks containing only translations of audio in foreign languages or on-screen text.
See (#default-track-selection) for more details.
- Set to 1 if and only if that track is suitable for users with hearing impairments.
+ Set to 1 if and only if the track is suitable for users with hearing impairments.
- Set to 1 if and only if that track is suitable for users with visual impairments.
+ Set to 1 if and only if the track is suitable for users with visual impairments.
- Set to 1 if and only if that track contains textual descriptions of video content.
+ Set to 1 if and only if the track contains textual descriptions of video content.
- Set to 1 if and only if that track is in the content's original language.
+ Set to 1 if and only if the track is in the content's original language.
- Set to 1 if and only if that track contains commentary.
+ Set to 1 if and only if the track contains commentary.
- Set to 1 if the track **MAY** contain blocks using lacing. When set to 0 all blocks **MUST** have their lacing flags set to No lacing; see (#block-lacing) on Block Lacing.
+ Set to 1 if the track **MAY** contain blocks that use lacing. When set to 0, all blocks **MUST** have their lacing flags set to "no lacing"; see (#block-lacing) on 'Block' Lacing.
@@ -366,14 +364,14 @@ If set to 0, the reference pseudo-cache system is not used.
Number of nanoseconds per frame, expressed in Matroska Ticks -- i.e., in nanoseconds; see (#timestamp-ticks)
-(frame in the Matroska sense -- one Element put into a (Simple)Block).
+("frame" in the Matroska sense -- one element put into a (Simple)Block).
The period between two successive fields at the output of the decoding process, expressed in Matroska Ticks -- i.e., in nanoseconds; see (#timestamp-ticks).
-see (#defaultdecodedfieldduration) for more information
+See (#defaultdecodedfieldduration) for more information.
@@ -384,36 +382,36 @@ see (#defaultdecodedfieldduration) for more information
- A value to add to the Block's Timestamp, expressed in Matroska Ticks -- i.e., in nanoseconds; see (#timestamp-ticks).
+ A value to add to the `Block`'s Timestamp, expressed in Matroska Ticks -- i.e., in nanoseconds; see (#timestamp-ticks).
This can be used to adjust the playback offset of a track.
- The maximum value of BlockAddID ((#blockaddid-element)).
-A value 0 means there is no BlockAdditions ((#blockadditions-element)) for this track.
+ The maximum value of `BlockAddID` ((#blockaddid-element)).
+A value of 0 means there is no `BlockAdditions` ((#blockadditions-element)) for this track.
- Contains elements that extend the track format, by adding content either to each frame,
-with BlockAddID ((#blockaddid-element)), or to the track as a whole
-with BlockAddIDExtraData.
+ Contains elements that extend the track format by adding content either to each frame,
+with `BlockAddID` ((#blockaddid-element)), or to the track as a whole
+with `BlockAddIDExtraData`.
If the track format extension needs content beside frames,
-the value refers to the BlockAddID ((#blockaddid-element)), value being described.
- To keep MaxBlockAdditionID as low as possible, small values **SHOULD** be used.
+the value refers to the `BlockAddID` ((#blockaddid-element)) value being described.
+ To keep `MaxBlockAdditionID` as low as possible, small values **SHOULD** be used.
- A human-friendly name describing the type of BlockAdditional data,
-as defined by the associated Block Additional Mapping.
+ A human-friendly name describing the type of `BlockAdditional` data,
+as defined by the associated `Block Additional Mapping`.
- Stores the registered identifier of the Block Additional Mapping
-to define how the BlockAdditional data should be handled.
- If BlockAddIDType is 0, the BlockAddIDValue and corresponding BlockAddID values **MUST** be 1.
+ Stores the registered identifier of the `Block Additional Mapping`
+to define how the `BlockAdditional` data should be handled.
+ If `BlockAddIDType` is 0, the `BlockAddIDValue` and corresponding `BlockAddID` values **MUST** be 1.
- Extra binary data that the BlockAddIDType can use to interpret the BlockAdditional data.
-The interpretation of the binary data depends on the BlockAddIDType value and the corresponding Block Additional Mapping.
+ Extra binary data that the `BlockAddIDType` can use to interpret the `BlockAdditional` data.
+The interpretation of the binary data depends on the `BlockAddIDType` value and the corresponding `Block Additional Mapping`.
A human-readable track name.
@@ -423,19 +421,19 @@ The interpretation of the binary data depends on the BlockAddIDType value and th
The language of the track,
in the Matroska languages form; see (#language-codes) on language codes.
-This Element **MUST** be ignored if the LanguageBCP47 Element is used in the same TrackEntry.
+This element **MUST** be ignored if the `LanguageBCP47` element is used in the same `TrackEntry`.
The language of the track,
-in the [@!BCP47] form; see (#language-codes) on language codes.
-If this Element is used, then any Language Elements used in the same TrackEntry **MUST** be ignored.
+in the form defined in [@!RFC5646]; see (#language-codes) on language codes.
+If this element is used, then any `Language` elements used in the same `TrackEntry` **MUST** be ignored.
- An ID corresponding to the codec,
-see [@?MatroskaCodec] for more info.
+ An ID corresponding to the codec;
+see [@?I-D.ietf-cellar-codec] for more info.
@@ -450,7 +448,7 @@ see [@?MatroskaCodec] for more info.
The UID of an attachment that is used by this codec.
- The value **MUST** match the `FileUID` value of an attachment found in this Segment.
+ The value **MUST** match the `FileUID` value of an attachment found in this `Segment`.
@@ -460,34 +458,34 @@ see [@?MatroskaCodec] for more info.
A URL to find information about the codec used.
- A URL to download about the codec used.
+ A URL to download information about the codec used.
Set to 1 if the codec can decode potentially damaged data.
- Specify that this track is an overlay track for the Track specified (in the u-integer).
-That means when this track has a gap on SilentTracks,
-the overlay track should be used instead. The order of multiple TrackOverlay matters, the first one is the one that should be used.
-If not found it should be the second, etc.
+ Specify that this track is an overlay track for the `Track` specified (in the u-integer).
+This means that when this track has a gap on `SilentTracks`,
+the overlay track should be used instead. The order of multiple `TrackOverlay` matters; the first one is the one that should be used.
+If the first one is not found, it should be the second, etc.
- CodecDelay is The codec-built-in delay, expressed in Matroska Ticks -- i.e., in nanoseconds; see (#timestamp-ticks).
-It represents the amount of codec samples that will be discarded by the decoder during playback.
+ The built-in delay for the codec, expressed in Matroska Ticks -- i.e., in nanoseconds; see (#timestamp-ticks).
+It represents the number of codec samples that will be discarded by the decoder during playback.
This timestamp value **MUST** be subtracted from each frame timestamp in order to get the timestamp that will be actually played.
-The value **SHOULD** be small so the muxing of tracks with the same actual timestamp are in the same Cluster.
+The value **SHOULD** be small so the muxing of tracks with the same actual timestamp are in the same `Cluster`.
- After a discontinuity, SeekPreRoll is the duration of the data
-the decoder **MUST** decode before the decoded data is valid, expressed in Matroska Ticks -- i.e., in nanoseconds; see (#timestamp-ticks).
+ After a discontinuity, the duration of the data
+that the decoder **MUST** decode before the decoded data is valid, expressed in Matroska Ticks -- i.e., in nanoseconds; see (#timestamp-ticks).
The mapping between this `TrackEntry` and a track value in the given Chapter Codec.
- Chapter Codec may need to address content in specific track, but they may not know of the way to identify tracks in Matroska.
+ Chapter Codecs may need to address content in a specific track, but they may not know of the way to identify tracks in Matroska.
This element and its child elements add a way to map the internal tracks known to the Chapter Codec to the track IDs in Matroska.
This allows remuxing a file with Chapter Codec without changing the content of the codec data, just the track mapping.
@@ -496,19 +494,12 @@ This allows remuxing a file with Chapter Codec without changing the content of t
The format depends on the `ChapProcessCodecID` used; see (#chapprocesscodecid-element).
- This `TrackTranslate` applies to this chapter codec of the given chapter edition(s); see (#chapprocesscodecid-element).
-
-
- Chapter commands using the Matroska Script codec.
-
-
- Chapter commands using the DVD-like codec.
-
-
+ Applies to the chapter codec of the given chapter edition(s); see (#chapprocesscodecid-element).
+
- Specify a chapter edition UID on which this `TrackTranslate` applies.
- When no `TrackTranslateEditionUID` is specified in the `TrackTranslate`, the `TrackTranslate` applies to all chapter editions found in the Segment using the given `TrackTranslateCodec`.
+ Specifies a chapter edition UID to which this `TrackTranslate` applies.
+ When no `TrackTranslateEditionUID` is specified in the `TrackTranslate`, the `TrackTranslate` applies to all chapter editions found in the `Segment` using the given `TrackTranslateCodec`.
Video settings.
@@ -516,7 +507,7 @@ The format depends on the `ChapProcessCodecID` used; see (#chapprocesscodecid-el
- Specify whether the video frames in this track are interlaced.
+ Specifies whether the video frames in this track are interlaced.
Unknown status.
@@ -534,12 +525,12 @@ The format depends on the `ChapProcessCodecID` used; see (#chapprocesscodecid-el
- Specify the field ordering of video frames in this track.
- If FlagInterlaced is not set to 1, this Element **MUST** be ignored.
+ Specifies the field ordering of video frames in this track.
+ If `FlagInterlaced` is not set to 1, this element **MUST** be ignored.
Interlaced frames.
- This value **SHOULD** be avoided, setting FlagInterlaced to 2 is sufficient.
+ This value **SHOULD** be avoided; setting `FlagInterlaced` to 2 is sufficient.
Top field displayed first. Top field stored first.
@@ -551,10 +542,10 @@ The format depends on the `ChapProcessCodecID` used; see (#chapprocesscodecid-el
Bottom field displayed first. Bottom field stored first.
-
+
Top field displayed first. Fields are interleaved in storage with the top line of the top field stored first.
-
+
Bottom field displayed first. Fields are interleaved in storage with the top line of the top field stored first.
@@ -562,7 +553,8 @@ The format depends on the `ChapProcessCodecID` used; see (#chapprocesscodecid-el
- Stereo-3D video mode. There are some more details in (#multi-planar-and-3d-videos).
+ Stereo-3D video mode. See (#multi-planar-and-3d-videos) for more details.
+
@@ -585,14 +577,15 @@ The format depends on the `ChapProcessCodecID` used; see (#chapprocesscodecid-el
- Indicate whether the BlockAdditional Element with BlockAddID of "1" contains Alpha data, as defined by to the Codec Mapping for the `CodecID`.
-Undefined values **SHOULD NOT** be used as the behavior of known implementations is different (considered either as 0 or 1).
+ Indicates whether the `BlockAdditional` element with `BlockAddID` of "1" contains Alpha data as defined by the Codec Mapping for the `CodecID`.
+ Undefined values (i.e., values other than 0 or 1) **SHOULD NOT** be used, as the behavior of known implementations is different.
+
- The BlockAdditional Element with BlockAddID of "1" does not exist or **SHOULD NOT** be considered as containing such data.
+ The `BlockAdditional` element with `BlockAddID` of "1" does not exist or **SHOULD NOT** be considered as containing such data.
- The BlockAdditional Element with BlockAddID of "1" contains alpha channel data.
+ The `BlockAdditional` element with `BlockAddID` of "1" contains alpha channel data.
@@ -601,8 +594,8 @@ Undefined values **SHOULD NOT** be used as the behavior of known implementations
- Bogus StereoMode value used in old versions of libmatroska.
- This Element **MUST NOT** be used. It was an incorrect value used in libmatroska up to 0.9.0.
+ Bogus `StereoMode` value used in old versions of [@?libmatroska].
+ This element **MUST NOT** be used. It was an incorrect value used in libmatroska up to 0.9.0.
@@ -648,22 +641,21 @@ Undefined values **SHOULD NOT** be used as the behavior of known implementations
Width of the video frames to display. Applies to the video frame after cropping (PixelCrop* Elements).
- If the DisplayUnit of the same TrackEntry is 0, then the default value for DisplayWidth is equal to
-PixelWidth - PixelCropLeft - PixelCropRight, else there is no default value.
+ If the DisplayUnit of the same `TrackEntry` is 0, then the default value for `DisplayWidth` is equal to `PixelWidth` - `PixelCropLeft` - `PixelCropRight`; else, there is no default value.
Height of the video frames to display. Applies to the video frame after cropping (PixelCrop* Elements).
- If the DisplayUnit of the same TrackEntry is 0, then the default value for DisplayHeight is equal to
-PixelHeight - PixelCropTop - PixelCropBottom, else there is no default value.
+ If the DisplayUnit of the same `TrackEntry` is 0, then the default value for `DisplayHeight` is equal to `PixelHeight` - `PixelCropTop` - `PixelCropBottom`; else, there is no default value.
- How DisplayWidth & DisplayHeight are interpreted.
+ How `DisplayWidth` and `DisplayHeight` are interpreted.
+
@@ -675,7 +667,7 @@ PixelHeight - PixelCropTop - PixelCropBottom, else there is no default value.
- Specify the possible modifications to the aspect ratio.
+ Specifies the possible modifications to the aspect ratio.
@@ -684,29 +676,29 @@ PixelHeight - PixelCropTop - PixelCropBottom, else there is no default value.
- Specify the uncompressed pixel format used for the Track's data as a FourCC.
-This value is similar in scope to the biCompression value of AVI's `BITMAPINFO` [@?AVIFormat]. There is no definitive list of FourCC values, nor an official registry. Some common values for YUV pixel formats can be found at [@?MSYUV8], [@?MSYUV16] and [@?FourCC-YUV]. Some common values for uncompressed RGB pixel formats can be found at [@?MSRGB] and [@?FourCC-RGB].
- UncompressedFourCC **MUST** be set (minOccurs=1) in TrackEntry, when the CodecID Element of the TrackEntry is set to "V_UNCOMPRESSED".
+ Specifies the uncompressed pixel format used for the `Track`'s data as a FourCC.
+This value is similar in scope to the biCompression value of AVI's `BITMAPINFO` [@?AVIFormat]. There is neither a definitive list of FourCC values nor an official registry. Some common values for YUV pixel formats can be found at [@?MSYUV8], [@?MSYUV16], and [@?FourCC-YUV]. Some common values for uncompressed RGB pixel formats can be found at [@?MSRGB] and [@?FourCC-RGB].
+ UncompressedFourCC **MUST** be set (minOccurs=1) in `TrackEntry` when the `CodecID` element of the `TrackEntry` is set to "V_UNCOMPRESSED".
- Gamma Value.
+ Gamma value.
- Number of frames per second. This value is Informational only. It is intended for constant frame rate streams, and should not be used for a variable frame rate TrackEntry.
+ Number of frames per second. This value is informational only. It is intended for constant frame rate streams and should not be used for a variable frame rate `TrackEntry`.
- Settings describing the colour format.
+ Settings describing the color format.
The Matrix Coefficients of the video used to derive luma and chroma values from red, green, and blue color primaries.
-For clarity, the value and meanings for MatrixCoefficients are adopted from Table 4 of [@!ITU-H.273].
+For clarity, the value and meanings for `MatrixCoefficients` are adopted from Table 4 of [@!ITU-H.273].
@@ -729,42 +721,43 @@ For clarity, the value and meanings for MatrixCoefficients are adopted from Tabl
- Number of decoded bits per channel. A value of 0 indicates that the BitsPerChannel is unspecified.
+ Number of decoded bits per channel. A value of 0 indicates that the `BitsPerChannel` is unspecified.
- The amount of pixels to remove in the Cr and Cb channels for every pixel not removed horizontally.
-Example: For video with 4:2:0 chroma subsampling, the ChromaSubsamplingHorz **SHOULD** be set to 1.
+ The number of pixels to remove in the Cr and Cb channels for every pixel not removed horizontally.
+Example: For video with 4:2:0 chroma subsampling, the `ChromaSubsamplingHorz` **SHOULD** be set to 1.
- The amount of pixels to remove in the Cr and Cb channels for every pixel not removed vertically.
-Example: For video with 4:2:0 chroma subsampling, the ChromaSubsamplingVert **SHOULD** be set to 1.
+ The number of pixels to remove in the Cr and Cb channels for every pixel not removed vertically.
+Example: For video with 4:2:0 chroma subsampling, the `ChromaSubsamplingVert` **SHOULD** be set to 1.
- The amount of pixels to remove in the Cb channel for every pixel not removed horizontally.
-This is additive with ChromaSubsamplingHorz. Example: For video with 4:2:1 chroma subsampling,
-the ChromaSubsamplingHorz **SHOULD** be set to 1 and CbSubsamplingHorz **SHOULD** be set to 1.
+ The number of pixels to remove in the Cb channel for every pixel not removed horizontally.
+This is additive with `ChromaSubsamplingHorz`. Example: For video with 4:2:1 chroma subsampling,
+the `ChromaSubsamplingHorz` **SHOULD** be set to 1, and `CbSubsamplingHorz` **SHOULD** be set to 1.
- The amount of pixels to remove in the Cb channel for every pixel not removed vertically.
-This is additive with ChromaSubsamplingVert.
+ The number of pixels to remove in the Cb channel for every pixel not removed vertically.
+This is additive with `ChromaSubsamplingVert`.
How chroma is subsampled horizontally.
+
@@ -776,6 +769,7 @@ This is additive with ChromaSubsamplingVert.
How chroma is subsampled vertically.
+
@@ -787,6 +781,7 @@ This is additive with ChromaSubsamplingVert.
Clipping of the color ranges.
+
@@ -799,7 +794,7 @@ This is additive with ChromaSubsamplingVert.
The transfer characteristics of the video. For clarity,
-the value and meanings for TransferCharacteristics are adopted from Table 3 of [@!ITU-H.273].
+the value and meanings for `TransferCharacteristics` are adopted from Table 3 of [@!ITU-H.273].
@@ -826,8 +821,8 @@ the value and meanings for TransferCharacteristics are adopted from Table 3 of [
- The colour primaries of the video. For clarity,
-the value and meanings for Primaries are adopted from Table 2 of [@!ITU-H.273].
+ The color primaries of the video. For clarity,
+the value and meanings for `Primaries` are adopted from Table 2 of [@!ITU-H.273].
@@ -929,13 +924,14 @@ in candelas per square meter (cd/m^2^).
- Describes the video projection details. Used to render spherical, VR videos or flipping videos horizontally/vertically.
+ Describes the video projection details. Used to render spherical or VR videos or to flip videos horizontally or vertically.
Describes the projection used for this video track.
+
@@ -948,31 +944,29 @@ in candelas per square meter (cd/m^2^).
Private data that only applies to a specific projection.
-
-* If `ProjectionType` equals 0 (Rectangular),
+* If `ProjectionType` equals 0 (rectangular),
then this element **MUST NOT** be present.
-* If `ProjectionType` equals 1 (Equirectangular), then this element **MUST** be present and contain the same binary data that would be stored inside
- an ISOBMFF Equirectangular Projection Box ('equi').
-* If `ProjectionType` equals 2 (Cubemap), then this element **MUST** be present and contain the same binary data that would be stored
- inside an ISOBMFF Cubemap Projection Box ('cbmp').
-* If `ProjectionType` equals 3 (Mesh), then this element **MUST** be present and contain the same binary data that would be stored inside
- an ISOBMFF Mesh Projection Box ('mshp').
-
-ISOBMFF box size and fourcc fields are not included in the binary data,
+* If `ProjectionType` equals 1 (equirectangular), then this element **MUST** be present and contain the same binary data that would be stored inside
+ an ISOBMFF Equirectangular Projection Box ("equi").
+* If `ProjectionType` equals 2 (cubemap), then this element **MUST** be present and contain the same binary data that would be stored
+ inside an ISOBMFF Cubemap Projection Box ("cbmp").
+* If `ProjectionType` equals 3 (mesh), then this element **MUST** be present and contain the same binary data that would be stored inside
+ an ISOBMFF Mesh Projection Box ("mshp").
+ISOBMFF box size and FourCC fields are not included in the binary data,
but the FullBox version and flag fields are. This is to avoid
redundant framing information while preserving versioning and semantics between the two container formats.
-
+
Specifies a yaw rotation to the projection.
Value represents a clockwise rotation, in degrees, around the up vector. This rotation must be applied
before any `ProjectionPosePitch` or `ProjectionPoseRoll` rotations.
-The value of this element **MUST** be in the -180 to 180 degree range, both included.
+The value of this element **MUST** be in the -180 to 180 degree range, both inclusive.
-Setting `ProjectionPoseYaw` to 180 or -180 degrees, with the `ProjectionPoseRoll` and `ProjectionPosePitch` set to 0 degrees flips the image horizontally.
+Setting `ProjectionPoseYaw` to 180 or -180 degrees with `ProjectionPoseRoll` and `ProjectionPosePitch` set to 0 degrees flips the image horizontally.
@@ -982,7 +976,7 @@ Setting `ProjectionPoseYaw` to 180 or -180 degrees, with the `ProjectionPoseRoll
Value represents a counter-clockwise rotation, in degrees, around the right vector. This rotation must be applied
after the `ProjectionPoseYaw` rotation and before the `ProjectionPoseRoll` rotation.
-The value of this element **MUST** be in the -90 to 90 degree range, both included.
+The value of this element **MUST** be in the -90 to 90 degree range, both inclusive.
@@ -992,11 +986,11 @@ The value of this element **MUST** be in the -90 to 90 degree range, both includ
Value represents a counter-clockwise rotation, in degrees, around the forward vector. This rotation must be applied
after the `ProjectionPoseYaw` and `ProjectionPosePitch` rotations.
-The value of this element **MUST** be in the -180 to 180 degree range, both included.
+The value of this element **MUST** be in the -180 to 180 degree range, both inclusive.
-Setting `ProjectionPoseRoll` to 180 or -180 degrees, the `ProjectionPoseYaw` to 180 or -180 degrees with `ProjectionPosePitch` set to 0 degrees flips the image vertically.
+Setting `ProjectionPoseRoll` to 180 or -180 degrees and `ProjectionPoseYaw` to 180 or -180 degrees with `ProjectionPosePitch` set to 0 degrees flips the image vertically.
-Setting `ProjectionPoseRoll` to 180 or -180 degrees, with the `ProjectionPoseYaw` and `ProjectionPosePitch` set to 0 degrees flips the image horizontally and vertically.
+Setting `ProjectionPoseRoll` to 180 or -180 degrees with `ProjectionPoseYaw` and `ProjectionPosePitch` set to 0 degrees flips the image horizontally and vertically.
@@ -1013,8 +1007,8 @@ Setting `ProjectionPoseRoll` to 180 or -180 degrees, with the `ProjectionPoseYaw
- Real output sampling frequency in Hz (used for SBR techniques).
- The default value for OutputSamplingFrequency of the same TrackEntry is equal to the SamplingFrequency.
+ Real output sampling frequency in Hz that is used for Spectral Band Replication (SBR) techniques.
+ The default value for `OutputSamplingFrequency` of the same `TrackEntry` is equal to the `SamplingFrequency`.
@@ -1077,23 +1071,24 @@ Setting `ProjectionPoseRoll` to 180 or -180 degrees, with the `ProjectionPoseYaw
Operation that needs to be applied on tracks to create this virtual track.
-For more details look at (#track-operation).
+For more details, see (#track-operation).
- Contains the list of all video plane tracks that need to be combined to create this 3D track
+ Contains the list of all video plane tracks that need to be combined to create this 3D track.
- Contains a video plane track that need to be combined to create this 3D track
+ Contains a video plane track that needs to be combined to create this 3D track.
- The trackUID number of the track representing the plane.
+ The `TrackUID` number of the track representing the plane.
The kind of plane this track corresponds to.
+
@@ -1102,32 +1097,32 @@ For more details look at (#track-operation).
- Contains the list of all tracks whose Blocks need to be combined to create this virtual track
+ Contains the list of all tracks whose `Blocks` need to be combined to create this virtual track.
- The trackUID number of a track whose blocks are used to create this virtual track.
+ The `TrackUID` number of a track whose blocks are used to create this virtual track.
- The TrackUID of the Smooth FF/RW video in the paired EBML structure corresponding to this video track. See [@?DivXTrickTrack].
+ The `TrackUID` of the Smooth FF/RW video in the paired EBML structure corresponding to this video track. See [@?DivXTrickTrack].
- The SegmentUID of the Segment containing the track identified by TrickTrackUID. See [@?DivXTrickTrack].
+ The `SegmentUUID` of the `Segment` containing the track identified by TrickTrackUID. See [@?DivXTrickTrack].
- Set to 1 if this video track is a Smooth FF/RW track. If set to 1, MasterTrackUID and MasterTrackSegUID should be present and BlockGroups for this track must contain ReferenceFrame structures.
+ Set to 1 if this video track is a Smooth FF/RW track. If set to 1, `MasterTrackUID` and `MasterTrackSegUID` should be present, and `BlockGroups` for this track must contain ReferenceFrame structures.
Otherwise, TrickTrackUID and TrickTrackSegUID must be present if this track has a corresponding Smooth FF/RW track. See [@?DivXTrickTrack].
- The TrackUID of the video track in the paired EBML structure that corresponds to this Smooth FF/RW track. See [@?DivXTrickTrack].
+ The `TrackUID` of the video track in the paired EBML structure that corresponds to this Smooth FF/RW track. See [@?DivXTrickTrack].
- The SegmentUID of the Segment containing the track identified by MasterTrackUID. See [@?DivXTrickTrack].
+ The `SegmentUUID` of the `Segment` containing the track identified by MasterTrackUID. See [@?DivXTrickTrack].
@@ -1141,32 +1136,34 @@ Otherwise, TrickTrackUID and TrickTrackSegUID must be present if this track has
- Tell in which order to apply each `ContentEncoding` of the `ContentEncodings`.
+ Defines the order to apply each `ContentEncoding` of the `ContentEncodings`.
The decoder/demuxer **MUST** start with the `ContentEncoding` with the highest `ContentEncodingOrder` and work its way down to the `ContentEncoding` with the lowest `ContentEncodingOrder`.
-This value **MUST** be unique over for each `ContentEncoding` found in the `ContentEncodings` of this `TrackEntry`.
+This value **MUST** be unique for each `ContentEncoding` found in the `ContentEncodings` of this `TrackEntry`.
-
- A bit field that describes which Elements have been modified in this way.
+
+ A bit field that describes which elements have been modified in this way.
Values (big-endian) can be OR'ed.
+
-
+
All frame contents, excluding lacing data.
-
+
The track's `CodecPrivate` data.
-
- The next ContentEncoding (next `ContentEncodingOrder`. Either the data inside `ContentCompression` and/or `ContentEncryption`).
- This value **SHOULD NOT** be used as it's not supported by players.
+
+ The next ContentEncoding (next `ContentEncodingOrder`; the data inside `ContentCompression` and/or `ContentEncryption`).
+ This value **SHOULD NOT** be used, as it's not supported by players.
- A value describing what kind of transformation is applied.
+ A value describing the kind of transformation that is applied.
+
@@ -1176,25 +1173,26 @@ Values (big-endian) can be OR'ed.
Settings describing the compression used.
-This Element **MUST** be present if the value of ContentEncodingType is 0 and absent otherwise.
-Each block **MUST** be decompressable even if no previous block is available in order not to prevent seeking.
+This element **MUST** be present if the value of `ContentEncodingType` is 0 and absent otherwise.
+Each block **MUST** be decompressable, even if no previous block is available in order to not prevent seeking.
The compression algorithm used.
- Compression method "1" (bzlib) and "2" (lzo1x) are lacking proper documentation on the format which limits implementation possibilities.
-Due to licensing conflicts on commonly available libraries compression methods "2" (lzo1x) does not offer widespread interoperability.
-A Matroska Writer **SHOULD NOT** use these compression methods by default.
-A Matroska Reader **MAY** support methods "1" and "2" as possible, and **SHOULD** support other methods.
+ Compression method "1" (bzlib) and "2" (lzo1x) lack proper documentation on the format, which limits implementation possibilities.
+Due to licensing conflicts on commonly available libraries' compression methods, "2" (lzo1x) does not offer widespread interoperability.
+A `Matroska Writer` **SHOULD NOT** use these compression methods by default.
+A `Matroska Reader` **MAY** support methods "1" and "2" and **SHOULD** support other methods.
+
zlib compression [@!RFC1950].
- bzip2 compression [@?BZIP2], **SHOULD NOT** be used; see usage notes.
+ bzip2 compression [@?BZIP2] **SHOULD NOT** be used; see usage notes.
- Lempel-Ziv-Oberhumer compression [@?LZO], **SHOULD NOT** be used; see usage notes.
+ Lempel-Ziv-Oberhumer compression [@?LZO] **SHOULD NOT** be used; see usage notes.
Octets in `ContentCompSettings` ((#contentcompsettings-element)) have been stripped from each frame.
@@ -1204,28 +1202,29 @@ A Matroska Reader **MAY** support methods "1" and "2" as possible, and **SHOULD*
Settings that might be needed by the decompressor. For Header Stripping (`ContentCompAlgo`=3),
-the bytes that were removed from the beginning of each frames of the track.
+the bytes that were removed from the beginning of each frame of the track.
Settings describing the encryption used.
-This Element **MUST** be present if the value of `ContentEncodingType` is 1 (encryption) and **MUST** be ignored otherwise.
-A Matroska Player **MAY** support encryption.
+This element **MUST** be present if the value of `ContentEncodingType` is 1 (encryption) and **MUST** be ignored otherwise.
+A `Matroska Player` **MAY** support encryption.
The encryption algorithm used.
+
The data are not encrypted.
- Data Encryption Standard (DES) [@?FIPS.46-3].
+ Data Encryption Standard (DES) [@?FIPS46-3].
This value **SHOULD** be avoided.
- Triple Data Encryption Algorithm [@?SP.800-67].
+ Triple Data Encryption Algorithm [@?SP800-67].
This value **SHOULD** be avoided.
@@ -1236,14 +1235,14 @@ A Matroska Player **MAY** support encryption.
This value **SHOULD** be avoided.
- Advanced Encryption Standard (AES) [@?FIPS.197].
+ Advanced Encryption Standard (AES) [@?FIPS197].
- For public key algorithms this is the ID of the public key the data was encrypted with.
+ For public key algorithms, the ID of the public key that the data was encrypted with.
@@ -1253,15 +1252,16 @@ A Matroska Player **MAY** support encryption.
-
+
The AES cipher mode used in the encryption.
AESSettingsCipherMode **MUST NOT** be set (maxOccurs=0) if ContentEncAlgo is not AES (5).
+
- Counter [@?SP.800-38A].
+ Counter [@?SP800-38A]
- Cipher Block Chaining [@?SP.800-38A].
+ Cipher Block Chaining [@?SP800-38A]
@@ -1271,7 +1271,7 @@ A Matroska Player **MAY** support encryption.
A cryptographic signature of the contents.
- This is the ID of the private key the data was signed with.
+ This is the ID of the private key that the data was signed with.
The algorithm used for the signature.
@@ -1289,21 +1289,21 @@ A Matroska Player **MAY** support encryption.
- A Top-Level Element to speed seeking access.
-All entries are local to the Segment.
- This Element **SHOULD** be set when the Segment is not transmitted as a live stream; see (#livestreaming).
+ A `Top-Level Element` to speed seeking access.
+All entries are local to the `Segment`.
+ This element **SHOULD** be set when the `Segment` is not transmitted as a live stream; see (#livestreaming).
- Contains all information relative to a seek point in the Segment.
+ Contains all information relative to a seek point in the `Segment`.
- Absolute timestamp of the seek point, expressed in Matroska Ticks -- i.e., in nanoseconds; see (#timestamp-ticks).
+ Absolute timestamp of the seek point, expressed in Segment Ticks, which are based on `TimestampScale`; see (#timestamp-ticks).
- Contain positions for different tracks corresponding to the timestamp.
+ Contains positions for different tracks corresponding to the timestamp.
@@ -1311,45 +1311,45 @@ All entries are local to the Segment.
- The Segment Position ((#segment-position)) of the Cluster containing the associated Block.
+ The `Segment Position` ((#segment-position)) of the `Cluster` containing the associated `Block`.
- The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup
-with 0 being the first possible position for an Element inside that Cluster.
+ The relative position inside the `Cluster` of the referenced `SimpleBlock` or `BlockGroup`
+with 0 being the first possible position for an element inside that `Cluster`.
- The duration of the block, expressed in Segment Ticks which is based on TimestampScale; see (#timestamp-ticks).
-If missing, the track's DefaultDuration does not apply and no duration information is available in terms of the cues.
+ The duration of the block, expressed in Segment Ticks, which are based on `TimestampScale`; see (#timestamp-ticks).
+If missing, the track's `DefaultDuration` does not apply and no duration information is available in terms of the cues.
- Number of the Block in the specified Cluster.
+ Number of the `Block` in the specified `Cluster`.
- The Segment Position ((#segment-position)) of the Codec State corresponding to this Cue Element.
-0 means that the data is taken from the initial Track Entry.
+ The `Segment Position` ((#segment-position)) of the Codec State corresponding to this `Cues` element.
+0 means that the data is taken from the initial `TrackEntry`.
- The Clusters containing the referenced Blocks.
+ The `Clusters` containing the referenced `Blocks`.
- Timestamp of the referenced Block, expressed in Matroska Ticks -- i.e., in nanoseconds; see (#timestamp-ticks).
+ Timestamp of the referenced `Block`, expressed in Segment Ticks which is based on `TimestampScale`; see (#timestamp-ticks).
- The Segment Position of the Cluster containing the referenced Block.
+ The `Segment Position` of the `Cluster` containing the referenced `Block`.
- Number of the referenced Block of Track X in the specified Cluster.
+ Number of the referenced `Block` of Track X in the specified `Cluster`.
- The Segment Position of the Codec State corresponding to this referenced Element.
-0 means that the data is taken from the initial Track Entry.
+ The `Segment Position` of the Codec State corresponding to this referenced element.
+0 means that the data is taken from the initial `TrackEntry`.
- Contain attached files.
+ Contains attached files.
An attached file.
@@ -1362,7 +1362,7 @@ If missing, the track's DefaultDuration does not apply and no duration informati
Filename of the attached file.
- Media type of the file following the [@!RFC6838] format.
+ Media type of the file following the format described in [@!RFC6838].
@@ -1371,38 +1371,38 @@ If missing, the track's DefaultDuration does not apply and no duration informati
- Unique ID representing the file, as random as possible.
+ UID representing the file, as random as possible.
A binary value that a track/codec can refer to when the attachment is needed.
- The timestamp at which this optimized font attachment comes into context, expressed in Segment Ticks which is based on TimestampScale. See [@?DivXWorldFonts].
+ The timestamp at which this optimized font attachment comes into context, expressed in Segment Ticks, which are based on `TimestampScale`. See [@?DivXWorldFonts].
This element is reserved for future use and if written **MUST** be the segment start timestamp.
- The timestamp at which this optimized font attachment goes out of context, expressed in Segment Ticks which is based on TimestampScale. See [@?DivXWorldFonts].
+ The timestamp at which this optimized font attachment goes out of context, expressed in Segment Ticks, which are based on `TimestampScale`. See [@?DivXWorldFonts].
This element is reserved for future use and if written **MUST** be the segment end timestamp.
A system to define basic menus and partition data.
-For more detailed information, look at the Chapters explanation in (#chapters).
+For more detailed information, see (#chapters).
- Contains all information about a Segment edition.
+ Contains all information about a `Segment` edition.
- A unique ID to identify the edition. It's useful for tagging an edition.
+ A UID that identifies the edition. It's useful for tagging an edition.
Set to 1 if an edition is hidden. Hidden editions **SHOULD NOT** be available to the user interface
-(but still to Control Tracks; see (#chapter-flags) on Chapter flags).
+(but still be available to Control Tracks; see (#chapter-flags) on `Chapter` flags).
@@ -1419,51 +1419,51 @@ For more detailed information, look at the Chapters explanation in (#chapters).<
One language corresponding to the EditionString,
-in the [@!BCP47] form; see (#language-codes) on language codes.
+in the form defined in [@!RFC5646]; see (#language-codes) on language codes.
- Contains the atom information to use as the chapter atom (apply to all tracks).
+ Contains the atom information to use as the chapter atom (applies to all tracks).
- A unique ID to identify the Chapter.
+ A UID that identifies the `Chapter`.
- A unique string ID to identify the Chapter.
-For example it is used as the storage for [@?WebVTT] cue identifier values.
+ A unique string ID that identifies the `Chapter`.
+For example, it is used as the storage for cue identifier values [@?WebVTT].
- Timestamp of the start of Chapter, expressed in Matroska Ticks -- i.e., in nanoseconds; see (#timestamp-ticks).
+ Timestamp of the start of `Chapter`, expressed in Matroska Ticks -- i.e., in nanoseconds; see (#timestamp-ticks).
- Timestamp of the end of Chapter timestamp excluded, expressed in Matroska Ticks -- i.e., in nanoseconds; see (#timestamp-ticks).
+ Timestamp of the end of `Chapter` (timestamp excluded), expressed in Matroska Ticks -- i.e., in nanoseconds; see (#timestamp-ticks).
The value **MUST** be greater than or equal to the `ChapterTimeStart` of the same `ChapterAtom`.
- The `ChapterTimeEnd` timestamp value being excluded, it **MUST** take in account the duration of
+ With the `ChapterTimeEnd` timestamp value being excluded, it **MUST** take into account the duration of
the last frame it includes, especially for the `ChapterAtom` using the last frames of the `Segment`.
- ChapterTimeEnd **MUST** be set (minOccurs=1) if the Edition is an ordered edition; see (#editionflagordered), unless it's a `Parent Chapter`; see (#nested-chapters)
+ ChapterTimeEnd **MUST** be set (minOccurs=1) if the `Edition` is an ordered edition; see (#editionflagordered). If it's a `Parent Chapter`, see (#nested-chapters).
Set to 1 if a chapter is hidden. Hidden chapters **SHOULD NOT** be available to the user interface
-(but still to Control Tracks; see (#chapterflaghidden) on Chapter flags).
+(but still be available to Control Tracks; see (#chapterflaghidden) on `Chapter` flags).
Set to 1 if the chapter is enabled. It can be enabled/disabled by a Control Track.
-When disabled, the movie **SHOULD** skip all the content between the TimeStart and TimeEnd of this chapter; see (#chapter-flags) on Chapter flags.
+When disabled, the movie **SHOULD** skip all the content between the TimeStart and TimeEnd of this chapter; see (#chapter-flags) on `Chapter` flags.
- The SegmentUUID of another Segment to play during this chapter.
+ The `SegmentUUID` of another `Segment` to play during this chapter.
The value **MUST NOT** be the `SegmentUUID` value of the `Segment` it belongs to.
- ChapterSegmentUUID **MUST** be set (minOccurs=1) if ChapterSegmentEditionUID is used; see (#medium-linking) on medium-linking Segments.
+ `ChapterSegmentUUID` **MUST** be set (minOccurs=1) if `ChapterSegmentEditionUID` is used; see (#medium-linking) on Medium-Linking `Segments`.
-
- Indicate what type of content the ChapterAtom contains and might be skipped. It can be used to automatically skip content based on the type.
+
+ Indicates what type of content the `ChapterAtom` contains and might be skipped. It can be used to automatically skip content based on the type.
If a `ChapterAtom` is inside a `ChapterAtom` that has a `ChapterSkipType` set, it **MUST NOT** have a `ChapterSkipType` or have a `ChapterSkipType` with the same value as it's parent `ChapterAtom`.
If the `ChapterAtom` doesn't contain a `ChapterTimeEnd`, the value of the `ChapterSkipType` is only valid until the next `ChapterAtom` with a `ChapterSkipType` value or the end of the file.
@@ -1493,21 +1493,21 @@ If the `ChapterAtom` doesn't contain a `ChapterTimeEnd`, the value of the `Chapt
- The EditionUID to play from the Segment linked in ChapterSegmentUUID.
-If ChapterSegmentEditionUID is undeclared, then no Edition of the linked Segment is used; see (#medium-linking) on medium-linking Segments.
+ The `EditionUID` to play from the `Segment` linked in `ChapterSegmentUUID`.
+If `ChapterSegmentEditionUID` is undeclared, then no `Edition` of the `Linked Segment` is used; see (#medium-linking) on Medium-Linking `Segments`.
- Specify the physical equivalent of this ChapterAtom like "DVD" (60) or "SIDE" (50);
+ Specifies the physical equivalent of this `ChapterAtom`, e.g., "DVD" (60) or "SIDE" (50);
see (#physical-types) for a complete list of values.
- List of tracks on which the chapter applies. If this Element is not present, all tracks apply
+ List of tracks on which the chapter applies. If this element is not present, all tracks apply.
- UID of the Track to apply this chapter to.
-In the absence of a control track, choosing this chapter will select the listed Tracks and deselect unlisted tracks.
-Absence of this Element indicates that the Chapter **SHOULD** be applied to any currently used Tracks.
+ UID of the `Track` to apply this chapter to.
+In the absence of a control track, choosing this chapter will select the listed `Tracks` and deselect unlisted tracks.
+Absence of this element indicates that the `Chapter` **SHOULD** be applied to any currently used `Tracks`.
@@ -1523,44 +1523,51 @@ Absence of this Element indicates that the Chapter **SHOULD** be applied to any
A language corresponding to the string,
in the Matroska languages form; see (#language-codes) on language codes.
-This Element **MUST** be ignored if a ChapLanguageBCP47 Element is used within the same ChapterDisplay Element.
+This element **MUST** be ignored if a `ChapLanguageBCP47` element is used within the same `ChapterDisplay` element.
- A language corresponding to the ChapString,
-in the [@!BCP47] form; see (#language-codes) on language codes.
-If a ChapLanguageBCP47 Element is used, then any ChapLanguage and ChapCountry Elements used in the same ChapterDisplay **MUST** be ignored.
+ A language corresponding to the `ChapString`,
+in the form defined in [@!RFC5646]; see (#language-codes) on language codes.
+If a `ChapLanguageBCP47` element is used, then any `ChapLanguage` and `ChapCountry` elements used in the same `ChapterDisplay` **MUST** be ignored.
A country corresponding to the string,
in the Matroska countries form; see (#country-codes) on country codes.
-This Element **MUST** be ignored if a ChapLanguageBCP47 Element is used within the same ChapterDisplay Element.
+This element **MUST** be ignored if a `ChapLanguageBCP47` element is used within the same `ChapterDisplay` element.
- Contains all the commands associated to the Atom.
+ Contains all the commands associated with the Atom.
- Contains the type of the codec used for the processing.
-A value of 0 means built-in Matroska processing (to be defined), a value of 1 means the DVD command set is used; see (#menu-features) on DVD menus.
-More codec IDs can be added later.
+ Contains the type of the codec used for processing.
+
+
+
+ Chapter commands using the Matroska Script codec.
+
+
+ Chapter commands using the DVD-like codec.
+
+
- Some optional data attached to the ChapProcessCodecID information.
- For ChapProcessCodecID = 1, it is the "DVD level" equivalent; see (#menu-features) on DVD menus.
+ Optional data attached to the `ChapProcessCodecID` information.
+ For `ChapProcessCodecID` = 1, it is the "DVD level" equivalent; see (#menu-features) on DVD menus.
- Contains all the commands associated to the Atom.
+ Contains all the commands associated with the Atom.
- Defines when the process command **SHOULD** be handled
+ Defines when the process command **SHOULD** be handled.
@@ -1570,13 +1577,13 @@ More codec IDs can be added later.
Contains the command information.
-The data **SHOULD** be interpreted depending on the ChapProcessCodecID value. For ChapProcessCodecID = 1,
+The data **SHOULD** be interpreted depending on the `ChapProcessCodecID` value. For `ChapProcessCodecID` = 1,
the data correspond to the binary DVD cell pre/post commands; see (#menu-features) on DVD menus.
- Element containing metadata describing Tracks, Editions, Chapters, Attachments, or the Segment as a whole.
-A list of valid tags can be found in [@?MatroskaTags].
+ Element containing metadata describing `Tracks`, `Editions`, `Chapters`, `Attachments`, or the `Segment` as a whole.
+A list of valid tags can be found in [@?I-D.ietf-cellar-tags].
@@ -1584,41 +1591,44 @@ A list of valid tags can be found in [@?MatroskaTags].
- Specifies which other elements the metadata represented by the Tag applies to.
-If empty or omitted, then the Tag describes everything in the Segment.
+ Specifies which other elements the metadata represented by the tag value applies to.
+If empty or omitted, then the tag value describes everything in the `Segment`.
-
+
A number to indicate the logical level of the target.
+ The `TargetTypeValue` values are meant to be compared.
+ Higher values **MUST** correspond to a logical level that contains the lower logical level `TargetTypeValue` values.
+
-
- The highest hierarchical level that tags can describe.
+
+ The lowest hierarchy found in music or movies.
-
- A list of lower levels grouped together.
+
+ Corresponds to parts of a track for audio, such as a movement or scene in a movie.
-
- The most common grouping level of music and video (equals to an episode for TV series).
+
+ The common parts of an album or movie.
When an album or episode has different logical parts.
-
- The common parts of an album or movie.
+
+ The most common grouping level of music and video (e.g., an episode for TV series).
-
- Corresponds to parts of a track for audio like a movement, or a scene in a movie.
+
+ A list of lower levels grouped together.
-
- The lowest hierarchy found in music or movies.
+
+ The highest hierarchical level that tags can describe.
- An informational string that can be used to display the logical level of the target like "ALBUM", "TRACK", "MOVIE", "CHAPTER", etc.
+ An informational string that can be used to display the logical level of the target, such as "ALBUM", "TRACK", "MOVIE", "CHAPTER", etc.
@@ -1646,25 +1656,25 @@ If empty or omitted, then the Tag describes everything in the Segment.
- A unique ID to identify the Track(s) the tags belong to.
- If the value is 0 at this level, the tags apply to all tracks in the Segment.
-If set to any other value, it **MUST** match the `TrackUID` value of a track found in this Segment.
+ A UID that identifies the `Track(s)` that the tags belong to.
+ If the value is 0 at this level, the tags apply to all tracks in the `Segment`.
+If set to any other value, it **MUST** match the `TrackUID` value of a track found in this `Segment`.
- A unique ID to identify the EditionEntry(s) the tags belong to.
- If the value is 0 at this level, the tags apply to all editions in the Segment.
-If set to any other value, it **MUST** match the `EditionUID` value of an edition found in this Segment.
+ A UID that identifies the `EditionEntry(s)` that the tags belong to.
+ If the value is 0 at this level, the tags apply to all editions in the `Segment`.
+If set to any other value, it **MUST** match the `EditionUID` value of an edition found in this `Segment`.
- A unique ID to identify the Chapter(s) the tags belong to.
- If the value is 0 at this level, the tags apply to all chapters in the Segment.
-If set to any other value, it **MUST** match the `ChapterUID` value of a chapter found in this Segment.
+ A UID that identifies the `Chapter(s)` that the tags belong to.
+ If the value is 0 at this level, the tags apply to all chapters in the `Segment`.
+If set to any other value, it **MUST** match the `ChapterUID` value of a chapter found in this `Segment`.
- A unique ID to identify the Attachment(s) the tags belong to.
- If the value is 0 at this level, the tags apply to all the attachments in the Segment.
-If set to any other value, it **MUST** match the `FileUID` value of an attachment found in this Segment.
+ A UID that identifies the Attachment(s) that the tags belong to.
+ If the value is 0 at this level, the tags apply to all the attachments in the `Segment`.
+If set to any other value, it **MUST** match the `FileUID` value of an attachment found in this `Segment`.
Contains general information about the target.
@@ -1672,20 +1682,20 @@ If set to any other value, it **MUST** match the `FileUID` value of an attachmen
- The name of the Tag that is going to be stored.
+ The name of the tag value that is going to be stored.
- Specifies the language of the tag specified,
+ Specifies the language of the specified tag
in the Matroska languages form; see (#language-codes) on language codes.
-This Element **MUST** be ignored if the TagLanguageBCP47 Element is used within the same SimpleTag Element.
+This element **MUST** be ignored if the `TagLanguageBCP47` element is used within the same `SimpleTag` element.
- The language used in the TagString,
-in the [@!BCP47] form; see (#language-codes) on language codes.
-If this Element is used, then any TagLanguage Elements used in the same SimpleTag **MUST** be ignored.
+ The language used in the `TagString`,
+in the form defined in [@!RFC5646]; see (#language-codes) on language codes.
+If this element is used, then any `TagLanguage` elements used in the same `SimpleTag` **MUST** be ignored.
@@ -1693,14 +1703,14 @@ If this Element is used, then any TagLanguage Elements used in the same SimpleTa
- A variant of the TagDefault element with a bogus Element ID; see (#tagdefault-element).
+ A variant of the `TagDefault` element with a bogus element ID; see (#tagdefault-element).
- The value of the Tag.
+ The tag value.
- The values of the Tag, if it is binary. Note that this cannot be used in the same SimpleTag as TagString.
+ The tag value if it is binary. Note that this cannot be used in the same `SimpleTag` as `TagString`.
diff --git a/format/matroska/ebml_matroska/ebml_matroska_gen.go b/format/matroska/ebml_matroska/ebml_matroska_gen.go
index 000eb27ef..7b18f9ab5 100644
--- a/format/matroska/ebml_matroska/ebml_matroska_gen.go
+++ b/format/matroska/ebml_matroska/ebml_matroska_gen.go
@@ -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 chosen",
+ Definition: "A randomly generated UID that identifies the Segment amongst many others v4 RFC4122 with all bits randomly (or pseudorandomly) chosen",
},
}
var SegmentFilenameElement = &ebml.UTF8{
@@ -387,7 +387,7 @@ var PrevUUIDElement = &ebml.Binary{
ID: PrevUUIDID,
ParentID: InfoID,
Name: "prev_uuid",
- Definition: "An ID to identify the previous Segment of a Linked Segment",
+ Definition: "An ID that identifies the previous Segment of a Linked Segment",
},
}
var PrevFilenameElement = &ebml.UTF8{
@@ -403,7 +403,7 @@ var NextUUIDElement = &ebml.Binary{
ID: NextUUIDID,
ParentID: InfoID,
Name: "next_uuid",
- Definition: "An ID to identify the next Segment of a Linked Segment",
+ Definition: "An ID that identifies the next Segment of a Linked Segment",
},
}
var NextFilenameElement = &ebml.UTF8{
@@ -419,7 +419,7 @@ var SegmentFamilyElement = &ebml.Binary{
ID: SegmentFamilyID,
ParentID: InfoID,
Name: "segment_family",
- Definition: "A unique ID that all Segments of a Linked Segment **MUST** share chosen",
+ Definition: "A UID that all Segments of a Linked Segment **MUST** share chosen",
},
}
var TimestampScaleElement = &ebml.Uinteger{
@@ -497,11 +497,7 @@ var ChapterTranslateCodecElement = &ebml.Uinteger{
ID: ChapterTranslateCodecID,
ParentID: ChapterTranslateID,
Name: "chapter_translate_codec",
- Definition: "This ChapterTranslate applies to this chapter codec of the given chapter edition",
- },
- Enums: map[uint64]ebml.Enum{
- 0: {Name: "matroska_script", Description: "Chapter commands using the Matroska Script codec"},
- 1: {Name: "dvd_menu", Description: "Chapter commands using the DVD-like codec"},
+ Definition: "Applies to the chapter codec of the given chapter edition",
},
}
var ChapterTranslateEditionUIDElement = &ebml.Uinteger{
@@ -509,7 +505,7 @@ var ChapterTranslateEditionUIDElement = &ebml.Uinteger{
ID: ChapterTranslateEditionUIDID,
ParentID: ChapterTranslateID,
Name: "chapter_translate_edition_uid",
- Definition: "Specify a chapter edition UID on which this ChapterTranslate applies",
+ Definition: "Specifies a chapter edition UID to which this ChapterTranslate applies",
},
}
@@ -559,7 +555,7 @@ var SimpleBlockElement = &ebml.Binary{
ID: SimpleBlockID,
ParentID: ClusterID,
Name: "simple_block",
- Definition: "Similar to Block",
+ Definition: "Similar to Block ) but without all the extra information",
},
}
var EncryptedBlockElement = &ebml.Binary{
@@ -567,7 +563,7 @@ var EncryptedBlockElement = &ebml.Binary{
ID: EncryptedBlockID,
ParentID: ClusterID,
Name: "encrypted_block",
- Definition: "Similar to SimpleBlock",
+ Definition: "Similar to SimpleBlock )",
},
}
@@ -587,7 +583,7 @@ var SilentTrackNumberElement = &ebml.Uinteger{
ID: SilentTrackNumberID,
ParentID: SilentTracksID,
Name: "silent_track_number",
- Definition: "One of the track number that are not used from now on in the stream",
+ Definition: "One of the track numbers that is not used from now on in the stream",
},
}
@@ -682,7 +678,7 @@ var BlockAdditionsElement = &ebml.Master{
ID: BlockAdditionsID,
ParentID: BlockGroupID,
Name: "block_additions",
- Definition: "Contain additional binary data to complete the main one",
+ Definition: "Contains additional binary data to complete the Block element",
},
Master: map[ebml.ID]ebml.Element{
BlockMoreID: BlockMoreElement,
@@ -694,7 +690,7 @@ var BlockMoreElement = &ebml.Master{
ID: BlockMoreID,
ParentID: BlockAdditionsID,
Name: "block_more",
- Definition: "Contain the BlockAdditional and some parameters",
+ Definition: "Contains the BlockAdditional and some parameters",
},
Master: map[ebml.ID]ebml.Element{
BlockAdditionalID: BlockAdditionalElement,
@@ -714,7 +710,7 @@ var BlockAddIDElement = &ebml.Uinteger{
ID: BlockAddIDID,
ParentID: BlockMoreID,
Name: "block_add_id",
- Definition: "An ID to identify how to interpret the BlockAdditional data",
+ Definition: "An ID that identifies how to interpret the BlockAdditional data",
},
}
@@ -766,7 +762,7 @@ var BlockAdditionIDElement = &ebml.Uinteger{
ID: BlockAdditionIDID,
ParentID: TimeSliceID,
Name: "block_addition_id",
- Definition: "The ID of the BlockAdditional Element (0 is the main Block)",
+ Definition: "The ID of the BlockAdditional element",
},
}
var DelayElement = &ebml.Uinteger{
@@ -774,7 +770,7 @@ var DelayElement = &ebml.Uinteger{
ID: DelayID,
ParentID: TimeSliceID,
Name: "delay",
- Definition: "The delay to apply to the Element",
+ Definition: "The delay to apply to the element",
},
}
var SliceDurationElement = &ebml.Uinteger{
@@ -782,7 +778,7 @@ var SliceDurationElement = &ebml.Uinteger{
ID: SliceDurationID,
ParentID: TimeSliceID,
Name: "slice_duration",
- Definition: "The duration to apply to the Element",
+ Definition: "The duration to apply to the element",
},
}
@@ -832,7 +828,7 @@ var TrackEntryElement = &ebml.Master{
ID: TrackEntryID,
ParentID: TracksID,
Name: "track_entry",
- Definition: "Describes a track with all Elements",
+ Definition: "Describes a track with all elements",
},
Master: map[ebml.ID]ebml.Element{
TrackNumberID: TrackNumberElement,
@@ -894,7 +890,7 @@ var TrackUIDElement = &ebml.Uinteger{
ID: TrackUIDID,
ParentID: TrackEntryID,
Name: "track_uid",
- Definition: "A unique ID to identify the Track",
+ Definition: "A UID that identifies the Track",
},
}
var TrackTypeElement = &ebml.Uinteger{
@@ -928,7 +924,7 @@ var FlagDefaultElement = &ebml.Uinteger{
ID: FlagDefaultID,
ParentID: TrackEntryID,
Name: "flag_default",
- Definition: "Set if that track is eligible for automatic selection by the player",
+ Definition: "Set to 1 if the track is eligible for automatic selection by the player",
},
}
var FlagForcedElement = &ebml.Uinteger{
@@ -944,7 +940,7 @@ var FlagHearingImpairedElement = &ebml.Uinteger{
ID: FlagHearingImpairedID,
ParentID: TrackEntryID,
Name: "flag_hearing_impaired",
- Definition: "Set to 1 if and only if that track is suitable for users with hearing impairments",
+ Definition: "Set to 1 if and only if the track is suitable for users with hearing impairments",
},
}
var FlagVisualImpairedElement = &ebml.Uinteger{
@@ -952,7 +948,7 @@ var FlagVisualImpairedElement = &ebml.Uinteger{
ID: FlagVisualImpairedID,
ParentID: TrackEntryID,
Name: "flag_visual_impaired",
- Definition: "Set to 1 if and only if that track is suitable for users with visual impairments",
+ Definition: "Set to 1 if and only if the track is suitable for users with visual impairments",
},
}
var FlagTextDescriptionsElement = &ebml.Uinteger{
@@ -960,7 +956,7 @@ var FlagTextDescriptionsElement = &ebml.Uinteger{
ID: FlagTextDescriptionsID,
ParentID: TrackEntryID,
Name: "flag_text_descriptions",
- Definition: "Set to 1 if and only if that track contains textual descriptions of video content",
+ Definition: "Set to 1 if and only if the track contains textual descriptions of video content",
},
}
var FlagOriginalElement = &ebml.Uinteger{
@@ -968,7 +964,7 @@ var FlagOriginalElement = &ebml.Uinteger{
ID: FlagOriginalID,
ParentID: TrackEntryID,
Name: "flag_original",
- Definition: "Set to 1 if and only if that track is in the content's original language",
+ Definition: "Set to 1 if and only if the track is in the content's original language",
},
}
var FlagCommentaryElement = &ebml.Uinteger{
@@ -976,7 +972,7 @@ var FlagCommentaryElement = &ebml.Uinteger{
ID: FlagCommentaryID,
ParentID: TrackEntryID,
Name: "flag_commentary",
- Definition: "Set to 1 if and only if that track contains commentary",
+ Definition: "Set to 1 if and only if the track contains commentary",
},
}
var FlagLacingElement = &ebml.Uinteger{
@@ -984,7 +980,7 @@ var FlagLacingElement = &ebml.Uinteger{
ID: FlagLacingID,
ParentID: TrackEntryID,
Name: "flag_lacing",
- Definition: "Set to 1 if the track **MAY** contain blocks using lacing",
+ Definition: "Set to 1 if the track **MAY** contain blocks that use lacing",
},
}
var MinCacheElement = &ebml.Uinteger{
@@ -1120,7 +1116,7 @@ var CodecDownloadURLElement = &ebml.String{
ID: CodecDownloadURLID,
ParentID: TrackEntryID,
Name: "codec_download_url",
- Definition: "A URL to download about the codec used",
+ Definition: "A URL to download information about the codec used",
},
}
var CodecDecodeAllElement = &ebml.Uinteger{
@@ -1144,7 +1140,7 @@ var CodecDelayElement = &ebml.Uinteger{
ID: CodecDelayID,
ParentID: TrackEntryID,
Name: "codec_delay",
- Definition: "CodecDelay is The codec-built-in delay",
+ Definition: "The built-in delay for the codec",
},
}
var SeekPreRollElement = &ebml.Uinteger{
@@ -1168,7 +1164,7 @@ var TrickTrackSegmentUIDElement = &ebml.Binary{
ID: TrickTrackSegmentUIDID,
ParentID: TrackEntryID,
Name: "trick_track_segment_uid",
- Definition: "The SegmentUID of the Segment containing the track identified by TrickTrackUID",
+ Definition: "The SegmentUUID of the Segment containing the track identified by TrickTrackUID",
},
}
var TrickTrackFlagElement = &ebml.Uinteger{
@@ -1192,7 +1188,7 @@ var TrickMasterTrackSegmentUIDElement = &ebml.Binary{
ID: TrickMasterTrackSegmentUIDID,
ParentID: TrackEntryID,
Name: "trick_master_track_segment_uid",
- Definition: "The SegmentUID of the Segment containing the track identified by MasterTrackUID",
+ Definition: "The SegmentUUID of the Segment containing the track identified by MasterTrackUID",
},
}
@@ -1201,7 +1197,7 @@ var BlockAdditionMappingElement = &ebml.Master{
ID: BlockAdditionMappingID,
ParentID: TrackEntryID,
Name: "block_addition_mapping",
- Definition: "Contains elements that extend the track format",
+ Definition: "Contains elements that extend the track format by adding content either to each frame",
},
Master: map[ebml.ID]ebml.Element{
BlockAddIDValueID: BlockAddIDValueElement,
@@ -1269,11 +1265,7 @@ var TrackTranslateCodecElement = &ebml.Uinteger{
ID: TrackTranslateCodecID,
ParentID: TrackTranslateID,
Name: "track_translate_codec",
- Definition: "This TrackTranslate applies to this chapter codec of the given chapter edition",
- },
- Enums: map[uint64]ebml.Enum{
- 0: {Name: "matroska_script", Description: "Chapter commands using the Matroska Script codec"},
- 1: {Name: "dvd_menu", Description: "Chapter commands using the DVD-like codec"},
+ Definition: "Applies to the chapter codec of the given chapter edition",
},
}
var TrackTranslateEditionUIDElement = &ebml.Uinteger{
@@ -1281,7 +1273,7 @@ var TrackTranslateEditionUIDElement = &ebml.Uinteger{
ID: TrackTranslateEditionUIDID,
ParentID: TrackTranslateID,
Name: "track_translate_edition_uid",
- Definition: "Specify a chapter edition UID on which this TrackTranslate applies",
+ Definition: "Specifies a chapter edition UID to which this TrackTranslate applies",
},
}
@@ -1320,7 +1312,7 @@ var FlagInterlacedElement = &ebml.Uinteger{
ID: FlagInterlacedID,
ParentID: VideoID,
Name: "flag_interlaced",
- Definition: "Specify whether the video frames in this track are interlaced",
+ Definition: "Specifies whether the video frames in this track are interlaced",
},
Enums: map[uint64]ebml.Enum{
0: {Name: "undetermined", Description: "Unknown status"},
@@ -1333,7 +1325,7 @@ var FieldOrderElement = &ebml.Uinteger{
ID: FieldOrderID,
ParentID: VideoID,
Name: "field_order",
- Definition: "Specify the field ordering of video frames in this track",
+ Definition: "Specifies the field ordering of video frames in this track",
},
Enums: map[uint64]ebml.Enum{
0: {Name: "progressive", Description: "Interlaced frames"},
@@ -1374,11 +1366,11 @@ var AlphaModeElement = &ebml.Uinteger{
ID: AlphaModeID,
ParentID: VideoID,
Name: "alpha_mode",
- Definition: "Indicate whether the BlockAdditional Element with BlockAddID of \"1\" contains Alpha data",
+ Definition: "Indicates whether the BlockAdditional element with BlockAddID of \"1\" contains Alpha data as defined by the Codec Mapping for the CodecID",
},
Enums: map[uint64]ebml.Enum{
- 0: {Name: "none", Description: "The BlockAdditional Element with BlockAddID of \"1\" does not exist or **SHOULD NOT** be considered as containing such data"},
- 1: {Name: "present", Description: "The BlockAdditional Element with BlockAddID of \"1\" contains alpha channel data"},
+ 0: {Name: "none", Description: "The BlockAdditional element with BlockAddID of \"1\" does not exist or **SHOULD NOT** be considered as containing such data"},
+ 1: {Name: "present", Description: "The BlockAdditional element with BlockAddID of \"1\" contains alpha channel data"},
},
}
var OldStereoModeElement = &ebml.Uinteger{
@@ -1464,7 +1456,7 @@ var DisplayUnitElement = &ebml.Uinteger{
ID: DisplayUnitID,
ParentID: VideoID,
Name: "display_unit",
- Definition: "How DisplayWidth & DisplayHeight are interpreted",
+ Definition: "How DisplayWidth and DisplayHeight are interpreted",
},
Enums: map[uint64]ebml.Enum{
0: {Name: "pixels"},
@@ -1479,7 +1471,7 @@ var AspectRatioTypeElement = &ebml.Uinteger{
ID: AspectRatioTypeID,
ParentID: VideoID,
Name: "aspect_ratio_type",
- Definition: "Specify the possible modifications to the aspect ratio",
+ Definition: "Specifies the possible modifications to the aspect ratio",
},
Enums: map[uint64]ebml.Enum{
0: {Name: "free_resizing"},
@@ -1492,7 +1484,7 @@ var UncompressedFourCCElement = &ebml.Binary{
ID: UncompressedFourCCID,
ParentID: VideoID,
Name: "uncompressed_four_cc",
- Definition: "Specify the uncompressed pixel format used for the Track's data as a FourCC",
+ Definition: "Specifies the uncompressed pixel format used for the Track's data as a FourCC",
},
}
var GammaValueElement = &ebml.Float{
@@ -1500,7 +1492,7 @@ var GammaValueElement = &ebml.Float{
ID: GammaValueID,
ParentID: VideoID,
Name: "gamma_value",
- Definition: "Gamma Value",
+ Definition: "Gamma value",
},
}
var FrameRateElement = &ebml.Float{
@@ -1517,7 +1509,7 @@ var ColourElement = &ebml.Master{
ID: ColourID,
ParentID: VideoID,
Name: "colour",
- Definition: "Settings describing the colour format",
+ Definition: "Settings describing the color format",
},
Master: map[ebml.ID]ebml.Element{
MatrixCoefficientsID: MatrixCoefficientsElement,
@@ -1574,7 +1566,7 @@ var ChromaSubsamplingHorzElement = &ebml.Uinteger{
ID: ChromaSubsamplingHorzID,
ParentID: ColourID,
Name: "chroma_subsampling_horz",
- Definition: "The amount of pixels to remove in the Cr and Cb channels for every pixel not removed horizontally",
+ Definition: "The number of pixels to remove in the Cr and Cb channels for every pixel not removed horizontally",
},
}
var ChromaSubsamplingVertElement = &ebml.Uinteger{
@@ -1582,7 +1574,7 @@ var ChromaSubsamplingVertElement = &ebml.Uinteger{
ID: ChromaSubsamplingVertID,
ParentID: ColourID,
Name: "chroma_subsampling_vert",
- Definition: "The amount of pixels to remove in the Cr and Cb channels for every pixel not removed vertically",
+ Definition: "The number of pixels to remove in the Cr and Cb channels for every pixel not removed vertically",
},
}
var CbSubsamplingHorzElement = &ebml.Uinteger{
@@ -1590,7 +1582,7 @@ var CbSubsamplingHorzElement = &ebml.Uinteger{
ID: CbSubsamplingHorzID,
ParentID: ColourID,
Name: "cb_subsampling_horz",
- Definition: "The amount of pixels to remove in the Cb channel for every pixel not removed horizontally",
+ Definition: "The number of pixels to remove in the Cb channel for every pixel not removed horizontally",
},
}
var CbSubsamplingVertElement = &ebml.Uinteger{
@@ -1598,7 +1590,7 @@ var CbSubsamplingVertElement = &ebml.Uinteger{
ID: CbSubsamplingVertID,
ParentID: ColourID,
Name: "cb_subsampling_vert",
- Definition: "The amount of pixels to remove in the Cb channel for every pixel not removed vertically",
+ Definition: "The number of pixels to remove in the Cb channel for every pixel not removed vertically",
},
}
var ChromaSitingHorzElement = &ebml.Uinteger{
@@ -1675,7 +1667,7 @@ var PrimariesElement = &ebml.Uinteger{
ID: PrimariesID,
ParentID: ColourID,
Name: "primaries",
- Definition: "The colour primaries of the video",
+ Definition: "The color primaries of the video",
},
Enums: map[uint64]ebml.Enum{
0: {Name: "reserved"},
@@ -1903,7 +1895,7 @@ var OutputSamplingFrequencyElement = &ebml.Float{
ID: OutputSamplingFrequencyID,
ParentID: AudioID,
Name: "output_sampling_frequency",
- Definition: "Real output sampling frequency in Hz",
+ Definition: "Real output sampling frequency in Hz that is used for Spectral Band Replication (SBR) techniques",
},
}
var ChannelsElement = &ebml.Uinteger{
@@ -1984,7 +1976,7 @@ var TrackPlaneElement = &ebml.Master{
ID: TrackPlaneID,
ParentID: TrackCombinePlanesID,
Name: "track_plane",
- Definition: "Contains a video plane track that need to be combined to create this 3D track",
+ Definition: "Contains a video plane track that needs to be combined to create this 3D track",
},
Master: map[ebml.ID]ebml.Element{
TrackPlaneUIDID: TrackPlaneUIDElement,
@@ -1996,7 +1988,7 @@ var TrackPlaneUIDElement = &ebml.Uinteger{
ID: TrackPlaneUIDID,
ParentID: TrackPlaneID,
Name: "track_plane_uid",
- Definition: "The trackUID number of the track representing the plane",
+ Definition: "The TrackUID number of the track representing the plane",
},
}
var TrackPlaneTypeElement = &ebml.Uinteger{
@@ -2029,7 +2021,7 @@ var TrackJoinUIDElement = &ebml.Uinteger{
ID: TrackJoinUIDID,
ParentID: TrackJoinBlocksID,
Name: "track_join_uid",
- Definition: "The trackUID number of a track whose blocks are used to create this virtual track",
+ Definition: "The TrackUID number of a track whose blocks are used to create this virtual track",
},
}
@@ -2065,7 +2057,7 @@ var ContentEncodingOrderElement = &ebml.Uinteger{
ID: ContentEncodingOrderID,
ParentID: ContentEncodingID,
Name: "content_encoding_order",
- Definition: "Tell in which order to apply each ContentEncoding of the ContentEncodings",
+ Definition: "Defines the order to apply each ContentEncoding of the ContentEncodings",
},
}
var ContentEncodingScopeElement = &ebml.Uinteger{
@@ -2073,7 +2065,7 @@ var ContentEncodingScopeElement = &ebml.Uinteger{
ID: ContentEncodingScopeID,
ParentID: ContentEncodingID,
Name: "content_encoding_scope",
- Definition: "A bit field that describes which Elements have been modified in this way",
+ Definition: "A bit field that describes which elements have been modified in this way",
},
Enums: map[uint64]ebml.Enum{
1: {Name: "block", Description: "All frame contents"},
@@ -2086,7 +2078,7 @@ var ContentEncodingTypeElement = &ebml.Uinteger{
ID: ContentEncodingTypeID,
ParentID: ContentEncodingID,
Name: "content_encoding_type",
- Definition: "A value describing what kind of transformation is applied",
+ Definition: "A value describing the kind of transformation that is applied",
},
Enums: map[uint64]ebml.Enum{
0: {Name: "compression"},
@@ -2115,8 +2107,8 @@ var ContentCompAlgoElement = &ebml.Uinteger{
},
Enums: map[uint64]ebml.Enum{
0: {Name: "zlib", Description: "zlib compression RFC1950"},
- 1: {Name: "bzlib", Description: "bzip2 compression BZIP2"},
- 2: {Name: "lzo1x", Description: "Lempel-Ziv-Oberhumer compression LZO"},
+ 1: {Name: "bzlib", Description: "bzip2 compression BZIP2 **SHOULD NOT** be used"},
+ 2: {Name: "lzo1x", Description: "Lempel-Ziv-Oberhumer compression LZO **SHOULD NOT** be used"},
3: {Name: "header_stripping", Description: "Octets in ContentCompSettings have been stripped from each frame"},
},
}
@@ -2155,11 +2147,11 @@ var ContentEncAlgoElement = &ebml.Uinteger{
},
Enums: map[uint64]ebml.Enum{
0: {Name: "not_encrypted", Description: "The data are not encrypted"},
- 1: {Name: "des", Description: "Data Encryption Standard (DES) FIPS"},
- 2: {Name: "3des", Description: "Triple Data Encryption Algorithm SP"},
+ 1: {Name: "des", Description: "Data Encryption Standard (DES) FIPS46-3"},
+ 2: {Name: "3des", Description: "Triple Data Encryption Algorithm SP800-67"},
3: {Name: "twofish", Description: "Twofish Encryption Algorithm Twofish"},
4: {Name: "blowfish", Description: "Blowfish Encryption Algorithm Blowfish"},
- 5: {Name: "aes", Description: "Advanced Encryption Standard (AES) FIPS"},
+ 5: {Name: "aes", Description: "Advanced Encryption Standard (AES) FIPS197"},
},
}
var ContentEncKeyIDElement = &ebml.Binary{
@@ -2167,7 +2159,7 @@ var ContentEncKeyIDElement = &ebml.Binary{
ID: ContentEncKeyIDID,
ParentID: ContentEncryptionID,
Name: "content_enc_key_id",
- Definition: "For public key algorithms this is the ID of the public key the data was encrypted with",
+ Definition: "For public key algorithms",
},
}
var ContentSignatureElement = &ebml.Binary{
@@ -2183,7 +2175,7 @@ var ContentSigKeyIDElement = &ebml.Binary{
ID: ContentSigKeyIDID,
ParentID: ContentEncryptionID,
Name: "content_sig_key_id",
- Definition: "This is the ID of the private key the data was signed with",
+ Definition: "This is the ID of the private key that the data was signed with",
},
}
var ContentSigAlgoElement = &ebml.Uinteger{
@@ -2231,8 +2223,8 @@ var AESSettingsCipherModeElement = &ebml.Uinteger{
Definition: "The AES cipher mode used in the encryption",
},
Enums: map[uint64]ebml.Enum{
- 1: {Name: "aes_ctr", Description: "Counter SP"},
- 2: {Name: "aes_cbc", Description: "Cipher Block Chaining SP"},
+ 1: {Name: "aes_ctr", Description: "Counter SP800-38A"},
+ 2: {Name: "aes_cbc", Description: "Cipher Block Chaining SP800-38A"},
},
}
@@ -2274,7 +2266,7 @@ var CueTrackPositionsElement = &ebml.Master{
ID: CueTrackPositionsID,
ParentID: CuePointID,
Name: "cue_track_positions",
- Definition: "Contain positions for different tracks corresponding to the timestamp",
+ Definition: "Contains positions for different tracks corresponding to the timestamp",
},
Master: map[ebml.ID]ebml.Element{
CueTrackID: CueTrackElement,
@@ -2307,7 +2299,7 @@ var CueRelativePositionElement = &ebml.Uinteger{
ID: CueRelativePositionID,
ParentID: CueTrackPositionsID,
Name: "cue_relative_position",
- Definition: "The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an Element inside that Cluster",
+ Definition: "The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an element inside that Cluster",
},
}
var CueDurationElement = &ebml.Uinteger{
@@ -2331,7 +2323,7 @@ var CueCodecStateElement = &ebml.Uinteger{
ID: CueCodecStateID,
ParentID: CueTrackPositionsID,
Name: "cue_codec_state",
- Definition: "The Segment Position of the Codec State corresponding to this Cue Element",
+ Definition: "The Segment Position of the Codec State corresponding to this Cues element",
},
}
@@ -2378,7 +2370,7 @@ var CueRefCodecStateElement = &ebml.Uinteger{
ID: CueRefCodecStateID,
ParentID: CueReferenceID,
Name: "cue_ref_codec_state",
- Definition: "The Segment Position of the Codec State corresponding to this referenced Element",
+ Definition: "The Segment Position of the Codec State corresponding to this referenced element",
},
}
@@ -2387,7 +2379,7 @@ var AttachmentsElement = &ebml.Master{
ID: AttachmentsID,
ParentID: SegmentID,
Name: "attachments",
- Definition: "Contain attached files",
+ Definition: "Contains attached files",
},
Master: map[ebml.ID]ebml.Element{
AttachedFileID: AttachedFileElement,
@@ -2433,7 +2425,7 @@ var FileMediaTypeElement = &ebml.String{
ID: FileMediaTypeID,
ParentID: AttachedFileID,
Name: "file_media_type",
- Definition: "Media type of the file following the RFC6838 format",
+ Definition: "Media type of the file following the format described in RFC6838",
},
}
var FileDataElement = &ebml.Binary{
@@ -2449,7 +2441,7 @@ var FileUIDElement = &ebml.Uinteger{
ID: FileUIDID,
ParentID: AttachedFileID,
Name: "file_uid",
- Definition: "Unique ID representing the file",
+ Definition: "UID representing the file",
},
}
var FileReferralElement = &ebml.Binary{
@@ -2510,7 +2502,7 @@ var EditionUIDElement = &ebml.Uinteger{
ID: EditionUIDID,
ParentID: EditionEntryID,
Name: "edition_uid",
- Definition: "A unique ID to identify the edition",
+ Definition: "A UID that identifies the edition",
},
}
var EditionFlagHiddenElement = &ebml.Uinteger{
@@ -2572,7 +2564,7 @@ var ChapterAtomElement = &ebml.Master{
ID: ChapterAtomID,
ParentID: EditionEntryID,
Name: "chapter_atom",
- Definition: "Contains the atom information to use as the chapter atom (apply to all tracks)",
+ Definition: "Contains the atom information to use as the chapter atom",
},
Master: map[ebml.ID]ebml.Element{
ChapterUIDID: ChapterUIDElement,
@@ -2595,7 +2587,7 @@ var ChapterUIDElement = &ebml.Uinteger{
ID: ChapterUIDID,
ParentID: ChapterAtomID,
Name: "chapter_uid",
- Definition: "A unique ID to identify the Chapter",
+ Definition: "A UID that identifies the Chapter",
},
}
var ChapterStringUIDElement = &ebml.UTF8{
@@ -2603,7 +2595,7 @@ var ChapterStringUIDElement = &ebml.UTF8{
ID: ChapterStringUIDID,
ParentID: ChapterAtomID,
Name: "chapter_string_uid",
- Definition: "A unique string ID to identify the Chapter",
+ Definition: "A unique string ID that identifies the Chapter",
},
}
var ChapterTimeStartElement = &ebml.Uinteger{
@@ -2619,7 +2611,7 @@ var ChapterTimeEndElement = &ebml.Uinteger{
ID: ChapterTimeEndID,
ParentID: ChapterAtomID,
Name: "chapter_time_end",
- Definition: "Timestamp of the end of Chapter timestamp excluded",
+ Definition: "Timestamp of the end of Chapter ",
},
}
var ChapterFlagHiddenElement = &ebml.Uinteger{
@@ -2651,7 +2643,7 @@ var ChapterSkipTypeElement = &ebml.Uinteger{
ID: ChapterSkipTypeID,
ParentID: ChapterAtomID,
Name: "chapter_skip_type",
- Definition: "Indicate what type of content the ChapterAtom contains and might be skipped",
+ Definition: "Indicates what type of content the ChapterAtom contains and might be skipped",
},
Enums: map[uint64]ebml.Enum{
0: {Name: "no_skipping", Description: "Content which should not be skipped"},
@@ -2676,7 +2668,7 @@ var ChapterPhysicalEquivElement = &ebml.Uinteger{
ID: ChapterPhysicalEquivID,
ParentID: ChapterAtomID,
Name: "chapter_physical_equiv",
- Definition: "Specify the physical equivalent of this ChapterAtom like \"DVD\" (60) or \"SIDE\" (50)",
+ Definition: "Specifies the physical equivalent of this ChapterAtom",
},
}
@@ -2752,7 +2744,7 @@ var ChapProcessElement = &ebml.Master{
ID: ChapProcessID,
ParentID: ChapterAtomID,
Name: "chap_process",
- Definition: "Contains all the commands associated to the Atom",
+ Definition: "Contains all the commands associated with the Atom",
},
Master: map[ebml.ID]ebml.Element{
ChapProcessCodecIDID: ChapProcessCodecIDElement,
@@ -2765,7 +2757,11 @@ var ChapProcessCodecIDElement = &ebml.Uinteger{
ID: ChapProcessCodecIDID,
ParentID: ChapProcessID,
Name: "chap_process_codec_id",
- Definition: "Contains the type of the codec used for the processing",
+ Definition: "Contains the type of the codec used for processing",
+ },
+ Enums: map[uint64]ebml.Enum{
+ 0: {Name: "matroska_script", Description: "Chapter commands using the Matroska Script codec"},
+ 1: {Name: "dvd_menu", Description: "Chapter commands using the DVD-like codec"},
},
}
var ChapProcessPrivateElement = &ebml.Binary{
@@ -2773,7 +2769,7 @@ var ChapProcessPrivateElement = &ebml.Binary{
ID: ChapProcessPrivateID,
ParentID: ChapProcessID,
Name: "chap_process_private",
- Definition: "Some optional data attached to the ChapProcessCodecID information",
+ Definition: "Optional data attached to the ChapProcessCodecID information",
},
}
@@ -2782,7 +2778,7 @@ var ChapProcessCommandElement = &ebml.Master{
ID: ChapProcessCommandID,
ParentID: ChapProcessID,
Name: "chap_process_command",
- Definition: "Contains all the commands associated to the Atom",
+ Definition: "Contains all the commands associated with the Atom",
},
Master: map[ebml.ID]ebml.Element{
ChapProcessTimeID: ChapProcessTimeElement,
@@ -2841,7 +2837,7 @@ var TargetsElement = &ebml.Master{
ID: TargetsID,
ParentID: TagID,
Name: "targets",
- Definition: "Specifies which other elements the metadata represented by the Tag applies to",
+ Definition: "Specifies which other elements the metadata represented by the tag value applies to",
},
Master: map[ebml.ID]ebml.Element{
TargetTypeValueID: TargetTypeValueElement,
@@ -2860,13 +2856,13 @@ var TargetTypeValueElement = &ebml.Uinteger{
Definition: "A number to indicate the logical level of the target",
},
Enums: map[uint64]ebml.Enum{
- 70: {Name: "collection", Description: "The highest hierarchical level that tags can describe"},
- 60: {Name: "edition_issue_volume_opus_season_sequel", Description: "A list of lower levels grouped together"},
- 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_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"},
+ 20: {Name: "subtrack_movement_scene", Description: "Corresponds to parts of a track for audio"},
+ 30: {Name: "track_song_chapter", Description: "The common parts of an album or movie"},
+ 40: {Name: "part_session", Description: "When an album or episode has different logical parts"},
+ 50: {Name: "album_opera_concert_movie_episode", Description: "The most common grouping level of music and video"},
+ 60: {Name: "edition_issue_volume_opus_season_sequel", Description: "A list of lower levels grouped together"},
+ 70: {Name: "collection", Description: "The highest hierarchical level that tags can describe"},
},
}
var TargetTypeElement = &ebml.String{
@@ -2874,7 +2870,7 @@ var TargetTypeElement = &ebml.String{
ID: TargetTypeID,
ParentID: TargetsID,
Name: "target_type",
- Definition: "An informational string that can be used to display the logical level of the target like \"ALBUM\"",
+ Definition: "An informational string that can be used to display the logical level of the target",
},
Enums: map[string]ebml.Enum{
"COLLECTION": {Name: "targettypevalue_70"},
@@ -2905,7 +2901,7 @@ var TagTrackUIDElement = &ebml.Uinteger{
ID: TagTrackUIDID,
ParentID: TargetsID,
Name: "tag_track_uid",
- Definition: "A unique ID to identify the Track(s) the tags belong to",
+ Definition: "A UID that identifies the Track(s) that the tags belong to",
},
}
var TagEditionUIDElement = &ebml.Uinteger{
@@ -2913,7 +2909,7 @@ var TagEditionUIDElement = &ebml.Uinteger{
ID: TagEditionUIDID,
ParentID: TargetsID,
Name: "tag_edition_uid",
- Definition: "A unique ID to identify the EditionEntry(s) the tags belong to",
+ Definition: "A UID that identifies the EditionEntry(s) that the tags belong to",
},
}
var TagChapterUIDElement = &ebml.Uinteger{
@@ -2921,7 +2917,7 @@ var TagChapterUIDElement = &ebml.Uinteger{
ID: TagChapterUIDID,
ParentID: TargetsID,
Name: "tag_chapter_uid",
- Definition: "A unique ID to identify the Chapter(s) the tags belong to",
+ Definition: "A UID that identifies the Chapter(s) that the tags belong to",
},
}
var TagAttachmentUIDElement = &ebml.Uinteger{
@@ -2929,7 +2925,7 @@ var TagAttachmentUIDElement = &ebml.Uinteger{
ID: TagAttachmentUIDID,
ParentID: TargetsID,
Name: "tag_attachment_uid",
- Definition: "A unique ID to identify the Attachment(s) the tags belong to",
+ Definition: "A UID that identifies the Attachment(s) that the tags belong to",
},
}
@@ -2955,7 +2951,7 @@ var TagNameElement = &ebml.UTF8{
ID: TagNameID,
ParentID: SimpleTagID,
Name: "tag_name",
- Definition: "The name of the Tag that is going to be stored",
+ Definition: "The name of the tag value that is going to be stored",
},
}
var TagLanguageElement = &ebml.String{
@@ -2963,7 +2959,7 @@ var TagLanguageElement = &ebml.String{
ID: TagLanguageID,
ParentID: SimpleTagID,
Name: "tag_language",
- Definition: "Specifies the language of the tag specified",
+ Definition: "Specifies the language of the specified tag in the Matroska languages form",
},
}
var TagLanguageBCP47Element = &ebml.String{
@@ -2987,7 +2983,7 @@ var TagDefaultBogusElement = &ebml.Uinteger{
ID: TagDefaultBogusID,
ParentID: SimpleTagID,
Name: "tag_default_bogus",
- Definition: "A variant of the TagDefault element with a bogus Element ID",
+ Definition: "A variant of the TagDefault element with a bogus element ID",
},
}
var TagStringElement = &ebml.UTF8{
@@ -2995,7 +2991,7 @@ var TagStringElement = &ebml.UTF8{
ID: TagStringID,
ParentID: SimpleTagID,
Name: "tag_string",
- Definition: "The value of the Tag",
+ Definition: "The tag value",
},
}
var TagBinaryElement = &ebml.Binary{
@@ -3003,7 +2999,7 @@ var TagBinaryElement = &ebml.Binary{
ID: TagBinaryID,
ParentID: SimpleTagID,
Name: "tag_binary",
- Definition: "The values of the Tag",
+ Definition: "The tag value if it is binary",
},
}
diff --git a/format/matroska/testdata/aac.fqtest b/format/matroska/testdata/aac.fqtest
index 4577ca046..983458cc2 100644
--- a/format/matroska/testdata/aac.fqtest
+++ b/format/matroska/testdata/aac.fqtest
@@ -155,7 +155,7 @@ $ fq -d matroska dv aac.mkv
0x0f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x107 (13)
0x100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x11a (19)
-0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x109 (2)
+0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated UID that identifies the Segment amongst many others v4 RFC4122 with all bits randomly (or pseudorandomly) chosen) 0x107-0x109 (2)
| | | type: "binary"
0x100| 90 | . | size: 16 0x109-0x10a (1)
0x100| 17 bd f9 34 6e 97| ...4n.| value: raw bits 0x10a-0x11a (16)
@@ -177,7 +177,7 @@ $ fq -d matroska dv aac.mkv
0x120| 84 | . | size: 4 0x12b-0x12c (1)
0x120| e5 a6 af af| ....| value: raw bits 0x12c-0x130 (4)
| | | [1]{}: element 0x130-0x176 (70)
-0x130|ae |. | id: "track_entry" (0xae) (Describes a track with all Elements) 0x130-0x131 (1)
+0x130|ae |. | id: "track_entry" (0xae) (Describes a track with all elements) 0x130-0x131 (1)
| | | type: "master"
0x130| 01 00 00 00 00 00 00 3d | .......= | size: 61 0x131-0x139 (8)
| | | elements[0:8]: 0x139-0x176 (61)
@@ -187,13 +187,13 @@ $ fq -d matroska dv aac.mkv
0x130| 81 | . | size: 1 0x13a-0x13b (1)
0x130| 01 | . | value: 1 0x13b-0x13c (1)
| | | [1]{}: element 0x13c-0x147 (11)
-0x130| 73 c5 | s. | id: "track_uid" (0x73c5) (A unique ID to identify the Track) 0x13c-0x13e (2)
+0x130| 73 c5 | s. | id: "track_uid" (0x73c5) (A UID that identifies the Track) 0x13c-0x13e (2)
| | | type: "uinteger"
0x130| 88 | . | size: 8 0x13e-0x13f (1)
0x130| f7| .| value: 17862762257755232487 0x13f-0x147 (8)
0x140|e5 47 a1 e8 c1 58 e7 |.G...X. |
| | | [2]{}: element 0x147-0x14a (3)
-0x140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks using lacing) 0x147-0x148 (1)
+0x140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks that use lacing) 0x147-0x148 (1)
| | | type: "uinteger"
0x140| 81 | . | size: 1 0x148-0x149 (1)
0x140| 00 | . | value: 0 0x149-0x14a (1)
@@ -259,7 +259,7 @@ $ fq -d matroska dv aac.mkv
0x180| 01 00 00 00 00 00 00 27 | .......' | size: 39 0x184-0x18c (8)
| | | elements[0:2]: 0x18c-0x1b3 (39)
| | | [0]{}: element 0x18c-0x18f (3)
-0x180| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0x18c-0x18e (2)
+0x180| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0x18c-0x18e (2)
| | | type: "master"
0x180| 80 | . | size: 0 0x18e-0x18f (1)
| | | elements[0:0]: 0x18f-0x18f (0)
@@ -270,13 +270,13 @@ $ fq -d matroska dv aac.mkv
0x190| 01 00 00 00 00 00 00 1a | ........ | size: 26 0x191-0x199 (8)
| | | elements[0:2]: 0x199-0x1b3 (26)
| | | [0]{}: element 0x199-0x1a3 (10)
-0x190| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x199-0x19b (2)
+0x190| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x199-0x19b (2)
| | | type: "utf8"
0x190| 87 | . | size: 7 0x19b-0x19c (1)
0x190| 45 4e 43 4f| ENCO| value: "ENCODER" 0x19c-0x1a3 (7)
0x1a0|44 45 52 |DER |
| | | [1]{}: element 0x1a3-0x1b3 (16)
-0x1a0| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x1a3-0x1a5 (2)
+0x1a0| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x1a3-0x1a5 (2)
| | | type: "utf8"
0x1a0| 8d | . | size: 13 0x1a5-0x1a6 (1)
0x1a0| 4c 61 76 66 35 38 2e 34 35 2e| Lavf58.45.| value: "Lavf58.45.100" 0x1a6-0x1b3 (13)
@@ -287,12 +287,12 @@ $ fq -d matroska dv aac.mkv
0x1b0| 01 00 00 00 00 00 00 5b | .......[ | size: 91 0x1b5-0x1bd (8)
| | | elements[0:3]: 0x1bd-0x218 (91)
| | | [0]{}: element 0x1bd-0x1cb (14)
-0x1b0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0x1bd-0x1bf (2)
+0x1b0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0x1bd-0x1bf (2)
| | | type: "master"
0x1b0| 8b| .| size: 11 0x1bf-0x1c0 (1)
| | | elements[0:1]: 0x1c0-0x1cb (11)
| | | [0]{}: element 0x1c0-0x1cb (11)
-0x1c0|63 c5 |c. | id: "tag_track_uid" (0x63c5) (A unique ID to identify the Track(s) the tags belong to) 0x1c0-0x1c2 (2)
+0x1c0|63 c5 |c. | id: "tag_track_uid" (0x63c5) (A UID that identifies the Track(s) that the tags belong to) 0x1c0-0x1c2 (2)
| | | type: "uinteger"
0x1c0| 88 | . | size: 8 0x1c2-0x1c3 (1)
0x1c0| f7 e5 47 a1 e8 c1 58 e7 | ..G...X. | value: 17862762257755232487 0x1c3-0x1cb (8)
@@ -303,12 +303,12 @@ $ fq -d matroska dv aac.mkv
0x1d0|00 00 00 00 1e |..... |
| | | elements[0:2]: 0x1d5-0x1f3 (30)
| | | [0]{}: element 0x1d5-0x1df (10)
-0x1d0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x1d5-0x1d7 (2)
+0x1d0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x1d5-0x1d7 (2)
| | | type: "utf8"
0x1d0| 87 | . | size: 7 0x1d7-0x1d8 (1)
0x1d0| 45 4e 43 4f 44 45 52 | ENCODER | value: "ENCODER" 0x1d8-0x1df (7)
| | | [1]{}: element 0x1df-0x1f3 (20)
-0x1d0| 44| D| id: "tag_string" (0x4487) (The value of the Tag) 0x1df-0x1e1 (2)
+0x1d0| 44| D| id: "tag_string" (0x4487) (The tag value) 0x1df-0x1e1 (2)
0x1e0|87 |. |
| | | type: "utf8"
0x1e0| 91 | . | size: 17 0x1e1-0x1e2 (1)
@@ -320,13 +320,13 @@ $ fq -d matroska dv aac.mkv
0x1f0| a2 | . | size: 34 0x1f5-0x1f6 (1)
| | | elements[0:2]: 0x1f6-0x218 (34)
| | | [0]{}: element 0x1f6-0x201 (11)
-0x1f0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x1f6-0x1f8 (2)
+0x1f0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x1f6-0x1f8 (2)
| | | type: "utf8"
0x1f0| 88 | . | size: 8 0x1f8-0x1f9 (1)
0x1f0| 44 55 52 41 54 49 4f| DURATIO| value: "DURATION" 0x1f9-0x201 (8)
0x200|4e |N |
| | | [1]{}: element 0x201-0x218 (23)
-0x200| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x201-0x203 (2)
+0x200| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x201-0x203 (2)
| | | type: "utf8"
0x200| 94 | . | size: 20 0x203-0x204 (1)
0x200| 30 30 3a 30 30 3a 30 30 2e 30 37 33| 00:00:00.073| value: "00:00:00.073000000" 0x204-0x218 (20)
@@ -347,7 +347,7 @@ $ fq -d matroska dv aac.mkv
0x220| 81 | . | size: 1 0x225-0x226 (1)
0x220| 00 | . | value: 0 0x226-0x227 (1)
| | | [2]{}: element 0x227-0x2fb (212)
-0x220| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x227-0x228 (1)
+0x220| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x227-0x228 (1)
| | | type: "binary"
0x220| 40 d1 | @. | size: 209 0x228-0x22a (2)
0x220| 81 | . | track_number: 1 0x22a-0x22b (1)
@@ -386,7 +386,7 @@ $ fq -d matroska dv aac.mkv
0x250|42 08 10 0e 80 0c d5 9f 71 6c 47 12 cb b6 16 71|B.......qlG....q|
* |until 0x2fa.7 (184) | |
| | | [3]{}: element 0x2fb-0x3dc (225)
-0x2f0| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x2fb-0x2fc (1)
+0x2f0| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x2fb-0x2fc (1)
| | | type: "binary"
0x2f0| 40 de | @. | size: 222 0x2fc-0x2fe (2)
0x2f0| 81 | . | track_number: 1 0x2fe-0x2ff (1)
@@ -414,7 +414,7 @@ $ fq -d matroska dv aac.mkv
0x310|38 46 1c 9c 5e ae 85 f1 ab d5 ff 4d 7b 0f 3e 6d|8F..^......M{.>m|
* |until 0x3db.7 (214) | |
| | | [4]{}: element 0x3dc-0x49d (193)
-0x3d0| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x3dc-0x3dd (1)
+0x3d0| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x3dc-0x3dd (1)
| | | type: "binary"
0x3d0| 40 be | @. | size: 190 0x3dd-0x3df (2)
0x3d0| 81| .| track_number: 1 0x3df-0x3e0 (1)
@@ -441,7 +441,7 @@ $ fq -d matroska dv aac.mkv
0x3f0|f0 3d 04 a1 e7 5f 1d 0c ff 81 d6 bd bc da b0 65|.=..._.........e|
* |until 0x49c.7 (182) | |
| | | [5]{}: element 0x49d-0x4a8 (11)
-0x490| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x49d-0x49e (1)
+0x490| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x49d-0x49e (1)
| | | type: "binary"
0x490| 89 | . | size: 9 0x49e-0x49f (1)
0x490| 81| .| track_number: 1 0x49f-0x4a0 (1)
@@ -487,7 +487,7 @@ $ fq -d matroska dv aac.mkv
0x4b0| 81 | . | size: 1 0x4b6-0x4b7 (1)
0x4b0| 00 | . | value: 0 0x4b7-0x4b8 (1)
| | | [1]{}: element 0x4b8-0x4c4 (12)
-0x4b0| b7 | . | id: "cue_track_positions" (0xb7) (Contain positions for different tracks corresponding to the timestamp) 0x4b8-0x4b9 (1)
+0x4b0| b7 | . | id: "cue_track_positions" (0xb7) (Contains positions for different tracks corresponding to the timestamp) 0x4b8-0x4b9 (1)
| | | type: "master"
0x4b0| 8a | . | size: 10 0x4b9-0x4ba (1)
| | | elements[0:3]: 0x4ba-0x4c4 (10)
@@ -503,7 +503,7 @@ $ fq -d matroska dv aac.mkv
0x4b0| 01| .| value: 484 0x4bf-0x4c1 (2)
0x4c0|e4 |. |
| | | [2]{}: element 0x4c1-0x4c4 (3)
-0x4c0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an Element inside that Cluster) 0x4c1-0x4c2 (1)
+0x4c0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an element inside that Cluster) 0x4c1-0x4c2 (1)
| | | type: "uinteger"
0x4c0| 81 | . | size: 1 0x4c2-0x4c3 (1)
0x4c0| 09| | .| | value: 9 0x4c3-0x4c4 (1)
diff --git a/format/matroska/testdata/av1.fqtest b/format/matroska/testdata/av1.fqtest
index edd438774..93951359d 100644
--- a/format/matroska/testdata/av1.fqtest
+++ b/format/matroska/testdata/av1.fqtest
@@ -155,7 +155,7 @@ $ fq -d matroska dv av1.mkv
0x00f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x107 (13)
0x0100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x11a (19)
-0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x109 (2)
+0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated UID that identifies the Segment amongst many others v4 RFC4122 with all bits randomly (or pseudorandomly) chosen) 0x107-0x109 (2)
| | | type: "binary"
0x0100| 90 | . | size: 16 0x109-0x10a (1)
0x0100| 46 bd 6f 31 1c 40| F.o1.@| value: raw bits 0x10a-0x11a (16)
@@ -177,7 +177,7 @@ $ fq -d matroska dv av1.mkv
0x0120| 84 | . | size: 4 0x12b-0x12c (1)
0x0120| 83 29 74 24| .)t$| value: raw bits 0x12c-0x130 (4)
| | | [1]{}: element 0x130-0x17a (74)
-0x0130|ae |. | id: "track_entry" (0xae) (Describes a track with all Elements) 0x130-0x131 (1)
+0x0130|ae |. | id: "track_entry" (0xae) (Describes a track with all elements) 0x130-0x131 (1)
| | | type: "master"
0x0130| 01 00 00 00 00 00 00 41 | .......A | size: 65 0x131-0x139 (8)
| | | elements[0:9]: 0x139-0x17a (65)
@@ -187,13 +187,13 @@ $ fq -d matroska dv av1.mkv
0x0130| 81 | . | size: 1 0x13a-0x13b (1)
0x0130| 01 | . | value: 1 0x13b-0x13c (1)
| | | [1]{}: element 0x13c-0x147 (11)
-0x0130| 73 c5 | s. | id: "track_uid" (0x73c5) (A unique ID to identify the Track) 0x13c-0x13e (2)
+0x0130| 73 c5 | s. | id: "track_uid" (0x73c5) (A UID that identifies the Track) 0x13c-0x13e (2)
| | | type: "uinteger"
0x0130| 88 | . | size: 8 0x13e-0x13f (1)
0x0130| bd| .| value: 13662969948711256639 0x13f-0x147 (8)
0x0140|9c 9e c7 61 c5 82 3f |...a..? |
| | | [2]{}: element 0x147-0x14a (3)
-0x0140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks using lacing) 0x147-0x148 (1)
+0x0140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks that use lacing) 0x147-0x148 (1)
| | | type: "uinteger"
0x0140| 81 | . | size: 1 0x148-0x149 (1)
0x0140| 00 | . | value: 0 0x149-0x14a (1)
@@ -269,7 +269,7 @@ $ fq -d matroska dv av1.mkv
0x0180| 01 00 00 00 00 00 00 27| .......'| size: 39 0x188-0x190 (8)
| | | elements[0:2]: 0x190-0x1b7 (39)
| | | [0]{}: element 0x190-0x193 (3)
-0x0190|63 c0 |c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0x190-0x192 (2)
+0x0190|63 c0 |c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0x190-0x192 (2)
| | | type: "master"
0x0190| 80 | . | size: 0 0x192-0x193 (1)
| | | elements[0:0]: 0x193-0x193 (0)
@@ -279,12 +279,12 @@ $ fq -d matroska dv av1.mkv
0x0190| 01 00 00 00 00 00 00 1a | ........ | size: 26 0x195-0x19d (8)
| | | elements[0:2]: 0x19d-0x1b7 (26)
| | | [0]{}: element 0x19d-0x1a7 (10)
-0x0190| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x19d-0x19f (2)
+0x0190| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x19d-0x19f (2)
| | | type: "utf8"
0x0190| 87| .| size: 7 0x19f-0x1a0 (1)
0x01a0|45 4e 43 4f 44 45 52 |ENCODER | value: "ENCODER" 0x1a0-0x1a7 (7)
| | | [1]{}: element 0x1a7-0x1b7 (16)
-0x01a0| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x1a7-0x1a9 (2)
+0x01a0| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x1a7-0x1a9 (2)
| | | type: "utf8"
0x01a0| 8d | . | size: 13 0x1a9-0x1aa (1)
0x01a0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0x1aa-0x1b7 (13)
@@ -296,12 +296,12 @@ $ fq -d matroska dv av1.mkv
0x01c0|60 |` |
| | | elements[0:3]: 0x1c1-0x221 (96)
| | | [0]{}: element 0x1c1-0x1cf (14)
-0x01c0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0x1c1-0x1c3 (2)
+0x01c0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0x1c1-0x1c3 (2)
| | | type: "master"
0x01c0| 8b | . | size: 11 0x1c3-0x1c4 (1)
| | | elements[0:1]: 0x1c4-0x1cf (11)
| | | [0]{}: element 0x1c4-0x1cf (11)
-0x01c0| 63 c5 | c. | id: "tag_track_uid" (0x63c5) (A unique ID to identify the Track(s) the tags belong to) 0x1c4-0x1c6 (2)
+0x01c0| 63 c5 | c. | id: "tag_track_uid" (0x63c5) (A UID that identifies the Track(s) that the tags belong to) 0x1c4-0x1c6 (2)
| | | type: "uinteger"
0x01c0| 88 | . | size: 8 0x1c6-0x1c7 (1)
0x01c0| bd 9c 9e c7 61 c5 82 3f | ....a..? | value: 13662969948711256639 0x1c7-0x1cf (8)
@@ -312,13 +312,13 @@ $ fq -d matroska dv av1.mkv
0x01d0| 01 00 00 00 00 00 00 23 | .......# | size: 35 0x1d1-0x1d9 (8)
| | | elements[0:2]: 0x1d9-0x1fc (35)
| | | [0]{}: element 0x1d9-0x1e3 (10)
-0x01d0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x1d9-0x1db (2)
+0x01d0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x1d9-0x1db (2)
| | | type: "utf8"
0x01d0| 87 | . | size: 7 0x1db-0x1dc (1)
0x01d0| 45 4e 43 4f| ENCO| value: "ENCODER" 0x1dc-0x1e3 (7)
0x01e0|44 45 52 |DER |
| | | [1]{}: element 0x1e3-0x1fc (25)
-0x01e0| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x1e3-0x1e5 (2)
+0x01e0| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x1e3-0x1e5 (2)
| | | type: "utf8"
0x01e0| 96 | . | size: 22 0x1e5-0x1e6 (1)
0x01e0| 4c 61 76 63 35 38 2e 39 31 2e| Lavc58.91.| value: "Lavc58.91.100 librav1e" 0x1e6-0x1fc (22)
@@ -329,13 +329,13 @@ $ fq -d matroska dv av1.mkv
0x01f0| a2 | . | size: 34 0x1fe-0x1ff (1)
| | | elements[0:2]: 0x1ff-0x221 (34)
| | | [0]{}: element 0x1ff-0x20a (11)
-0x01f0| 45| E| id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x1ff-0x201 (2)
+0x01f0| 45| E| id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x1ff-0x201 (2)
0x0200|a3 |. |
| | | type: "utf8"
0x0200| 88 | . | size: 8 0x201-0x202 (1)
0x0200| 44 55 52 41 54 49 4f 4e | DURATION | value: "DURATION" 0x202-0x20a (8)
| | | [1]{}: element 0x20a-0x221 (23)
-0x0200| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x20a-0x20c (2)
+0x0200| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x20a-0x20c (2)
| | | type: "utf8"
0x0200| 94 | . | size: 20 0x20c-0x20d (1)
0x0200| 30 30 3a| 00:| value: "00:00:00.040000000" 0x20d-0x221 (20)
@@ -357,7 +357,7 @@ $ fq -d matroska dv av1.mkv
0x0220| 81 | . | size: 1 0x22e-0x22f (1)
0x0220| 00| .| value: 0 0x22f-0x230 (1)
| | | [2]{}: element 0x230-0x13cb (4507)
-0x0230|a3 |. | id: "simple_block" (0xa3) (Similar to Block) 0x230-0x231 (1)
+0x0230|a3 |. | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x230-0x231 (1)
| | | type: "binary"
0x0230| 51 98 | Q. | size: 4504 0x231-0x233 (2)
0x0230| 81 | . | track_number: 1 0x233-0x234 (1)
@@ -421,7 +421,7 @@ $ fq -d matroska dv av1.mkv
0x13d0| 81 | . | size: 1 0x13d9-0x13da (1)
0x13d0| 00 | . | value: 0 0x13da-0x13db (1)
| | | [1]{}: element 0x13db-0x13e7 (12)
-0x13d0| b7 | . | id: "cue_track_positions" (0xb7) (Contain positions for different tracks corresponding to the timestamp) 0x13db-0x13dc (1)
+0x13d0| b7 | . | id: "cue_track_positions" (0xb7) (Contains positions for different tracks corresponding to the timestamp) 0x13db-0x13dc (1)
| | | type: "master"
0x13d0| 8a | . | size: 10 0x13dc-0x13dd (1)
| | | elements[0:3]: 0x13dd-0x13e7 (10)
@@ -436,7 +436,7 @@ $ fq -d matroska dv av1.mkv
0x13e0| 82 | . | size: 2 0x13e1-0x13e2 (1)
0x13e0| 01 ed | .. | value: 493 0x13e2-0x13e4 (2)
| | | [2]{}: element 0x13e4-0x13e7 (3)
-0x13e0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an Element inside that Cluster) 0x13e4-0x13e5 (1)
+0x13e0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an element inside that Cluster) 0x13e4-0x13e5 (1)
| | | type: "uinteger"
0x13e0| 81 | . | size: 1 0x13e5-0x13e6 (1)
0x13e0| 09| | .| | value: 9 0x13e6-0x13e7 (1)
diff --git a/format/matroska/testdata/avc.fqtest b/format/matroska/testdata/avc.fqtest
index 22bdb8989..790ea49cc 100644
--- a/format/matroska/testdata/avc.fqtest
+++ b/format/matroska/testdata/avc.fqtest
@@ -155,7 +155,7 @@ $ fq -d matroska dv avc.mkv
0x000f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x107 (13)
0x00100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x11a (19)
-0x00100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x109 (2)
+0x00100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated UID that identifies the Segment amongst many others v4 RFC4122 with all bits randomly (or pseudorandomly) chosen) 0x107-0x109 (2)
| | | type: "binary"
0x00100| 90 | . | size: 16 0x109-0x10a (1)
0x00100| 7c 01 b0 2d a3 3f| |..-.?| value: raw bits 0x10a-0x11a (16)
@@ -178,7 +178,7 @@ $ fq -d matroska dv avc.mkv
0x00120| 3e df 62| >.b| value: raw bits 0x12d-0x131 (4)
0x00130|85 |. |
| | | [1]{}: element 0x131-0x1af (126)
-0x00130| ae | . | id: "track_entry" (0xae) (Describes a track with all Elements) 0x131-0x132 (1)
+0x00130| ae | . | id: "track_entry" (0xae) (Describes a track with all elements) 0x131-0x132 (1)
| | | type: "master"
0x00130| 01 00 00 00 00 00 00 75 | .......u | size: 117 0x132-0x13a (8)
| | | elements[0:9]: 0x13a-0x1af (117)
@@ -188,12 +188,12 @@ $ fq -d matroska dv avc.mkv
0x00130| 81 | . | size: 1 0x13b-0x13c (1)
0x00130| 01 | . | value: 1 0x13c-0x13d (1)
| | | [1]{}: element 0x13d-0x148 (11)
-0x00130| 73 c5 | s. | id: "track_uid" (0x73c5) (A unique ID to identify the Track) 0x13d-0x13f (2)
+0x00130| 73 c5 | s. | id: "track_uid" (0x73c5) (A UID that identifies the Track) 0x13d-0x13f (2)
| | | type: "uinteger"
0x00130| 88| .| size: 8 0x13f-0x140 (1)
0x00140|5c dc 49 64 84 41 76 e3 |\.Id.Av. | value: 6691303842430154467 0x140-0x148 (8)
| | | [2]{}: element 0x148-0x14b (3)
-0x00140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks using lacing) 0x148-0x149 (1)
+0x00140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks that use lacing) 0x148-0x149 (1)
| | | type: "uinteger"
0x00140| 81 | . | size: 1 0x149-0x14a (1)
0x00140| 00 | . | value: 0 0x14a-0x14b (1)
@@ -357,7 +357,7 @@ $ fq -d matroska dv avc.mkv
0x001c0|00 00 00 00 27 |....' |
| | | elements[0:2]: 0x1c5-0x1ec (39)
| | | [0]{}: element 0x1c5-0x1c8 (3)
-0x001c0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0x1c5-0x1c7 (2)
+0x001c0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0x1c5-0x1c7 (2)
| | | type: "master"
0x001c0| 80 | . | size: 0 0x1c7-0x1c8 (1)
| | | elements[0:0]: 0x1c8-0x1c8 (0)
@@ -368,12 +368,12 @@ $ fq -d matroska dv avc.mkv
0x001d0|00 1a |.. |
| | | elements[0:2]: 0x1d2-0x1ec (26)
| | | [0]{}: element 0x1d2-0x1dc (10)
-0x001d0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x1d2-0x1d4 (2)
+0x001d0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x1d2-0x1d4 (2)
| | | type: "utf8"
0x001d0| 87 | . | size: 7 0x1d4-0x1d5 (1)
0x001d0| 45 4e 43 4f 44 45 52 | ENCODER | value: "ENCODER" 0x1d5-0x1dc (7)
| | | [1]{}: element 0x1dc-0x1ec (16)
-0x001d0| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x1dc-0x1de (2)
+0x001d0| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x1dc-0x1de (2)
| | | type: "utf8"
0x001d0| 8d | . | size: 13 0x1de-0x1df (1)
0x001d0| 4c| L| value: "Lavf58.45.100" 0x1df-0x1ec (13)
@@ -385,12 +385,12 @@ $ fq -d matroska dv avc.mkv
0x001f0|00 00 00 00 00 5f |....._ |
| | | elements[0:3]: 0x1f6-0x255 (95)
| | | [0]{}: element 0x1f6-0x204 (14)
-0x001f0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0x1f6-0x1f8 (2)
+0x001f0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0x1f6-0x1f8 (2)
| | | type: "master"
0x001f0| 8b | . | size: 11 0x1f8-0x1f9 (1)
| | | elements[0:1]: 0x1f9-0x204 (11)
| | | [0]{}: element 0x1f9-0x204 (11)
-0x001f0| 63 c5 | c. | id: "tag_track_uid" (0x63c5) (A unique ID to identify the Track(s) the tags belong to) 0x1f9-0x1fb (2)
+0x001f0| 63 c5 | c. | id: "tag_track_uid" (0x63c5) (A UID that identifies the Track(s) that the tags belong to) 0x1f9-0x1fb (2)
| | | type: "uinteger"
0x001f0| 88 | . | size: 8 0x1fb-0x1fc (1)
0x001f0| 5c dc 49 64| \.Id| value: 6691303842430154467 0x1fc-0x204 (8)
@@ -401,12 +401,12 @@ $ fq -d matroska dv avc.mkv
0x00200| 01 00 00 00 00 00 00 22 | ......." | size: 34 0x206-0x20e (8)
| | | elements[0:2]: 0x20e-0x230 (34)
| | | [0]{}: element 0x20e-0x218 (10)
-0x00200| 45 a3| E.| id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x20e-0x210 (2)
+0x00200| 45 a3| E.| id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x20e-0x210 (2)
| | | type: "utf8"
0x00210|87 |. | size: 7 0x210-0x211 (1)
0x00210| 45 4e 43 4f 44 45 52 | ENCODER | value: "ENCODER" 0x211-0x218 (7)
| | | [1]{}: element 0x218-0x230 (24)
-0x00210| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x218-0x21a (2)
+0x00210| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x218-0x21a (2)
| | | type: "utf8"
0x00210| 95 | . | size: 21 0x21a-0x21b (1)
0x00210| 4c 61 76 63 35| Lavc5| value: "Lavc58.91.100 libx264" 0x21b-0x230 (21)
@@ -417,12 +417,12 @@ $ fq -d matroska dv avc.mkv
0x00230| a2 | . | size: 34 0x232-0x233 (1)
| | | elements[0:2]: 0x233-0x255 (34)
| | | [0]{}: element 0x233-0x23e (11)
-0x00230| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x233-0x235 (2)
+0x00230| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x233-0x235 (2)
| | | type: "utf8"
0x00230| 88 | . | size: 8 0x235-0x236 (1)
0x00230| 44 55 52 41 54 49 4f 4e | DURATION | value: "DURATION" 0x236-0x23e (8)
| | | [1]{}: element 0x23e-0x255 (23)
-0x00230| 44 87| D.| id: "tag_string" (0x4487) (The value of the Tag) 0x23e-0x240 (2)
+0x00230| 44 87| D.| id: "tag_string" (0x4487) (The tag value) 0x23e-0x240 (2)
| | | type: "utf8"
0x00240|94 |. | size: 20 0x240-0x241 (1)
0x00240| 30 30 3a 30 30 3a 30 30 2e 30 34 30 30 30 30| 00:00:00.040000| value: "00:00:00.040000000" 0x241-0x255 (20)
@@ -444,7 +444,7 @@ $ fq -d matroska dv avc.mkv
0x00260| 81 | . | size: 1 0x262-0x263 (1)
0x00260| 00 | . | value: 0 0x263-0x264 (1)
| | | [2]{}: element 0x264-0xd2b (2759)
-0x00260| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x264-0x265 (1)
+0x00260| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x264-0x265 (1)
| | | type: "binary"
0x00260| 4a c4 | J. | size: 2756 0x265-0x267 (2)
0x00260| 81 | . | track_number: 1 0x267-0x268 (1)
@@ -507,7 +507,7 @@ $ fq -d matroska dv avc.mkv
0x00d30| 81 | . | size: 1 0xd39-0xd3a (1)
0x00d30| 00 | . | value: 0 0xd3a-0xd3b (1)
| | | [1]{}: element 0xd3b-0xd47 (12)
-0x00d30| b7 | . | id: "cue_track_positions" (0xb7) (Contain positions for different tracks corresponding to the timestamp) 0xd3b-0xd3c (1)
+0x00d30| b7 | . | id: "cue_track_positions" (0xb7) (Contains positions for different tracks corresponding to the timestamp) 0xd3b-0xd3c (1)
| | | type: "master"
0x00d30| 8a | . | size: 10 0xd3c-0xd3d (1)
| | | elements[0:3]: 0xd3d-0xd47 (10)
@@ -522,7 +522,7 @@ $ fq -d matroska dv avc.mkv
0x00d40| 82 | . | size: 2 0xd41-0xd42 (1)
0x00d40| 02 21 | .! | value: 545 0xd42-0xd44 (2)
| | | [2]{}: element 0xd44-0xd47 (3)
-0x00d40| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an Element inside that Cluster) 0xd44-0xd45 (1)
+0x00d40| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an element inside that Cluster) 0xd44-0xd45 (1)
| | | type: "uinteger"
0x00d40| 81 | . | size: 1 0xd45-0xd46 (1)
0x00d40| 09| | .| | value: 9 0xd46-0xd47 (1)
diff --git a/format/matroska/testdata/decode_samples.fqtest b/format/matroska/testdata/decode_samples.fqtest
index b48cbeef7..2dc2ec387 100644
--- a/format/matroska/testdata/decode_samples.fqtest
+++ b/format/matroska/testdata/decode_samples.fqtest
@@ -1,6 +1,6 @@
$ fq -o decode_samples=true 'first(grep_by(.id=="simple_block")) | dv' aac.mkv
|00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f|0123456789abcdef|.elements[1].elements[5].elements[2]{}: element 0x227-0x2fb (212)
-0x220| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x227-0x228 (1)
+0x220| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x227-0x228 (1)
| | | type: "binary"
0x220| 40 d1 | @. | size: 209 0x228-0x22a (2)
0x220| 81 | . | track_number: 1 0x22a-0x22b (1)
@@ -40,7 +40,7 @@ $ fq -o decode_samples=true 'first(grep_by(.id=="simple_block")) | dv' aac.mkv
* |until 0x2fa.7 (184) | |
$ fq -o decode_samples=false 'first(grep_by(.id=="simple_block")) | dv' aac.mkv
|00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f|0123456789abcdef|.elements[1].elements[5].elements[2]{}: element 0x227-0x2fb (212)
-0x220| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x227-0x228 (1)
+0x220| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x227-0x228 (1)
| | | type: "binary"
0x220| 40 d1 | @. | size: 209 0x228-0x22a (2)
0x220| 81 | . | track_number: 1 0x22a-0x22b (1)
diff --git a/format/matroska/testdata/flac.fqtest b/format/matroska/testdata/flac.fqtest
index 1ef8d4ad7..35afc929b 100644
--- a/format/matroska/testdata/flac.fqtest
+++ b/format/matroska/testdata/flac.fqtest
@@ -155,7 +155,7 @@ $ fq -d matroska dv flac.mkv
0x0f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x107 (13)
0x100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x11a (19)
-0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x109 (2)
+0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated UID that identifies the Segment amongst many others v4 RFC4122 with all bits randomly (or pseudorandomly) chosen) 0x107-0x109 (2)
| | | type: "binary"
0x100| 90 | . | size: 16 0x109-0x10a (1)
0x100| 57 0f ef b3 6f 8c| W...o.| value: raw bits 0x10a-0x11a (16)
@@ -177,7 +177,7 @@ $ fq -d matroska dv flac.mkv
0x120| 84 | . | size: 4 0x12b-0x12c (1)
0x120| ee c3 26 f4| ..&.| value: raw bits 0x12c-0x130 (4)
| | | [1]{}: element 0x130-0x19c (108)
-0x130|ae |. | id: "track_entry" (0xae) (Describes a track with all Elements) 0x130-0x131 (1)
+0x130|ae |. | id: "track_entry" (0xae) (Describes a track with all elements) 0x130-0x131 (1)
| | | type: "master"
0x130| 01 00 00 00 00 00 00 63 | .......c | size: 99 0x131-0x139 (8)
| | | elements[0:8]: 0x139-0x19c (99)
@@ -187,13 +187,13 @@ $ fq -d matroska dv flac.mkv
0x130| 81 | . | size: 1 0x13a-0x13b (1)
0x130| 01 | . | value: 1 0x13b-0x13c (1)
| | | [1]{}: element 0x13c-0x147 (11)
-0x130| 73 c5 | s. | id: "track_uid" (0x73c5) (A unique ID to identify the Track) 0x13c-0x13e (2)
+0x130| 73 c5 | s. | id: "track_uid" (0x73c5) (A UID that identifies the Track) 0x13c-0x13e (2)
| | | type: "uinteger"
0x130| 88 | . | size: 8 0x13e-0x13f (1)
0x130| 5d| ]| value: 6714516830025709568 0x13f-0x147 (8)
0x140|2e c1 7b 5c 10 78 00 |..{\.x. |
| | | [2]{}: element 0x147-0x14a (3)
-0x140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks using lacing) 0x147-0x148 (1)
+0x140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks that use lacing) 0x147-0x148 (1)
| | | type: "uinteger"
0x140| 81 | . | size: 1 0x148-0x149 (1)
0x140| 00 | . | value: 0 0x149-0x14a (1)
@@ -273,7 +273,7 @@ $ fq -d matroska dv flac.mkv
0x1b0|00 27 |.' |
| | | elements[0:2]: 0x1b2-0x1d9 (39)
| | | [0]{}: element 0x1b2-0x1b5 (3)
-0x1b0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0x1b2-0x1b4 (2)
+0x1b0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0x1b2-0x1b4 (2)
| | | type: "master"
0x1b0| 80 | . | size: 0 0x1b4-0x1b5 (1)
| | | elements[0:0]: 0x1b5-0x1b5 (0)
@@ -283,13 +283,13 @@ $ fq -d matroska dv flac.mkv
0x1b0| 01 00 00 00 00 00 00 1a | ........ | size: 26 0x1b7-0x1bf (8)
| | | elements[0:2]: 0x1bf-0x1d9 (26)
| | | [0]{}: element 0x1bf-0x1c9 (10)
-0x1b0| 45| E| id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x1bf-0x1c1 (2)
+0x1b0| 45| E| id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x1bf-0x1c1 (2)
0x1c0|a3 |. |
| | | type: "utf8"
0x1c0| 87 | . | size: 7 0x1c1-0x1c2 (1)
0x1c0| 45 4e 43 4f 44 45 52 | ENCODER | value: "ENCODER" 0x1c2-0x1c9 (7)
| | | [1]{}: element 0x1c9-0x1d9 (16)
-0x1c0| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x1c9-0x1cb (2)
+0x1c0| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x1c9-0x1cb (2)
| | | type: "utf8"
0x1c0| 8d | . | size: 13 0x1cb-0x1cc (1)
0x1c0| 4c 61 76 66| Lavf| value: "Lavf58.45.100" 0x1cc-0x1d9 (13)
@@ -301,12 +301,12 @@ $ fq -d matroska dv flac.mkv
0x1e0|00 00 5c |..\ |
| | | elements[0:3]: 0x1e3-0x23f (92)
| | | [0]{}: element 0x1e3-0x1f1 (14)
-0x1e0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0x1e3-0x1e5 (2)
+0x1e0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0x1e3-0x1e5 (2)
| | | type: "master"
0x1e0| 8b | . | size: 11 0x1e5-0x1e6 (1)
| | | elements[0:1]: 0x1e6-0x1f1 (11)
| | | [0]{}: element 0x1e6-0x1f1 (11)
-0x1e0| 63 c5 | c. | id: "tag_track_uid" (0x63c5) (A unique ID to identify the Track(s) the tags belong to) 0x1e6-0x1e8 (2)
+0x1e0| 63 c5 | c. | id: "tag_track_uid" (0x63c5) (A UID that identifies the Track(s) that the tags belong to) 0x1e6-0x1e8 (2)
| | | type: "uinteger"
0x1e0| 88 | . | size: 8 0x1e8-0x1e9 (1)
0x1e0| 5d 2e c1 7b 5c 10 78| ]..{\.x| value: 6714516830025709568 0x1e9-0x1f1 (8)
@@ -317,13 +317,13 @@ $ fq -d matroska dv flac.mkv
0x1f0| 01 00 00 00 00 00 00 1f | ........ | size: 31 0x1f3-0x1fb (8)
| | | elements[0:2]: 0x1fb-0x21a (31)
| | | [0]{}: element 0x1fb-0x205 (10)
-0x1f0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x1fb-0x1fd (2)
+0x1f0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x1fb-0x1fd (2)
| | | type: "utf8"
0x1f0| 87 | . | size: 7 0x1fd-0x1fe (1)
0x1f0| 45 4e| EN| value: "ENCODER" 0x1fe-0x205 (7)
0x200|43 4f 44 45 52 |CODER |
| | | [1]{}: element 0x205-0x21a (21)
-0x200| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x205-0x207 (2)
+0x200| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x205-0x207 (2)
| | | type: "utf8"
0x200| 92 | . | size: 18 0x207-0x208 (1)
0x200| 4c 61 76 63 35 38 2e 39| Lavc58.9| value: "Lavc58.91.100 flac" 0x208-0x21a (18)
@@ -334,12 +334,12 @@ $ fq -d matroska dv flac.mkv
0x210| a2 | . | size: 34 0x21c-0x21d (1)
| | | elements[0:2]: 0x21d-0x23f (34)
| | | [0]{}: element 0x21d-0x228 (11)
-0x210| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x21d-0x21f (2)
+0x210| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x21d-0x21f (2)
| | | type: "utf8"
0x210| 88| .| size: 8 0x21f-0x220 (1)
0x220|44 55 52 41 54 49 4f 4e |DURATION | value: "DURATION" 0x220-0x228 (8)
| | | [1]{}: element 0x228-0x23f (23)
-0x220| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x228-0x22a (2)
+0x220| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x228-0x22a (2)
| | | type: "utf8"
0x220| 94 | . | size: 20 0x22a-0x22b (1)
0x220| 30 30 3a 30 30| 00:00| value: "00:00:00.050000000" 0x22b-0x23f (20)
@@ -361,7 +361,7 @@ $ fq -d matroska dv flac.mkv
0x240| 81 | . | size: 1 0x24c-0x24d (1)
0x240| 00 | . | value: 0 0x24d-0x24e (1)
| | | [2]{}: element 0x24e-0x4b3 (613)
-0x240| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x24e-0x24f (1)
+0x240| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x24e-0x24f (1)
| | | type: "binary"
0x240| 42| B| size: 610 0x24f-0x251 (2)
0x250|62 |b |
@@ -452,7 +452,7 @@ $ fq -d matroska dv flac.mkv
0x4c0| 81 | . | size: 1 0x4c1-0x4c2 (1)
0x4c0| 00 | . | value: 0 0x4c2-0x4c3 (1)
| | | [1]{}: element 0x4c3-0x4cf (12)
-0x4c0| b7 | . | id: "cue_track_positions" (0xb7) (Contain positions for different tracks corresponding to the timestamp) 0x4c3-0x4c4 (1)
+0x4c0| b7 | . | id: "cue_track_positions" (0xb7) (Contains positions for different tracks corresponding to the timestamp) 0x4c3-0x4c4 (1)
| | | type: "master"
0x4c0| 8a | . | size: 10 0x4c4-0x4c5 (1)
| | | elements[0:3]: 0x4c5-0x4cf (10)
@@ -467,7 +467,7 @@ $ fq -d matroska dv flac.mkv
0x4c0| 82 | . | size: 2 0x4c9-0x4ca (1)
0x4c0| 02 0b | .. | value: 523 0x4ca-0x4cc (2)
| | | [2]{}: element 0x4cc-0x4cf (3)
-0x4c0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an Element inside that Cluster) 0x4cc-0x4cd (1)
+0x4c0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an element inside that Cluster) 0x4cc-0x4cd (1)
| | | type: "uinteger"
0x4c0| 81 | . | size: 1 0x4cd-0x4ce (1)
0x4c0| 09| | .|| value: 9 0x4ce-0x4cf (1)
diff --git a/format/matroska/testdata/hevc.fqtest b/format/matroska/testdata/hevc.fqtest
index 3c778c911..8a7b41d72 100644
--- a/format/matroska/testdata/hevc.fqtest
+++ b/format/matroska/testdata/hevc.fqtest
@@ -155,7 +155,7 @@ $ fq -d matroska dv hevc.mkv
0x00f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x107 (13)
0x0100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x11a (19)
-0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x109 (2)
+0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated UID that identifies the Segment amongst many others v4 RFC4122 with all bits randomly (or pseudorandomly) chosen) 0x107-0x109 (2)
| | | type: "binary"
0x0100| 90 | . | size: 16 0x109-0x10a (1)
0x0100| 64 a4 6f b2 71 ea| d.o.q.| value: raw bits 0x10a-0x11a (16)
@@ -178,7 +178,7 @@ $ fq -d matroska dv hevc.mkv
0x0120| d5 14 03| ...| value: raw bits 0x12d-0x131 (4)
0x0130|11 |. |
| | | [1]{}: element 0x131-0xabe (2445)
-0x0130| ae | . | id: "track_entry" (0xae) (Describes a track with all Elements) 0x131-0x132 (1)
+0x0130| ae | . | id: "track_entry" (0xae) (Describes a track with all elements) 0x131-0x132 (1)
| | | type: "master"
0x0130| 01 00 00 00 00 00 09 84 | ........ | size: 2436 0x132-0x13a (8)
| | | elements[0:9]: 0x13a-0xabe (2436)
@@ -188,12 +188,12 @@ $ fq -d matroska dv hevc.mkv
0x0130| 81 | . | size: 1 0x13b-0x13c (1)
0x0130| 01 | . | value: 1 0x13c-0x13d (1)
| | | [1]{}: element 0x13d-0x148 (11)
-0x0130| 73 c5 | s. | id: "track_uid" (0x73c5) (A unique ID to identify the Track) 0x13d-0x13f (2)
+0x0130| 73 c5 | s. | id: "track_uid" (0x73c5) (A UID that identifies the Track) 0x13d-0x13f (2)
| | | type: "uinteger"
0x0130| 88| .| size: 8 0x13f-0x140 (1)
0x0140|39 19 7e 97 f0 1d d6 53 |9.~....S | value: 4114458925613307475 0x140-0x148 (8)
| | | [2]{}: element 0x148-0x14b (3)
-0x0140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks using lacing) 0x148-0x149 (1)
+0x0140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks that use lacing) 0x148-0x149 (1)
| | | type: "uinteger"
0x0140| 81 | . | size: 1 0x149-0x14a (1)
0x0140| 00 | . | value: 0 0x14a-0x14b (1)
@@ -564,7 +564,7 @@ $ fq -d matroska dv hevc.mkv
0x0ad0|00 00 00 27 |...' |
| | | elements[0:2]: 0xad4-0xafb (39)
| | | [0]{}: element 0xad4-0xad7 (3)
-0x0ad0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0xad4-0xad6 (2)
+0x0ad0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0xad4-0xad6 (2)
| | | type: "master"
0x0ad0| 80 | . | size: 0 0xad6-0xad7 (1)
| | | elements[0:0]: 0xad7-0xad7 (0)
@@ -575,12 +575,12 @@ $ fq -d matroska dv hevc.mkv
0x0ae0|1a |. |
| | | elements[0:2]: 0xae1-0xafb (26)
| | | [0]{}: element 0xae1-0xaeb (10)
-0x0ae0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0xae1-0xae3 (2)
+0x0ae0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0xae1-0xae3 (2)
| | | type: "utf8"
0x0ae0| 87 | . | size: 7 0xae3-0xae4 (1)
0x0ae0| 45 4e 43 4f 44 45 52 | ENCODER | value: "ENCODER" 0xae4-0xaeb (7)
| | | [1]{}: element 0xaeb-0xafb (16)
-0x0ae0| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0xaeb-0xaed (2)
+0x0ae0| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0xaeb-0xaed (2)
| | | type: "utf8"
0x0ae0| 8d | . | size: 13 0xaed-0xaee (1)
0x0ae0| 4c 61| La| value: "Lavf58.45.100" 0xaee-0xafb (13)
@@ -592,12 +592,12 @@ $ fq -d matroska dv hevc.mkv
0x0b00|00 00 00 00 5f |...._ |
| | | elements[0:3]: 0xb05-0xb64 (95)
| | | [0]{}: element 0xb05-0xb13 (14)
-0x0b00| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0xb05-0xb07 (2)
+0x0b00| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0xb05-0xb07 (2)
| | | type: "master"
0x0b00| 8b | . | size: 11 0xb07-0xb08 (1)
| | | elements[0:1]: 0xb08-0xb13 (11)
| | | [0]{}: element 0xb08-0xb13 (11)
-0x0b00| 63 c5 | c. | id: "tag_track_uid" (0x63c5) (A unique ID to identify the Track(s) the tags belong to) 0xb08-0xb0a (2)
+0x0b00| 63 c5 | c. | id: "tag_track_uid" (0x63c5) (A UID that identifies the Track(s) that the tags belong to) 0xb08-0xb0a (2)
| | | type: "uinteger"
0x0b00| 88 | . | size: 8 0xb0a-0xb0b (1)
0x0b00| 39 19 7e 97 f0| 9.~..| value: 4114458925613307475 0xb0b-0xb13 (8)
@@ -608,12 +608,12 @@ $ fq -d matroska dv hevc.mkv
0x0b10| 01 00 00 00 00 00 00 22 | ......." | size: 34 0xb15-0xb1d (8)
| | | elements[0:2]: 0xb1d-0xb3f (34)
| | | [0]{}: element 0xb1d-0xb27 (10)
-0x0b10| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0xb1d-0xb1f (2)
+0x0b10| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0xb1d-0xb1f (2)
| | | type: "utf8"
0x0b10| 87| .| size: 7 0xb1f-0xb20 (1)
0x0b20|45 4e 43 4f 44 45 52 |ENCODER | value: "ENCODER" 0xb20-0xb27 (7)
| | | [1]{}: element 0xb27-0xb3f (24)
-0x0b20| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0xb27-0xb29 (2)
+0x0b20| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0xb27-0xb29 (2)
| | | type: "utf8"
0x0b20| 95 | . | size: 21 0xb29-0xb2a (1)
0x0b20| 4c 61 76 63 35 38| Lavc58| value: "Lavc58.91.100 libx265" 0xb2a-0xb3f (21)
@@ -625,12 +625,12 @@ $ fq -d matroska dv hevc.mkv
0x0b40| a2 | . | size: 34 0xb41-0xb42 (1)
| | | elements[0:2]: 0xb42-0xb64 (34)
| | | [0]{}: element 0xb42-0xb4d (11)
-0x0b40| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0xb42-0xb44 (2)
+0x0b40| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0xb42-0xb44 (2)
| | | type: "utf8"
0x0b40| 88 | . | size: 8 0xb44-0xb45 (1)
0x0b40| 44 55 52 41 54 49 4f 4e | DURATION | value: "DURATION" 0xb45-0xb4d (8)
| | | [1]{}: element 0xb4d-0xb64 (23)
-0x0b40| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0xb4d-0xb4f (2)
+0x0b40| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0xb4d-0xb4f (2)
| | | type: "utf8"
0x0b40| 94| .| size: 20 0xb4f-0xb50 (1)
0x0b50|30 30 3a 30 30 3a 30 30 2e 30 34 30 30 30 30 30|00:00:00.0400000| value: "00:00:00.040000000" 0xb50-0xb64 (20)
@@ -651,7 +651,7 @@ $ fq -d matroska dv hevc.mkv
0x0b70| 81 | . | size: 1 0xb71-0xb72 (1)
0x0b70| 00 | . | value: 0 0xb72-0xb73 (1)
| | | [2]{}: element 0xb73-0x13cf (2140)
-0x0b70| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0xb73-0xb74 (1)
+0x0b70| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0xb73-0xb74 (1)
| | | type: "binary"
0x0b70| 48 59 | HY | size: 2137 0xb74-0xb76 (2)
0x0b70| 81 | . | track_number: 1 0xb76-0xb77 (1)
@@ -694,7 +694,7 @@ $ fq -d matroska dv hevc.mkv
0x13d0| 81 | . | size: 1 0x13dd-0x13de (1)
0x13d0| 00 | . | value: 0 0x13de-0x13df (1)
| | | [1]{}: element 0x13df-0x13eb (12)
-0x13d0| b7| .| id: "cue_track_positions" (0xb7) (Contain positions for different tracks corresponding to the timestamp) 0x13df-0x13e0 (1)
+0x13d0| b7| .| id: "cue_track_positions" (0xb7) (Contains positions for different tracks corresponding to the timestamp) 0x13df-0x13e0 (1)
| | | type: "master"
0x13e0|8a |. | size: 10 0x13e0-0x13e1 (1)
| | | elements[0:3]: 0x13e1-0x13eb (10)
@@ -709,7 +709,7 @@ $ fq -d matroska dv hevc.mkv
0x13e0| 82 | . | size: 2 0x13e5-0x13e6 (1)
0x13e0| 0b 30 | .0 | value: 2864 0x13e6-0x13e8 (2)
| | | [2]{}: element 0x13e8-0x13eb (3)
-0x13e0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an Element inside that Cluster) 0x13e8-0x13e9 (1)
+0x13e0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an element inside that Cluster) 0x13e8-0x13e9 (1)
| | | type: "uinteger"
0x13e0| 81 | . | size: 1 0x13e9-0x13ea (1)
0x13e0| 09| | .| | value: 9 0x13ea-0x13eb (1)
diff --git a/format/matroska/testdata/mp3.fqtest b/format/matroska/testdata/mp3.fqtest
index dff60be62..f2faa2af8 100644
--- a/format/matroska/testdata/mp3.fqtest
+++ b/format/matroska/testdata/mp3.fqtest
@@ -155,7 +155,7 @@ $ fq -d matroska dv mp3.mkv
0x0f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x107 (13)
0x100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x11a (19)
-0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x109 (2)
+0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated UID that identifies the Segment amongst many others v4 RFC4122 with all bits randomly (or pseudorandomly) chosen) 0x107-0x109 (2)
| | | type: "binary"
0x100| 90 | . | size: 16 0x109-0x10a (1)
0x100| ed af 16 3e 3c c6| ...><.| value: raw bits 0x10a-0x11a (16)
@@ -177,7 +177,7 @@ $ fq -d matroska dv mp3.mkv
0x120| 84 | . | size: 4 0x12b-0x12c (1)
0x120| b1 28 65 ca| .(e.| value: raw bits 0x12c-0x130 (4)
| | | [1]{}: element 0x130-0x172 (66)
-0x130|ae |. | id: "track_entry" (0xae) (Describes a track with all Elements) 0x130-0x131 (1)
+0x130|ae |. | id: "track_entry" (0xae) (Describes a track with all elements) 0x130-0x131 (1)
| | | type: "master"
0x130| 01 00 00 00 00 00 00 39 | .......9 | size: 57 0x131-0x139 (8)
| | | elements[0:7]: 0x139-0x172 (57)
@@ -187,13 +187,13 @@ $ fq -d matroska dv mp3.mkv
0x130| 81 | . | size: 1 0x13a-0x13b (1)
0x130| 01 | . | value: 1 0x13b-0x13c (1)
| | | [1]{}: element 0x13c-0x147 (11)
-0x130| 73 c5 | s. | id: "track_uid" (0x73c5) (A unique ID to identify the Track) 0x13c-0x13e (2)
+0x130| 73 c5 | s. | id: "track_uid" (0x73c5) (A UID that identifies the Track) 0x13c-0x13e (2)
| | | type: "uinteger"
0x130| 88 | . | size: 8 0x13e-0x13f (1)
0x130| 8d| .| value: 10217435751272594841 0x13f-0x147 (8)
0x140|cb 9f ae 75 fa bd 99 |...u... |
| | | [2]{}: element 0x147-0x14a (3)
-0x140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks using lacing) 0x147-0x148 (1)
+0x140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks that use lacing) 0x147-0x148 (1)
| | | type: "uinteger"
0x140| 81 | . | size: 1 0x148-0x149 (1)
0x140| 00 | . | value: 0 0x149-0x14a (1)
@@ -249,7 +249,7 @@ $ fq -d matroska dv mp3.mkv
0x180|01 00 00 00 00 00 00 27 |.......' | size: 39 0x180-0x188 (8)
| | | elements[0:2]: 0x188-0x1af (39)
| | | [0]{}: element 0x188-0x18b (3)
-0x180| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0x188-0x18a (2)
+0x180| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0x188-0x18a (2)
| | | type: "master"
0x180| 80 | . | size: 0 0x18a-0x18b (1)
| | | elements[0:0]: 0x18b-0x18b (0)
@@ -260,12 +260,12 @@ $ fq -d matroska dv mp3.mkv
0x190|00 00 00 00 1a |..... |
| | | elements[0:2]: 0x195-0x1af (26)
| | | [0]{}: element 0x195-0x19f (10)
-0x190| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x195-0x197 (2)
+0x190| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x195-0x197 (2)
| | | type: "utf8"
0x190| 87 | . | size: 7 0x197-0x198 (1)
0x190| 45 4e 43 4f 44 45 52 | ENCODER | value: "ENCODER" 0x198-0x19f (7)
| | | [1]{}: element 0x19f-0x1af (16)
-0x190| 44| D| id: "tag_string" (0x4487) (The value of the Tag) 0x19f-0x1a1 (2)
+0x190| 44| D| id: "tag_string" (0x4487) (The tag value) 0x19f-0x1a1 (2)
0x1a0|87 |. |
| | | type: "utf8"
0x1a0| 8d | . | size: 13 0x1a1-0x1a2 (1)
@@ -277,12 +277,12 @@ $ fq -d matroska dv mp3.mkv
0x1b0| 01 00 00 00 00 00 00 62 | .......b | size: 98 0x1b1-0x1b9 (8)
| | | elements[0:3]: 0x1b9-0x21b (98)
| | | [0]{}: element 0x1b9-0x1c7 (14)
-0x1b0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0x1b9-0x1bb (2)
+0x1b0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0x1b9-0x1bb (2)
| | | type: "master"
0x1b0| 8b | . | size: 11 0x1bb-0x1bc (1)
| | | elements[0:1]: 0x1bc-0x1c7 (11)
| | | [0]{}: element 0x1bc-0x1c7 (11)
-0x1b0| 63 c5 | c. | id: "tag_track_uid" (0x63c5) (A unique ID to identify the Track(s) the tags belong to) 0x1bc-0x1be (2)
+0x1b0| 63 c5 | c. | id: "tag_track_uid" (0x63c5) (A UID that identifies the Track(s) that the tags belong to) 0x1bc-0x1be (2)
| | | type: "uinteger"
0x1b0| 88 | . | size: 8 0x1be-0x1bf (1)
0x1b0| 8d| .| value: 10217435751272594841 0x1bf-0x1c7 (8)
@@ -294,12 +294,12 @@ $ fq -d matroska dv mp3.mkv
0x1d0|25 |% |
| | | elements[0:2]: 0x1d1-0x1f6 (37)
| | | [0]{}: element 0x1d1-0x1db (10)
-0x1d0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x1d1-0x1d3 (2)
+0x1d0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x1d1-0x1d3 (2)
| | | type: "utf8"
0x1d0| 87 | . | size: 7 0x1d3-0x1d4 (1)
0x1d0| 45 4e 43 4f 44 45 52 | ENCODER | value: "ENCODER" 0x1d4-0x1db (7)
| | | [1]{}: element 0x1db-0x1f6 (27)
-0x1d0| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x1db-0x1dd (2)
+0x1d0| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x1db-0x1dd (2)
| | | type: "utf8"
0x1d0| 98 | . | size: 24 0x1dd-0x1de (1)
0x1d0| 4c 61| La| value: "Lavc58.91.100 libmp3lame" 0x1de-0x1f6 (24)
@@ -311,13 +311,13 @@ $ fq -d matroska dv mp3.mkv
0x1f0| a2 | . | size: 34 0x1f8-0x1f9 (1)
| | | elements[0:2]: 0x1f9-0x21b (34)
| | | [0]{}: element 0x1f9-0x204 (11)
-0x1f0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x1f9-0x1fb (2)
+0x1f0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x1f9-0x1fb (2)
| | | type: "utf8"
0x1f0| 88 | . | size: 8 0x1fb-0x1fc (1)
0x1f0| 44 55 52 41| DURA| value: "DURATION" 0x1fc-0x204 (8)
0x200|54 49 4f 4e |TION |
| | | [1]{}: element 0x204-0x21b (23)
-0x200| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x204-0x206 (2)
+0x200| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x204-0x206 (2)
| | | type: "utf8"
0x200| 94 | . | size: 20 0x206-0x207 (1)
0x200| 30 30 3a 30 30 3a 30 30 2e| 00:00:00.| value: "00:00:00.075000000" 0x207-0x21b (20)
@@ -339,7 +339,7 @@ $ fq -d matroska dv mp3.mkv
0x220| 81 | . | size: 1 0x228-0x229 (1)
0x220| 00 | . | value: 0 0x229-0x22a (1)
| | | [2]{}: element 0x22a-0x301 (215)
-0x220| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x22a-0x22b (1)
+0x220| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x22a-0x22b (1)
| | | type: "binary"
0x220| 40 d4 | @. | size: 212 0x22b-0x22d (2)
0x220| 81 | . | track_number: 1 0x22d-0x22e (1)
@@ -411,7 +411,7 @@ $ fq -d matroska dv mp3.mkv
* |until 0x300.7 (187) | |
| | | crc_calculated: "2e0a" (raw bits)
| | | [3]{}: element 0x301-0x3d9 (216)
-0x300| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x301-0x302 (1)
+0x300| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x301-0x302 (1)
| | | type: "binary"
0x300| 40 d5 | @. | size: 213 0x302-0x304 (2)
0x300| 81 | . | track_number: 1 0x304-0x305 (1)
@@ -585,7 +585,7 @@ $ fq -d matroska dv mp3.mkv
0x4c0| 81 | . | size: 1 0x4ce-0x4cf (1)
0x4c0| 00| .| value: 0 0x4cf-0x4d0 (1)
| | | [1]{}: element 0x4d0-0x4dc (12)
-0x4d0|b7 |. | id: "cue_track_positions" (0xb7) (Contain positions for different tracks corresponding to the timestamp) 0x4d0-0x4d1 (1)
+0x4d0|b7 |. | id: "cue_track_positions" (0xb7) (Contains positions for different tracks corresponding to the timestamp) 0x4d0-0x4d1 (1)
| | | type: "master"
0x4d0| 8a | . | size: 10 0x4d1-0x4d2 (1)
| | | elements[0:3]: 0x4d2-0x4dc (10)
@@ -600,7 +600,7 @@ $ fq -d matroska dv mp3.mkv
0x4d0| 82 | . | size: 2 0x4d6-0x4d7 (1)
0x4d0| 01 e7 | .. | value: 487 0x4d7-0x4d9 (2)
| | | [2]{}: element 0x4d9-0x4dc (3)
-0x4d0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an Element inside that Cluster) 0x4d9-0x4da (1)
+0x4d0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an element inside that Cluster) 0x4d9-0x4da (1)
| | | type: "uinteger"
0x4d0| 81 | . | size: 1 0x4da-0x4db (1)
0x4d0| 09| | .| | value: 9 0x4db-0x4dc (1)
diff --git a/format/matroska/testdata/mpeg2.fqtest b/format/matroska/testdata/mpeg2.fqtest
index 9dafe647c..c1e54cd71 100644
--- a/format/matroska/testdata/mpeg2.fqtest
+++ b/format/matroska/testdata/mpeg2.fqtest
@@ -155,7 +155,7 @@ $ fq -d matroska dv mpeg2.mkv
0x00f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x107 (13)
0x0100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x11a (19)
-0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x109 (2)
+0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated UID that identifies the Segment amongst many others v4 RFC4122 with all bits randomly (or pseudorandomly) chosen) 0x107-0x109 (2)
| | | type: "binary"
0x0100| 90 | . | size: 16 0x109-0x10a (1)
0x0100| 97 68 53 5b 2a ea| .hS[*.| value: raw bits 0x10a-0x11a (16)
@@ -177,7 +177,7 @@ $ fq -d matroska dv mpeg2.mkv
0x0120| 84 | . | size: 4 0x12b-0x12c (1)
0x0120| c5 f5 e8 ad| ....| value: raw bits 0x12c-0x130 (4)
| | | [1]{}: element 0x130-0x175 (69)
-0x0130|ae |. | id: "track_entry" (0xae) (Describes a track with all Elements) 0x130-0x131 (1)
+0x0130|ae |. | id: "track_entry" (0xae) (Describes a track with all elements) 0x130-0x131 (1)
| | | type: "master"
0x0130| 01 00 00 00 00 00 00 3c | .......< | size: 60 0x131-0x139 (8)
| | | elements[0:8]: 0x139-0x175 (60)
@@ -187,13 +187,13 @@ $ fq -d matroska dv mpeg2.mkv
0x0130| 81 | . | size: 1 0x13a-0x13b (1)
0x0130| 01 | . | value: 1 0x13b-0x13c (1)
| | | [1]{}: element 0x13c-0x147 (11)
-0x0130| 73 c5 | s. | id: "track_uid" (0x73c5) (A unique ID to identify the Track) 0x13c-0x13e (2)
+0x0130| 73 c5 | s. | id: "track_uid" (0x73c5) (A UID that identifies the Track) 0x13c-0x13e (2)
| | | type: "uinteger"
0x0130| 88 | . | size: 8 0x13e-0x13f (1)
0x0130| 42| B| value: 4766210523013795154 0x13f-0x147 (8)
0x0140|24 fb 37 dc f7 4d 52 |$.7..MR |
| | | [2]{}: element 0x147-0x14a (3)
-0x0140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks using lacing) 0x147-0x148 (1)
+0x0140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks that use lacing) 0x147-0x148 (1)
| | | type: "uinteger"
0x0140| 81 | . | size: 1 0x148-0x149 (1)
0x0140| 00 | . | value: 0 0x149-0x14a (1)
@@ -250,7 +250,7 @@ $ fq -d matroska dv mpeg2.mkv
0x0180| 01 00 00 00 00 00 00 27 | .......' | size: 39 0x183-0x18b (8)
| | | elements[0:2]: 0x18b-0x1b2 (39)
| | | [0]{}: element 0x18b-0x18e (3)
-0x0180| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0x18b-0x18d (2)
+0x0180| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0x18b-0x18d (2)
| | | type: "master"
0x0180| 80 | . | size: 0 0x18d-0x18e (1)
| | | elements[0:0]: 0x18e-0x18e (0)
@@ -260,13 +260,13 @@ $ fq -d matroska dv mpeg2.mkv
0x0190|01 00 00 00 00 00 00 1a |........ | size: 26 0x190-0x198 (8)
| | | elements[0:2]: 0x198-0x1b2 (26)
| | | [0]{}: element 0x198-0x1a2 (10)
-0x0190| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x198-0x19a (2)
+0x0190| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x198-0x19a (2)
| | | type: "utf8"
0x0190| 87 | . | size: 7 0x19a-0x19b (1)
0x0190| 45 4e 43 4f 44| ENCOD| value: "ENCODER" 0x19b-0x1a2 (7)
0x01a0|45 52 |ER |
| | | [1]{}: element 0x1a2-0x1b2 (16)
-0x01a0| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x1a2-0x1a4 (2)
+0x01a0| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x1a2-0x1a4 (2)
| | | type: "utf8"
0x01a0| 8d | . | size: 13 0x1a4-0x1a5 (1)
0x01a0| 4c 61 76 66 35 38 2e 34 35 2e 31| Lavf58.45.1| value: "Lavf58.45.100" 0x1a5-0x1b2 (13)
@@ -277,12 +277,12 @@ $ fq -d matroska dv mpeg2.mkv
0x01b0| 01 00 00 00 00 00 00 62 | .......b | size: 98 0x1b4-0x1bc (8)
| | | elements[0:3]: 0x1bc-0x21e (98)
| | | [0]{}: element 0x1bc-0x1ca (14)
-0x01b0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0x1bc-0x1be (2)
+0x01b0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0x1bc-0x1be (2)
| | | type: "master"
0x01b0| 8b | . | size: 11 0x1be-0x1bf (1)
| | | elements[0:1]: 0x1bf-0x1ca (11)
| | | [0]{}: element 0x1bf-0x1ca (11)
-0x01b0| 63| c| id: "tag_track_uid" (0x63c5) (A unique ID to identify the Track(s) the tags belong to) 0x1bf-0x1c1 (2)
+0x01b0| 63| c| id: "tag_track_uid" (0x63c5) (A UID that identifies the Track(s) that the tags belong to) 0x1bf-0x1c1 (2)
0x01c0|c5 |. |
| | | type: "uinteger"
0x01c0| 88 | . | size: 8 0x1c1-0x1c2 (1)
@@ -294,12 +294,12 @@ $ fq -d matroska dv mpeg2.mkv
0x01d0|00 00 00 25 |...% |
| | | elements[0:2]: 0x1d4-0x1f9 (37)
| | | [0]{}: element 0x1d4-0x1de (10)
-0x01d0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x1d4-0x1d6 (2)
+0x01d0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x1d4-0x1d6 (2)
| | | type: "utf8"
0x01d0| 87 | . | size: 7 0x1d6-0x1d7 (1)
0x01d0| 45 4e 43 4f 44 45 52 | ENCODER | value: "ENCODER" 0x1d7-0x1de (7)
| | | [1]{}: element 0x1de-0x1f9 (27)
-0x01d0| 44 87| D.| id: "tag_string" (0x4487) (The value of the Tag) 0x1de-0x1e0 (2)
+0x01d0| 44 87| D.| id: "tag_string" (0x4487) (The tag value) 0x1de-0x1e0 (2)
| | | type: "utf8"
0x01e0|98 |. | size: 24 0x1e0-0x1e1 (1)
0x01e0| 4c 61 76 63 35 38 2e 39 31 2e 31 30 30 20 6d| Lavc58.91.100 m| value: "Lavc58.91.100 mpeg2video" 0x1e1-0x1f9 (24)
@@ -310,13 +310,13 @@ $ fq -d matroska dv mpeg2.mkv
0x01f0| a2 | . | size: 34 0x1fb-0x1fc (1)
| | | elements[0:2]: 0x1fc-0x21e (34)
| | | [0]{}: element 0x1fc-0x207 (11)
-0x01f0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x1fc-0x1fe (2)
+0x01f0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x1fc-0x1fe (2)
| | | type: "utf8"
0x01f0| 88 | . | size: 8 0x1fe-0x1ff (1)
0x01f0| 44| D| value: "DURATION" 0x1ff-0x207 (8)
0x0200|55 52 41 54 49 4f 4e |URATION |
| | | [1]{}: element 0x207-0x21e (23)
-0x0200| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x207-0x209 (2)
+0x0200| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x207-0x209 (2)
| | | type: "utf8"
0x0200| 94 | . | size: 20 0x209-0x20a (1)
0x0200| 30 30 3a 30 30 3a| 00:00:| value: "00:00:00.040000000" 0x20a-0x21e (20)
@@ -338,7 +338,7 @@ $ fq -d matroska dv mpeg2.mkv
0x0220| 81 | . | size: 1 0x22b-0x22c (1)
0x0220| 00 | . | value: 0 0x22c-0x22d (1)
| | | [2]{}: element 0x22d-0x21ae (8065)
-0x0220| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x22d-0x22e (1)
+0x0220| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x22d-0x22e (1)
| | | type: "binary"
0x0220| 5f 7e| _~| size: 8062 0x22e-0x230 (2)
0x0230|81 |. | track_number: 1 0x230-0x231 (1)
@@ -386,7 +386,7 @@ $ fq -d matroska dv mpeg2.mkv
0x21b0| 81 | . | size: 1 0x21bc-0x21bd (1)
0x21b0| 00 | . | value: 0 0x21bd-0x21be (1)
| | | [1]{}: element 0x21be-0x21ca (12)
-0x21b0| b7 | . | id: "cue_track_positions" (0xb7) (Contain positions for different tracks corresponding to the timestamp) 0x21be-0x21bf (1)
+0x21b0| b7 | . | id: "cue_track_positions" (0xb7) (Contains positions for different tracks corresponding to the timestamp) 0x21be-0x21bf (1)
| | | type: "master"
0x21b0| 8a| .| size: 10 0x21bf-0x21c0 (1)
| | | elements[0:3]: 0x21c0-0x21ca (10)
@@ -401,7 +401,7 @@ $ fq -d matroska dv mpeg2.mkv
0x21c0| 82 | . | size: 2 0x21c4-0x21c5 (1)
0x21c0| 01 ea | .. | value: 490 0x21c5-0x21c7 (2)
| | | [2]{}: element 0x21c7-0x21ca (3)
-0x21c0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an Element inside that Cluster) 0x21c7-0x21c8 (1)
+0x21c0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an element inside that Cluster) 0x21c7-0x21c8 (1)
| | | type: "uinteger"
0x21c0| 81 | . | size: 1 0x21c8-0x21c9 (1)
0x21c0| 09| | .| | value: 9 0x21c9-0x21ca (1)
diff --git a/format/matroska/testdata/opus.fqtest b/format/matroska/testdata/opus.fqtest
index a7ccd9559..a94f3b496 100644
--- a/format/matroska/testdata/opus.fqtest
+++ b/format/matroska/testdata/opus.fqtest
@@ -155,7 +155,7 @@ $ fq -d matroska dv opus.mkv
0x0f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x107 (13)
0x100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x11a (19)
-0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x109 (2)
+0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated UID that identifies the Segment amongst many others v4 RFC4122 with all bits randomly (or pseudorandomly) chosen) 0x107-0x109 (2)
| | | type: "binary"
0x100| 90 | . | size: 16 0x109-0x10a (1)
0x100| a0 33 a6 65 a7 8d| .3.e..| value: raw bits 0x10a-0x11a (16)
@@ -177,7 +177,7 @@ $ fq -d matroska dv opus.mkv
0x120| 84 | . | size: 4 0x12b-0x12c (1)
0x120| 9c d9 86 ad| ....| value: raw bits 0x12c-0x130 (4)
| | | [1]{}: element 0x130-0x192 (98)
-0x130|ae |. | id: "track_entry" (0xae) (Describes a track with all Elements) 0x130-0x131 (1)
+0x130|ae |. | id: "track_entry" (0xae) (Describes a track with all elements) 0x130-0x131 (1)
| | | type: "master"
0x130| 01 00 00 00 00 00 00 59 | .......Y | size: 89 0x131-0x139 (8)
| | | elements[0:10]: 0x139-0x192 (89)
@@ -187,13 +187,13 @@ $ fq -d matroska dv opus.mkv
0x130| 81 | . | size: 1 0x13a-0x13b (1)
0x130| 01 | . | value: 1 0x13b-0x13c (1)
| | | [1]{}: element 0x13c-0x147 (11)
-0x130| 73 c5 | s. | id: "track_uid" (0x73c5) (A unique ID to identify the Track) 0x13c-0x13e (2)
+0x130| 73 c5 | s. | id: "track_uid" (0x73c5) (A UID that identifies the Track) 0x13c-0x13e (2)
| | | type: "uinteger"
0x130| 88 | . | size: 8 0x13e-0x13f (1)
0x130| 91| .| value: 10488887422851154348 0x13f-0x147 (8)
0x140|90 03 89 e0 1b 01 ac |....... |
| | | [2]{}: element 0x147-0x14a (3)
-0x140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks using lacing) 0x147-0x148 (1)
+0x140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks that use lacing) 0x147-0x148 (1)
| | | type: "uinteger"
0x140| 81 | . | size: 1 0x148-0x149 (1)
0x140| 00 | . | value: 0 0x149-0x14a (1)
@@ -209,7 +209,7 @@ $ fq -d matroska dv opus.mkv
0x150| 86 | . | size: 6 0x152-0x153 (1)
0x150| 41 5f 4f 50 55 53 | A_OPUS | value: "A_OPUS" 0x153-0x159 (6)
| | | [5]{}: element 0x159-0x15f (6)
-0x150| 56 aa | V. | id: "codec_delay" (0x56aa) (CodecDelay is The codec-built-in delay) 0x159-0x15b (2)
+0x150| 56 aa | V. | id: "codec_delay" (0x56aa) (The built-in delay for the codec) 0x159-0x15b (2)
| | | type: "uinteger"
0x150| 83 | . | size: 3 0x15b-0x15c (1)
0x150| 26 25 a0 | &%. | value: 2500000 0x15c-0x15f (3)
@@ -275,7 +275,7 @@ $ fq -d matroska dv opus.mkv
0x1a0|01 00 00 00 00 00 00 27 |.......' | size: 39 0x1a0-0x1a8 (8)
| | | elements[0:2]: 0x1a8-0x1cf (39)
| | | [0]{}: element 0x1a8-0x1ab (3)
-0x1a0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0x1a8-0x1aa (2)
+0x1a0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0x1a8-0x1aa (2)
| | | type: "master"
0x1a0| 80 | . | size: 0 0x1aa-0x1ab (1)
| | | elements[0:0]: 0x1ab-0x1ab (0)
@@ -286,12 +286,12 @@ $ fq -d matroska dv opus.mkv
0x1b0|00 00 00 00 1a |..... |
| | | elements[0:2]: 0x1b5-0x1cf (26)
| | | [0]{}: element 0x1b5-0x1bf (10)
-0x1b0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x1b5-0x1b7 (2)
+0x1b0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x1b5-0x1b7 (2)
| | | type: "utf8"
0x1b0| 87 | . | size: 7 0x1b7-0x1b8 (1)
0x1b0| 45 4e 43 4f 44 45 52 | ENCODER | value: "ENCODER" 0x1b8-0x1bf (7)
| | | [1]{}: element 0x1bf-0x1cf (16)
-0x1b0| 44| D| id: "tag_string" (0x4487) (The value of the Tag) 0x1bf-0x1c1 (2)
+0x1b0| 44| D| id: "tag_string" (0x4487) (The tag value) 0x1bf-0x1c1 (2)
0x1c0|87 |. |
| | | type: "utf8"
0x1c0| 8d | . | size: 13 0x1c1-0x1c2 (1)
@@ -303,12 +303,12 @@ $ fq -d matroska dv opus.mkv
0x1d0| 01 00 00 00 00 00 00 5c | .......\ | size: 92 0x1d1-0x1d9 (8)
| | | elements[0:3]: 0x1d9-0x235 (92)
| | | [0]{}: element 0x1d9-0x1e7 (14)
-0x1d0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0x1d9-0x1db (2)
+0x1d0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0x1d9-0x1db (2)
| | | type: "master"
0x1d0| 8b | . | size: 11 0x1db-0x1dc (1)
| | | elements[0:1]: 0x1dc-0x1e7 (11)
| | | [0]{}: element 0x1dc-0x1e7 (11)
-0x1d0| 63 c5 | c. | id: "tag_track_uid" (0x63c5) (A unique ID to identify the Track(s) the tags belong to) 0x1dc-0x1de (2)
+0x1d0| 63 c5 | c. | id: "tag_track_uid" (0x63c5) (A UID that identifies the Track(s) that the tags belong to) 0x1dc-0x1de (2)
| | | type: "uinteger"
0x1d0| 88 | . | size: 8 0x1de-0x1df (1)
0x1d0| 91| .| value: 10488887422851154348 0x1df-0x1e7 (8)
@@ -320,12 +320,12 @@ $ fq -d matroska dv opus.mkv
0x1f0|1f |. |
| | | elements[0:2]: 0x1f1-0x210 (31)
| | | [0]{}: element 0x1f1-0x1fb (10)
-0x1f0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x1f1-0x1f3 (2)
+0x1f0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x1f1-0x1f3 (2)
| | | type: "utf8"
0x1f0| 87 | . | size: 7 0x1f3-0x1f4 (1)
0x1f0| 45 4e 43 4f 44 45 52 | ENCODER | value: "ENCODER" 0x1f4-0x1fb (7)
| | | [1]{}: element 0x1fb-0x210 (21)
-0x1f0| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x1fb-0x1fd (2)
+0x1f0| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x1fb-0x1fd (2)
| | | type: "utf8"
0x1f0| 92 | . | size: 18 0x1fd-0x1fe (1)
0x1f0| 4c 61| La| value: "Lavc58.91.100 opus" 0x1fe-0x210 (18)
@@ -336,12 +336,12 @@ $ fq -d matroska dv opus.mkv
0x210| a2 | . | size: 34 0x212-0x213 (1)
| | | elements[0:2]: 0x213-0x235 (34)
| | | [0]{}: element 0x213-0x21e (11)
-0x210| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x213-0x215 (2)
+0x210| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x213-0x215 (2)
| | | type: "utf8"
0x210| 88 | . | size: 8 0x215-0x216 (1)
0x210| 44 55 52 41 54 49 4f 4e | DURATION | value: "DURATION" 0x216-0x21e (8)
| | | [1]{}: element 0x21e-0x235 (23)
-0x210| 44 87| D.| id: "tag_string" (0x4487) (The value of the Tag) 0x21e-0x220 (2)
+0x210| 44 87| D.| id: "tag_string" (0x4487) (The tag value) 0x21e-0x220 (2)
| | | type: "utf8"
0x220|94 |. | size: 20 0x220-0x221 (1)
0x220| 30 30 3a 30 30 3a 30 30 2e 30 35 34 30 30 30| 00:00:00.054000| value: "00:00:00.054000000" 0x221-0x235 (20)
@@ -363,7 +363,7 @@ $ fq -d matroska dv opus.mkv
0x240| 81 | . | size: 1 0x242-0x243 (1)
0x240| 00 | . | value: 0 0x243-0x244 (1)
| | | [2]{}: element 0x244-0x2c3 (127)
-0x240| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x244-0x245 (1)
+0x240| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x244-0x245 (1)
| | | type: "binary"
0x240| fd | . | size: 125 0x245-0x246 (1)
0x240| 81 | . | track_number: 1 0x246-0x247 (1)
@@ -391,7 +391,7 @@ $ fq -d matroska dv opus.mkv
0x250|dd 59 43 1b ff 52 f3 16 f1 48 28 77 86 10 ba ff|.YC..R...H(w....|
* |until 0x2c2.7 (120) | |
| | | [3]{}: element 0x2c3-0x342 (127)
-0x2c0| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x2c3-0x2c4 (1)
+0x2c0| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x2c3-0x2c4 (1)
| | | type: "binary"
0x2c0| fd | . | size: 125 0x2c4-0x2c5 (1)
0x2c0| 81 | . | track_number: 1 0x2c5-0x2c6 (1)
@@ -477,7 +477,7 @@ $ fq -d matroska dv opus.mkv
0x3d0| 81| .| size: 1 0x3df-0x3e0 (1)
0x3e0|00 |. | value: 0 0x3e0-0x3e1 (1)
| | | [1]{}: element 0x3e1-0x3ed (12)
-0x3e0| b7 | . | id: "cue_track_positions" (0xb7) (Contain positions for different tracks corresponding to the timestamp) 0x3e1-0x3e2 (1)
+0x3e0| b7 | . | id: "cue_track_positions" (0xb7) (Contains positions for different tracks corresponding to the timestamp) 0x3e1-0x3e2 (1)
| | | type: "master"
0x3e0| 8a | . | size: 10 0x3e2-0x3e3 (1)
| | | elements[0:3]: 0x3e3-0x3ed (10)
@@ -492,7 +492,7 @@ $ fq -d matroska dv opus.mkv
0x3e0| 82 | . | size: 2 0x3e7-0x3e8 (1)
0x3e0| 02 01 | .. | value: 513 0x3e8-0x3ea (2)
| | | [2]{}: element 0x3ea-0x3ed (3)
-0x3e0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an Element inside that Cluster) 0x3ea-0x3eb (1)
+0x3e0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an element inside that Cluster) 0x3ea-0x3eb (1)
| | | type: "uinteger"
0x3e0| 81 | . | size: 1 0x3eb-0x3ec (1)
0x3e0| 09| | .| | value: 9 0x3ec-0x3ed (1)
diff --git a/format/matroska/testdata/sweep-with-DC.mkvmerge13.mka.fqtest b/format/matroska/testdata/sweep-with-DC.mkvmerge13.mka.fqtest
index 8aad5d82f..36b1d3fab 100644
--- a/format/matroska/testdata/sweep-with-DC.mkvmerge13.mka.fqtest
+++ b/format/matroska/testdata/sweep-with-DC.mkvmerge13.mka.fqtest
@@ -161,7 +161,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x10a0| 88 | . | size: 8 0x10a7-0x10a8 (1)
0x10a0| 09 7b f0 a0 97 43 d2 00| .{...C..| value: 683404341000000000 (2022-08-28T18:32:21Z) 0x10a8-0x10b0 (8)
| | | [5]{}: element 0x10b0-0x10c3 (19)
-0x10b0|73 a4 |s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x10b0-0x10b2 (2)
+0x10b0|73 a4 |s. | id: "segment_uuid" (0x73a4) (A randomly generated UID that identifies the Segment amongst many others v4 RFC4122 with all bits randomly (or pseudorandomly) chosen) 0x10b0-0x10b2 (2)
| | | type: "binary"
0x10b0| 90 | . | size: 16 0x10b2-0x10b3 (1)
0x10b0| 3b 9f 28 c7 c4 90 8a e0 cd 66 8f 11 8f| ;.(......f...| value: raw bits 0x10b3-0x10c3 (16)
@@ -172,7 +172,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x10c0| 40 c7 | @. | size: 199 0x10c7-0x10c9 (2)
| | | elements[0:1]: 0x10c9-0x1190 (199)
| | | [0]{}: element 0x10c9-0x1190 (199)
-0x10c0| ae | . | id: "track_entry" (0xae) (Describes a track with all Elements) 0x10c9-0x10ca (1)
+0x10c0| ae | . | id: "track_entry" (0xae) (Describes a track with all elements) 0x10c9-0x10ca (1)
| | | type: "master"
0x10c0| 40 c4 | @. | size: 196 0x10ca-0x10cc (2)
| | | elements[0:9]: 0x10cc-0x1190 (196)
@@ -182,7 +182,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x10c0| 81 | . | size: 1 0x10cd-0x10ce (1)
0x10c0| 01 | . | value: 1 0x10ce-0x10cf (1)
| | | [1]{}: element 0x10cf-0x10da (11)
-0x10c0| 73| s| id: "track_uid" (0x73c5) (A unique ID to identify the Track) 0x10cf-0x10d1 (2)
+0x10c0| 73| s| id: "track_uid" (0x73c5) (A UID that identifies the Track) 0x10cf-0x10d1 (2)
0x10d0|c5 |. |
| | | type: "uinteger"
0x10d0| 88 | . | size: 8 0x10d1-0x10d2 (1)
@@ -296,7 +296,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x15c0| 81 | . | size: 1 0x15c1-0x15c2 (1)
0x15c0| 00 | . | value: 0 0x15c2-0x15c3 (1)
| | | [1]{}: element 0x15c3-0x1632 (111)
-0x15c0| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x15c3-0x15c4 (1)
+0x15c0| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x15c3-0x15c4 (1)
| | | type: "binary"
0x15c0| ed | . | size: 109 0x15c4-0x15c5 (1)
0x15c0| 81 | . | track_number: 1 0x15c5-0x15c6 (1)
@@ -496,7 +496,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
| | | byte_align: 0 (valid) 0x1630-0x1630 (0)
0x1630|b0 6d |.m | footer_crc: "b06d" (raw bits) (valid) 0x1630-0x1632 (2)
| | | [2]{}: element 0x1632-0x16a1 (111)
-0x1630| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x1632-0x1633 (1)
+0x1630| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x1632-0x1633 (1)
| | | type: "binary"
0x1630| ed | . | size: 109 0x1633-0x1634 (1)
0x1630| 81 | . | track_number: 1 0x1634-0x1635 (1)
@@ -697,7 +697,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x1690| 6c| l| footer_crc: "6cf6" (raw bits) (valid) 0x169f-0x16a1 (2)
0x16a0|f6 |. |
| | | [3]{}: element 0x16a1-0x197a (729)
-0x16a0| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x16a1-0x16a2 (1)
+0x16a0| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x16a1-0x16a2 (1)
| | | type: "binary"
0x16a0| 42 d6 | B. | size: 726 0x16a2-0x16a4 (2)
0x16a0| 81 | . | track_number: 1 0x16a4-0x16a5 (1)
@@ -849,7 +849,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x1980| 82 | . | size: 2 0x1981-0x1982 (1)
0x1980| 85 03 | .. | value: 34051 0x1982-0x1984 (2)
| | | [1]{}: element 0x1984-0x2116 (1938)
-0x1980| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x1984-0x1985 (1)
+0x1980| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x1984-0x1985 (1)
| | | type: "binary"
0x1980| 47 8f | G. | size: 1935 0x1985-0x1987 (2)
0x1980| 81 | . | track_number: 1 0x1987-0x1988 (1)
@@ -1202,7 +1202,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x2110| f0 | . | byte_align: 0 (valid) 0x2113.4-0x2114 (0.4)
0x2110| cd c2 | .. | footer_crc: "cdc2" (raw bits) (valid) 0x2114-0x2116 (2)
| | | [2]{}: element 0x2116-0x28b8 (1954)
-0x2110| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x2116-0x2117 (1)
+0x2110| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x2116-0x2117 (1)
| | | type: "binary"
0x2110| 47 9f | G. | size: 1951 0x2117-0x2119 (2)
0x2110| 81 | . | track_number: 1 0x2119-0x211a (1)
@@ -1554,7 +1554,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x28b0| 3c | < | byte_align: 0 (valid) 0x28b5.6-0x28b6 (0.2)
0x28b0| 37 52 | 7R | footer_crc: "3752" (raw bits) (valid) 0x28b6-0x28b8 (2)
| | | [3]{}: element 0x28b8-0x2b9f (743)
-0x28b0| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x28b8-0x28b9 (1)
+0x28b0| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x28b8-0x28b9 (1)
| | | type: "binary"
0x28b0| 42 e4 | B. | size: 740 0x28b9-0x28bb (2)
0x28b0| 81 | . | track_number: 1 0x28bb-0x28bc (1)
@@ -1706,7 +1706,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x2ba0| 83 | . | size: 3 0x2ba6-0x2ba7 (1)
0x2ba0| 01 0a 05 | ... | value: 68101 0x2ba7-0x2baa (3)
| | | [1]{}: element 0x2baa-0x337b (2001)
-0x2ba0| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x2baa-0x2bab (1)
+0x2ba0| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x2baa-0x2bab (1)
| | | type: "binary"
0x2ba0| 47 ce | G. | size: 1998 0x2bab-0x2bad (2)
0x2ba0| 81 | . | track_number: 1 0x2bad-0x2bae (1)
@@ -2059,7 +2059,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x3370| 7c | | | byte_align: 0 (valid) 0x3378.6-0x3379 (0.2)
0x3370| 33 81 | 3. | footer_crc: "3381" (raw bits) (valid) 0x3379-0x337b (2)
| | | [2]{}: element 0x337b-0x3b7f (2052)
-0x3370| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x337b-0x337c (1)
+0x3370| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x337b-0x337c (1)
| | | type: "binary"
0x3370| 48 01 | H. | size: 2049 0x337c-0x337e (2)
0x3370| 81 | . | track_number: 1 0x337e-0x337f (1)
@@ -2411,7 +2411,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x3b70| 3e | > | byte_align: 0 (valid) 0x3b7c.7-0x3b7d (0.1)
0x3b70| 91 e9 | .. | footer_crc: "91e9" (raw bits) (valid) 0x3b7d-0x3b7f (2)
| | | [3]{}: element 0x3b7f-0x3e9c (797)
-0x3b70| a3| .| id: "simple_block" (0xa3) (Similar to Block) 0x3b7f-0x3b80 (1)
+0x3b70| a3| .| id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x3b7f-0x3b80 (1)
| | | type: "binary"
0x3b80|43 1a |C. | size: 794 0x3b80-0x3b82 (2)
0x3b80| 81 | . | track_number: 1 0x3b82-0x3b83 (1)
@@ -2562,7 +2562,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x3ea0| 83 | . | size: 3 0x3ea3-0x3ea4 (1)
0x3ea0| 01 8f 08 | ... | value: 102152 0x3ea4-0x3ea7 (3)
| | | [1]{}: element 0x3ea7-0x460d (1894)
-0x3ea0| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x3ea7-0x3ea8 (1)
+0x3ea0| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x3ea7-0x3ea8 (1)
| | | type: "binary"
0x3ea0| 47 63 | Gc | size: 1891 0x3ea8-0x3eaa (2)
0x3ea0| 81 | . | track_number: 1 0x3eaa-0x3eab (1)
@@ -2947,7 +2947,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x4670| 81 | . | size: 1 0x467d-0x467e (1)
0x4670| 00 | . | value: 0 0x467e-0x467f (1)
| | | [1]{}: element 0x467f-0x468b (12)
-0x4670| b7| .| id: "cue_track_positions" (0xb7) (Contain positions for different tracks corresponding to the timestamp) 0x467f-0x4680 (1)
+0x4670| b7| .| id: "cue_track_positions" (0xb7) (Contains positions for different tracks corresponding to the timestamp) 0x467f-0x4680 (1)
| | | type: "master"
0x4680|8a |. | size: 10 0x4680-0x4681 (1)
| | | elements[0:3]: 0x4681-0x468b (10)
@@ -2962,7 +2962,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x4680| 82 | . | size: 2 0x4685-0x4686 (1)
0x4680| 15 86 | .. | value: 5510 0x4686-0x4688 (2)
| | | [2]{}: element 0x4688-0x468b (3)
-0x4680| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an Element inside that Cluster) 0x4688-0x4689 (1)
+0x4680| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an element inside that Cluster) 0x4688-0x4689 (1)
| | | type: "uinteger"
0x4680| 81 | . | size: 1 0x4689-0x468a (1)
0x4680| 03 | . | value: 3 0x468a-0x468b (1)
@@ -2978,7 +2978,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x4680| 38| 8| value: 14337 0x468f-0x4691 (2)
0x4690|01 |. |
| | | [1]{}: element 0x4691-0x469d (12)
-0x4690| b7 | . | id: "cue_track_positions" (0xb7) (Contain positions for different tracks corresponding to the timestamp) 0x4691-0x4692 (1)
+0x4690| b7 | . | id: "cue_track_positions" (0xb7) (Contains positions for different tracks corresponding to the timestamp) 0x4691-0x4692 (1)
| | | type: "master"
0x4690| 8a | . | size: 10 0x4692-0x4693 (1)
| | | elements[0:3]: 0x4693-0x469d (10)
@@ -2993,7 +2993,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x4690| 82 | . | size: 2 0x4697-0x4698 (1)
0x4690| 15 86 | .. | value: 5510 0x4698-0x469a (2)
| | | [2]{}: element 0x469a-0x469d (3)
-0x4690| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an Element inside that Cluster) 0x469a-0x469b (1)
+0x4690| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an element inside that Cluster) 0x469a-0x469b (1)
| | | type: "uinteger"
0x4690| 81 | . | size: 1 0x469b-0x469c (1)
0x4690| 72 | r | value: 114 0x469c-0x469d (1)
@@ -3008,7 +3008,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x46a0|82 |. | size: 2 0x46a0-0x46a1 (1)
0x46a0| 85 03 | .. | value: 34051 0x46a1-0x46a3 (2)
| | | [1]{}: element 0x46a3-0x46af (12)
-0x46a0| b7 | . | id: "cue_track_positions" (0xb7) (Contain positions for different tracks corresponding to the timestamp) 0x46a3-0x46a4 (1)
+0x46a0| b7 | . | id: "cue_track_positions" (0xb7) (Contains positions for different tracks corresponding to the timestamp) 0x46a3-0x46a4 (1)
| | | type: "master"
0x46a0| 8a | . | size: 10 0x46a4-0x46a5 (1)
| | | elements[0:3]: 0x46a5-0x46af (10)
@@ -3023,7 +3023,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x46a0| 82 | . | size: 2 0x46a9-0x46aa (1)
0x46a0| 19 46 | .F | value: 6470 0x46aa-0x46ac (2)
| | | [2]{}: element 0x46ac-0x46af (3)
-0x46a0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an Element inside that Cluster) 0x46ac-0x46ad (1)
+0x46a0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an element inside that Cluster) 0x46ac-0x46ad (1)
| | | type: "uinteger"
0x46a0| 81 | . | size: 1 0x46ad-0x46ae (1)
0x46a0| 04 | . | value: 4 0x46ae-0x46af (1)
@@ -3038,7 +3038,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x46b0| 83 | . | size: 3 0x46b2-0x46b3 (1)
0x46b0| 01 0a 05 | ... | value: 68101 0x46b3-0x46b6 (3)
| | | [1]{}: element 0x46b6-0x46c2 (12)
-0x46b0| b7 | . | id: "cue_track_positions" (0xb7) (Contain positions for different tracks corresponding to the timestamp) 0x46b6-0x46b7 (1)
+0x46b0| b7 | . | id: "cue_track_positions" (0xb7) (Contains positions for different tracks corresponding to the timestamp) 0x46b6-0x46b7 (1)
| | | type: "master"
0x46b0| 8a | . | size: 10 0x46b7-0x46b8 (1)
| | | elements[0:3]: 0x46b8-0x46c2 (10)
@@ -3053,7 +3053,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x46b0| 82 | . | size: 2 0x46bc-0x46bd (1)
0x46b0| 2b 6b | +k | value: 11115 0x46bd-0x46bf (2)
| | | [2]{}: element 0x46bf-0x46c2 (3)
-0x46b0| f0| .| id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an Element inside that Cluster) 0x46bf-0x46c0 (1)
+0x46b0| f0| .| id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an element inside that Cluster) 0x46bf-0x46c0 (1)
| | | type: "uinteger"
0x46c0|81 |. | size: 1 0x46c0-0x46c1 (1)
0x46c0| 05 | . | value: 5 0x46c1-0x46c2 (1)
@@ -3068,7 +3068,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x46c0| 83 | . | size: 3 0x46c5-0x46c6 (1)
0x46c0| 01 42 06 | .B. | value: 82438 0x46c6-0x46c9 (3)
| | | [1]{}: element 0x46c9-0x46d6 (13)
-0x46c0| b7 | . | id: "cue_track_positions" (0xb7) (Contain positions for different tracks corresponding to the timestamp) 0x46c9-0x46ca (1)
+0x46c0| b7 | . | id: "cue_track_positions" (0xb7) (Contains positions for different tracks corresponding to the timestamp) 0x46c9-0x46ca (1)
| | | type: "master"
0x46c0| 8b | . | size: 11 0x46ca-0x46cb (1)
| | | elements[0:3]: 0x46cb-0x46d6 (11)
@@ -3083,7 +3083,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x46c0| 82| .| size: 2 0x46cf-0x46d0 (1)
0x46d0|2b 6b |+k | value: 11115 0x46d0-0x46d2 (2)
| | | [2]{}: element 0x46d2-0x46d6 (4)
-0x46d0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an Element inside that Cluster) 0x46d2-0x46d3 (1)
+0x46d0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an element inside that Cluster) 0x46d2-0x46d3 (1)
| | | type: "uinteger"
0x46d0| 82 | . | size: 2 0x46d3-0x46d4 (1)
0x46d0| 07 d6 | .. | value: 2006 0x46d4-0x46d6 (2)
@@ -3098,7 +3098,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x46d0| 41 9f| A.| size: 415 0x46de-0x46e0 (2)
| | | elements[0:8]: 0x46e0-0x487f (415)
| | | [0]{}: element 0x46e0-0x46fa (26)
-0x46e0|63 c0 |c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0x46e0-0x46e2 (2)
+0x46e0|63 c0 |c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0x46e0-0x46e2 (2)
| | | type: "master"
0x46e0| 97 | . | size: 23 0x46e2-0x46e3 (1)
| | | elements[0:3]: 0x46e3-0x46fa (23)
@@ -3108,13 +3108,13 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x46e0| 81 | . | size: 1 0x46e5-0x46e6 (1)
0x46e0| 32 | 2 | value: "album_opera_concert_movie_episode" (50) (The most common grouping level of music and video) 0x46e6-0x46e7 (1)
| | | [1]{}: element 0x46e7-0x46f2 (11)
-0x46e0| 63 c5 | c. | id: "tag_track_uid" (0x63c5) (A unique ID to identify the Track(s) the tags belong to) 0x46e7-0x46e9 (2)
+0x46e0| 63 c5 | c. | id: "tag_track_uid" (0x63c5) (A UID that identifies the Track(s) that the tags belong to) 0x46e7-0x46e9 (2)
| | | type: "uinteger"
0x46e0| 88 | . | size: 8 0x46e9-0x46ea (1)
0x46e0| 34 a9 ce 93 aa 66| 4....f| value: 3794791294650729286 0x46ea-0x46f2 (8)
0x46f0|c3 46 |.F |
| | | [2]{}: element 0x46f2-0x46fa (8)
-0x46f0| 63 ca | c. | id: "target_type" (0x63ca) (An informational string that can be used to display the logical level of the target like "ALBUM") 0x46f2-0x46f4 (2)
+0x46f0| 63 ca | c. | id: "target_type" (0x63ca) (An informational string that can be used to display the logical level of the target) 0x46f2-0x46f4 (2)
| | | type: "string"
0x46f0| 85 | . | size: 5 0x46f4-0x46f5 (1)
0x46f0| 4d 4f 56 49 45 | MOVIE | value: "targettypevalue_50" ("MOVIE") 0x46f5-0x46fa (5)
@@ -3124,17 +3124,17 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x46f0| 99 | . | size: 25 0x46fc-0x46fd (1)
| | | elements[0:4]: 0x46fd-0x4716 (25)
| | | [0]{}: element 0x46fd-0x4703 (6)
-0x46f0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x46fd-0x46ff (2)
+0x46f0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x46fd-0x46ff (2)
| | | type: "utf8"
0x46f0| 83| .| size: 3 0x46ff-0x4700 (1)
0x4700|42 50 53 |BPS | value: "BPS" 0x4700-0x4703 (3)
| | | [1]{}: element 0x4703-0x470b (8)
-0x4700| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x4703-0x4705 (2)
+0x4700| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x4703-0x4705 (2)
| | | type: "utf8"
0x4700| 85 | . | size: 5 0x4705-0x4706 (1)
0x4700| 33 37 37 34 37 | 37747 | value: "37747" 0x4706-0x470b (5)
| | | [2]{}: element 0x470b-0x4711 (6)
-0x4700| 44 7a | Dz | id: "tag_language" (0x447a) (Specifies the language of the tag specified) 0x470b-0x470d (2)
+0x4700| 44 7a | Dz | id: "tag_language" (0x447a) (Specifies the language of the specified tag in the Matroska languages form) 0x470b-0x470d (2)
| | | type: "string"
0x4700| 83 | . | size: 3 0x470d-0x470e (1)
0x4700| 65 6e| en| value: "eng" 0x470e-0x4711 (3)
@@ -3150,19 +3150,19 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x4710| ab | . | size: 43 0x4718-0x4719 (1)
| | | elements[0:4]: 0x4719-0x4744 (43)
| | | [0]{}: element 0x4719-0x4724 (11)
-0x4710| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x4719-0x471b (2)
+0x4710| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x4719-0x471b (2)
| | | type: "utf8"
0x4710| 88 | . | size: 8 0x471b-0x471c (1)
0x4710| 44 55 52 41| DURA| value: "DURATION" 0x471c-0x4724 (8)
0x4720|54 49 4f 4e |TION |
| | | [1]{}: element 0x4724-0x4739 (21)
-0x4720| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x4724-0x4726 (2)
+0x4720| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x4724-0x4726 (2)
| | | type: "utf8"
0x4720| 92 | . | size: 18 0x4726-0x4727 (1)
0x4720| 30 30 3a 30 30 3a 30 32 2e| 00:00:02.| value: "00:00:02.607714066" 0x4727-0x4739 (18)
0x4730|36 30 37 37 31 34 30 36 36 |607714066 |
| | | [2]{}: element 0x4739-0x473f (6)
-0x4730| 44 7a | Dz | id: "tag_language" (0x447a) (Specifies the language of the tag specified) 0x4739-0x473b (2)
+0x4730| 44 7a | Dz | id: "tag_language" (0x447a) (Specifies the language of the specified tag in the Matroska languages form) 0x4739-0x473b (2)
| | | type: "string"
0x4730| 83 | . | size: 3 0x473b-0x473c (1)
0x4730| 65 6e 67 | eng | value: "eng" 0x473c-0x473f (3)
@@ -3178,18 +3178,18 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x4740| a3 | . | size: 35 0x4746-0x4747 (1)
| | | elements[0:4]: 0x4747-0x476a (35)
| | | [0]{}: element 0x4747-0x475a (19)
-0x4740| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x4747-0x4749 (2)
+0x4740| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x4747-0x4749 (2)
| | | type: "utf8"
0x4740| 90 | . | size: 16 0x4749-0x474a (1)
0x4740| 4e 55 4d 42 45 52| NUMBER| value: "NUMBER_OF_FRAMES" 0x474a-0x475a (16)
0x4750|5f 4f 46 5f 46 52 41 4d 45 53 |_OF_FRAMES |
| | | [1]{}: element 0x475a-0x475f (5)
-0x4750| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x475a-0x475c (2)
+0x4750| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x475a-0x475c (2)
| | | type: "utf8"
0x4750| 82 | . | size: 2 0x475c-0x475d (1)
0x4750| 36 35 | 65 | value: "65" 0x475d-0x475f (2)
| | | [2]{}: element 0x475f-0x4765 (6)
-0x4750| 44| D| id: "tag_language" (0x447a) (Specifies the language of the tag specified) 0x475f-0x4761 (2)
+0x4750| 44| D| id: "tag_language" (0x447a) (Specifies the language of the specified tag in the Matroska languages form) 0x475f-0x4761 (2)
0x4760|7a |z |
| | | type: "string"
0x4760| 83 | . | size: 3 0x4761-0x4762 (1)
@@ -3205,18 +3205,18 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x4760| a5 | . | size: 37 0x476c-0x476d (1)
| | | elements[0:4]: 0x476d-0x4792 (37)
| | | [0]{}: element 0x476d-0x477f (18)
-0x4760| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x476d-0x476f (2)
+0x4760| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x476d-0x476f (2)
| | | type: "utf8"
0x4760| 8f| .| size: 15 0x476f-0x4770 (1)
0x4770|4e 55 4d 42 45 52 5f 4f 46 5f 42 59 54 45 53 |NUMBER_OF_BYTES | value: "NUMBER_OF_BYTES" 0x4770-0x477f (15)
| | | [1]{}: element 0x477f-0x4787 (8)
-0x4770| 44| D| id: "tag_string" (0x4487) (The value of the Tag) 0x477f-0x4781 (2)
+0x4770| 44| D| id: "tag_string" (0x4487) (The tag value) 0x477f-0x4781 (2)
0x4780|87 |. |
| | | type: "utf8"
0x4780| 85 | . | size: 5 0x4781-0x4782 (1)
0x4780| 31 32 33 30 31 | 12301 | value: "12301" 0x4782-0x4787 (5)
| | | [2]{}: element 0x4787-0x478d (6)
-0x4780| 44 7a | Dz | id: "tag_language" (0x447a) (Specifies the language of the tag specified) 0x4787-0x4789 (2)
+0x4780| 44 7a | Dz | id: "tag_language" (0x447a) (Specifies the language of the specified tag in the Matroska languages form) 0x4787-0x4789 (2)
| | | type: "string"
0x4780| 83 | . | size: 3 0x4789-0x478a (1)
0x4780| 65 6e 67 | eng | value: "eng" 0x478a-0x478d (3)
@@ -3231,13 +3231,13 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x4790| d6 | . | size: 86 0x4794-0x4795 (1)
| | | elements[0:4]: 0x4795-0x47eb (86)
| | | [0]{}: element 0x4795-0x47af (26)
-0x4790| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x4795-0x4797 (2)
+0x4790| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x4795-0x4797 (2)
| | | type: "utf8"
0x4790| 97 | . | size: 23 0x4797-0x4798 (1)
0x4790| 5f 53 54 41 54 49 53 54| _STATIST| value: "_STATISTICS_WRITING_APP" 0x4798-0x47af (23)
0x47a0|49 43 53 5f 57 52 49 54 49 4e 47 5f 41 50 50 |ICS_WRITING_APP |
| | | [1]{}: element 0x47af-0x47e0 (49)
-0x47a0| 44| D| id: "tag_string" (0x4487) (The value of the Tag) 0x47af-0x47b1 (2)
+0x47a0| 44| D| id: "tag_string" (0x4487) (The tag value) 0x47af-0x47b1 (2)
0x47b0|87 |. |
| | | type: "utf8"
0x47b0| ae | . | size: 46 0x47b1-0x47b2 (1)
@@ -3245,7 +3245,7 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x47c0|2e 30 20 28 27 53 65 63 72 65 74 20 46 6f 72 20|.0 ('Secret For |
0x47d0|54 68 65 20 4d 61 64 27 29 20 36 34 2d 62 69 74|The Mad') 64-bit|
| | | [2]{}: element 0x47e0-0x47e6 (6)
-0x47e0|44 7a |Dz | id: "tag_language" (0x447a) (Specifies the language of the tag specified) 0x47e0-0x47e2 (2)
+0x47e0|44 7a |Dz | id: "tag_language" (0x447a) (Specifies the language of the specified tag in the Matroska languages form) 0x47e0-0x47e2 (2)
| | | type: "string"
0x47e0| 83 | . | size: 3 0x47e2-0x47e3 (1)
0x47e0| 65 6e 67 | eng | value: "eng" 0x47e3-0x47e6 (3)
@@ -3260,19 +3260,19 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x47e0| c0 | . | size: 64 0x47ed-0x47ee (1)
| | | elements[0:4]: 0x47ee-0x482e (64)
| | | [0]{}: element 0x47ee-0x480d (31)
-0x47e0| 45 a3| E.| id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x47ee-0x47f0 (2)
+0x47e0| 45 a3| E.| id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x47ee-0x47f0 (2)
| | | type: "utf8"
0x47f0|9c |. | size: 28 0x47f0-0x47f1 (1)
0x47f0| 5f 53 54 41 54 49 53 54 49 43 53 5f 57 52 49| _STATISTICS_WRI| value: "_STATISTICS_WRITING_DATE_UTC" 0x47f1-0x480d (28)
0x4800|54 49 4e 47 5f 44 41 54 45 5f 55 54 43 |TING_DATE_UTC |
| | | [1]{}: element 0x480d-0x4823 (22)
-0x4800| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x480d-0x480f (2)
+0x4800| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x480d-0x480f (2)
| | | type: "utf8"
0x4800| 93| .| size: 19 0x480f-0x4810 (1)
0x4810|32 30 32 32 2d 30 38 2d 32 38 20 31 38 3a 33 32|2022-08-28 18:32| value: "2022-08-28 18:32:21" 0x4810-0x4823 (19)
0x4820|3a 32 31 |:21 |
| | | [2]{}: element 0x4823-0x4829 (6)
-0x4820| 44 7a | Dz | id: "tag_language" (0x447a) (Specifies the language of the tag specified) 0x4823-0x4825 (2)
+0x4820| 44 7a | Dz | id: "tag_language" (0x447a) (Specifies the language of the specified tag in the Matroska languages form) 0x4823-0x4825 (2)
| | | type: "string"
0x4820| 83 | . | size: 3 0x4825-0x4826 (1)
0x4820| 65 6e 67 | eng | value: "eng" 0x4826-0x4829 (3)
@@ -3287,20 +3287,20 @@ $ fq dv sweep-with-DC.mkvmerge13.mka
0x4830|ce |. | size: 78 0x4830-0x4831 (1)
| | | elements[0:4]: 0x4831-0x487f (78)
| | | [0]{}: element 0x4831-0x4844 (19)
-0x4830| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x4831-0x4833 (2)
+0x4830| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x4831-0x4833 (2)
| | | type: "utf8"
0x4830| 90 | . | size: 16 0x4833-0x4834 (1)
0x4830| 5f 53 54 41 54 49 53 54 49 43 53 5f| _STATISTICS_| value: "_STATISTICS_TAGS" 0x4834-0x4844 (16)
0x4840|54 41 47 53 |TAGS |
| | | [1]{}: element 0x4844-0x4874 (48)
-0x4840| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x4844-0x4846 (2)
+0x4840| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x4844-0x4846 (2)
| | | type: "utf8"
0x4840| ad | . | size: 45 0x4846-0x4847 (1)
0x4840| 42 50 53 20 44 55 52 41 54| BPS DURAT| value: "BPS DURATION NUMBER_OF_FRAMES NUMBER_OF_BYTES" 0x4847-0x4874 (45)
0x4850|49 4f 4e 20 4e 55 4d 42 45 52 5f 4f 46 5f 46 52|ION NUMBER_OF_FR|
* |until 0x4873.7 (45) | |
| | | [2]{}: element 0x4874-0x487a (6)
-0x4870| 44 7a | Dz | id: "tag_language" (0x447a) (Specifies the language of the tag specified) 0x4874-0x4876 (2)
+0x4870| 44 7a | Dz | id: "tag_language" (0x447a) (Specifies the language of the specified tag in the Matroska languages form) 0x4874-0x4876 (2)
| | | type: "string"
0x4870| 83 | . | size: 3 0x4876-0x4877 (1)
0x4870| 65 6e 67 | eng | value: "eng" 0x4877-0x487a (3)
diff --git a/format/matroska/testdata/unknown_size.fqtest b/format/matroska/testdata/unknown_size.fqtest
index 942ad9ac8..c0c33dfef 100644
--- a/format/matroska/testdata/unknown_size.fqtest
+++ b/format/matroska/testdata/unknown_size.fqtest
@@ -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-0x107 (13)
0x100|2e 32 37 2e 31 30 30 |.27.100 |
| | | [4]{}: element 0x107-0x11a (19)
-0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x109 (2)
+0x100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated UID that identifies the Segment amongst many others v4 RFC4122 with all bits randomly (or pseudorandomly) chosen) 0x107-0x109 (2)
| | | type: "binary"
0x100| 90 | . | size: 16 0x109-0x10a (1)
0x100| 9c a2 35 00 05 c2| ..5...| value: raw bits 0x10a-0x11a (16)
@@ -164,7 +164,7 @@ $ fq -o decode_samples=false dv unknown_size.mkv
0x120| 01 46 1f| .F.| value: raw bits 0x12d-0x131 (4)
0x130|75 |u |
| | | [1]{}: element 0x131-0xe6c (3387)
-0x130| ae | . | id: "track_entry" (0xae) (Describes a track with all Elements) 0x131-0x132 (1)
+0x130| ae | . | id: "track_entry" (0xae) (Describes a track with all elements) 0x131-0x132 (1)
| | | type: "master"
0x130| 01 00 00 00 00 00 0d 32 | .......2 | size: 3378 0x132-0x13a (8)
| | | elements[0:9]: 0x13a-0xe6c (3378)
@@ -174,12 +174,12 @@ $ fq -o decode_samples=false dv unknown_size.mkv
0x130| 81 | . | size: 1 0x13b-0x13c (1)
0x130| 01 | . | value: 1 0x13c-0x13d (1)
| | | [1]{}: element 0x13d-0x148 (11)
-0x130| 73 c5 | s. | id: "track_uid" (0x73c5) (A unique ID to identify the Track) 0x13d-0x13f (2)
+0x130| 73 c5 | s. | id: "track_uid" (0x73c5) (A UID that identifies the Track) 0x13d-0x13f (2)
| | | type: "uinteger"
0x130| 88| .| size: 8 0x13f-0x140 (1)
0x140|83 ed 1e ef a4 bf 74 c6 |......t. | value: 9506288403059012806 0x140-0x148 (8)
| | | [2]{}: element 0x148-0x14b (3)
-0x140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks using lacing) 0x148-0x149 (1)
+0x140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks that use lacing) 0x148-0x149 (1)
| | | type: "uinteger"
0x140| 81 | . | size: 1 0x149-0x14a (1)
0x140| 00 | . | value: 0 0x14a-0x14b (1)
@@ -190,7 +190,7 @@ $ fq -o decode_samples=false dv unknown_size.mkv
0x140| 75| u| value: "und" 0x14f-0x152 (3)
0x150|6e 64 |nd |
| | | [4]{}: element 0x152-0x155 (3)
-0x150| 88 | . | id: "flag_default" (0x88) (Set if that track is eligible for automatic selection by the player) 0x152-0x153 (1)
+0x150| 88 | . | id: "flag_default" (0x88) (Set to 1 if the track is eligible for automatic selection by the player) 0x152-0x153 (1)
| | | type: "uinteger"
0x150| 81 | . | size: 1 0x153-0x154 (1)
0x150| 00 | . | value: 0 0x154-0x155 (1)
@@ -259,7 +259,7 @@ $ fq -o decode_samples=false dv unknown_size.mkv
0xe70| a0 | . | size: 32 0xe79-0xe7a (1)
| | | elements[0:2]: 0xe7a-0xe9a (32)
| | | [0]{}: element 0xe7a-0xe7d (3)
-0xe70| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0xe7a-0xe7c (2)
+0xe70| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0xe7a-0xe7c (2)
| | | type: "master"
0xe70| 80 | . | size: 0 0xe7c-0xe7d (1)
| | | elements[0:0]: 0xe7d-0xe7d (0)
@@ -269,12 +269,12 @@ $ fq -o decode_samples=false dv unknown_size.mkv
0xe70| 9a| .| size: 26 0xe7f-0xe80 (1)
| | | elements[0:2]: 0xe80-0xe9a (26)
| | | [0]{}: element 0xe80-0xe8a (10)
-0xe80|45 a3 |E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0xe80-0xe82 (2)
+0xe80|45 a3 |E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0xe80-0xe82 (2)
| | | type: "utf8"
0xe80| 87 | . | size: 7 0xe82-0xe83 (1)
0xe80| 45 4e 43 4f 44 45 52 | ENCODER | value: "ENCODER" 0xe83-0xe8a (7)
| | | [1]{}: element 0xe8a-0xe9a (16)
-0xe80| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0xe8a-0xe8c (2)
+0xe80| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0xe8a-0xe8c (2)
| | | type: "utf8"
0xe80| 8d | . | size: 13 0xe8c-0xe8d (1)
0xe80| 4c 61 76| Lav| value: "Lavf59.27.100" 0xe8d-0xe9a (13)
@@ -285,12 +285,12 @@ $ fq -o decode_samples=false dv unknown_size.mkv
0xe90| b5 | . | size: 53 0xe9c-0xe9d (1)
| | | elements[0:2]: 0xe9d-0xed2 (53)
| | | [0]{}: element 0xe9d-0xeab (14)
-0xe90| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0xe9d-0xe9f (2)
+0xe90| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0xe9d-0xe9f (2)
| | | type: "master"
0xe90| 8b| .| size: 11 0xe9f-0xea0 (1)
| | | elements[0:1]: 0xea0-0xeab (11)
| | | [0]{}: element 0xea0-0xeab (11)
-0xea0|63 c5 |c. | id: "tag_track_uid" (0x63c5) (A unique ID to identify the Track(s) the tags belong to) 0xea0-0xea2 (2)
+0xea0|63 c5 |c. | id: "tag_track_uid" (0x63c5) (A UID that identifies the Track(s) that the tags belong to) 0xea0-0xea2 (2)
| | | type: "uinteger"
0xea0| 88 | . | size: 8 0xea2-0xea3 (1)
0xea0| 83 ed 1e ef a4 bf 74 c6 | ......t. | value: 9506288403059012806 0xea3-0xeab (8)
@@ -300,12 +300,12 @@ $ fq -o decode_samples=false dv unknown_size.mkv
0xea0| a4 | . | size: 36 0xead-0xeae (1)
| | | elements[0:2]: 0xeae-0xed2 (36)
| | | [0]{}: element 0xeae-0xeb8 (10)
-0xea0| 45 a3| E.| id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0xeae-0xeb0 (2)
+0xea0| 45 a3| E.| id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0xeae-0xeb0 (2)
| | | type: "utf8"
0xeb0|87 |. | size: 7 0xeb0-0xeb1 (1)
0xeb0| 45 4e 43 4f 44 45 52 | ENCODER | value: "ENCODER" 0xeb1-0xeb8 (7)
| | | [1]{}: element 0xeb8-0xed2 (26)
-0xeb0| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0xeb8-0xeba (2)
+0xeb0| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0xeb8-0xeba (2)
| | | type: "utf8"
0xeb0| 97 | . | size: 23 0xeba-0xebb (1)
0xeb0| 4c 61 76 63 35| Lavc5| value: "Lavc59.37.100 libvorbis" 0xebb-0xed2 (23)
@@ -327,7 +327,7 @@ $ fq -o decode_samples=false dv unknown_size.mkv
0xed0| 81| .| size: 1 0xedf-0xee0 (1)
0xee0|00 |. | value: 0 0xee0-0xee1 (1)
| | | [2]{}: element 0xee1-0xf08 (39)
-0xee0| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0xee1-0xee2 (1)
+0xee0| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0xee1-0xee2 (1)
| | | type: "binary"
0xee0| a5 | . | size: 37 0xee2-0xee3 (1)
0xee0| 81 | . | track_number: 1 0xee3-0xee4 (1)
@@ -342,7 +342,7 @@ $ fq -o decode_samples=false dv unknown_size.mkv
0xef0|01 42 00 a0 dd 71 77 8b ed cd 37 df 7c 33 3a 0c|.B...qw...7.|3:.|
0xf00|c3 30 0c c3 30 d4 50 02 |.0..0.P. |
| | | [3]{}: element 0xf08-0xf80 (120)
-0xf00| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0xf08-0xf09 (1)
+0xf00| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0xf08-0xf09 (1)
| | | type: "binary"
0xf00| f6 | . | size: 118 0xf09-0xf0a (1)
0xf00| 81 | . | track_number: 1 0xf0a-0xf0b (1)
diff --git a/format/matroska/testdata/vorbis.fqtest b/format/matroska/testdata/vorbis.fqtest
index 7062b50e6..5816ef6bd 100644
--- a/format/matroska/testdata/vorbis.fqtest
+++ b/format/matroska/testdata/vorbis.fqtest
@@ -155,7 +155,7 @@ $ fq -d matroska dv vorbis.mkv
0x00f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x107 (13)
0x0100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x11a (19)
-0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x109 (2)
+0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated UID that identifies the Segment amongst many others v4 RFC4122 with all bits randomly (or pseudorandomly) chosen) 0x107-0x109 (2)
| | | type: "binary"
0x0100| 90 | . | size: 16 0x109-0x10a (1)
0x0100| 55 86 bb 9d 18 21| U....!| value: raw bits 0x10a-0x11a (16)
@@ -178,7 +178,7 @@ $ fq -d matroska dv vorbis.mkv
0x0120| 09 8a 9a| ...| value: raw bits 0x12d-0x131 (4)
0x0130|0d |. |
| | | [1]{}: element 0x131-0xe56 (3365)
-0x0130| ae | . | id: "track_entry" (0xae) (Describes a track with all Elements) 0x131-0x132 (1)
+0x0130| ae | . | id: "track_entry" (0xae) (Describes a track with all elements) 0x131-0x132 (1)
| | | type: "master"
0x0130| 01 00 00 00 00 00 0d 1c | ........ | size: 3356 0x132-0x13a (8)
| | | elements[0:8]: 0x13a-0xe56 (3356)
@@ -188,12 +188,12 @@ $ fq -d matroska dv vorbis.mkv
0x0130| 81 | . | size: 1 0x13b-0x13c (1)
0x0130| 01 | . | value: 1 0x13c-0x13d (1)
| | | [1]{}: element 0x13d-0x148 (11)
-0x0130| 73 c5 | s. | id: "track_uid" (0x73c5) (A unique ID to identify the Track) 0x13d-0x13f (2)
+0x0130| 73 c5 | s. | id: "track_uid" (0x73c5) (A UID that identifies the Track) 0x13d-0x13f (2)
| | | type: "uinteger"
0x0130| 88| .| size: 8 0x13f-0x140 (1)
0x0140|2e 55 8d bf 90 c9 26 0f |.U....&. | value: 3338730552672462351 0x140-0x148 (8)
| | | [2]{}: element 0x148-0x14b (3)
-0x0140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks using lacing) 0x148-0x149 (1)
+0x0140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks that use lacing) 0x148-0x149 (1)
| | | type: "uinteger"
0x0140| 81 | . | size: 1 0x149-0x14a (1)
0x0140| 00 | . | value: 0 0x14a-0x14b (1)
@@ -295,7 +295,7 @@ $ fq -d matroska dv vorbis.mkv
0x0e60| 01 00 00 00 00 00 00 27 | .......' | size: 39 0xe64-0xe6c (8)
| | | elements[0:2]: 0xe6c-0xe93 (39)
| | | [0]{}: element 0xe6c-0xe6f (3)
-0x0e60| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0xe6c-0xe6e (2)
+0x0e60| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0xe6c-0xe6e (2)
| | | type: "master"
0x0e60| 80 | . | size: 0 0xe6e-0xe6f (1)
| | | elements[0:0]: 0xe6f-0xe6f (0)
@@ -306,13 +306,13 @@ $ fq -d matroska dv vorbis.mkv
0x0e70| 01 00 00 00 00 00 00 1a | ........ | size: 26 0xe71-0xe79 (8)
| | | elements[0:2]: 0xe79-0xe93 (26)
| | | [0]{}: element 0xe79-0xe83 (10)
-0x0e70| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0xe79-0xe7b (2)
+0x0e70| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0xe79-0xe7b (2)
| | | type: "utf8"
0x0e70| 87 | . | size: 7 0xe7b-0xe7c (1)
0x0e70| 45 4e 43 4f| ENCO| value: "ENCODER" 0xe7c-0xe83 (7)
0x0e80|44 45 52 |DER |
| | | [1]{}: element 0xe83-0xe93 (16)
-0x0e80| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0xe83-0xe85 (2)
+0x0e80| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0xe83-0xe85 (2)
| | | type: "utf8"
0x0e80| 8d | . | size: 13 0xe85-0xe86 (1)
0x0e80| 4c 61 76 66 35 38 2e 34 35 2e| Lavf58.45.| value: "Lavf58.45.100" 0xe86-0xe93 (13)
@@ -323,12 +323,12 @@ $ fq -d matroska dv vorbis.mkv
0x0e90| 01 00 00 00 00 00 00 5e | .......^ | size: 94 0xe95-0xe9d (8)
| | | elements[0:3]: 0xe9d-0xefb (94)
| | | [0]{}: element 0xe9d-0xeab (14)
-0x0e90| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0xe9d-0xe9f (2)
+0x0e90| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0xe9d-0xe9f (2)
| | | type: "master"
0x0e90| 8b| .| size: 11 0xe9f-0xea0 (1)
| | | elements[0:1]: 0xea0-0xeab (11)
| | | [0]{}: element 0xea0-0xeab (11)
-0x0ea0|63 c5 |c. | id: "tag_track_uid" (0x63c5) (A unique ID to identify the Track(s) the tags belong to) 0xea0-0xea2 (2)
+0x0ea0|63 c5 |c. | id: "tag_track_uid" (0x63c5) (A UID that identifies the Track(s) that the tags belong to) 0xea0-0xea2 (2)
| | | type: "uinteger"
0x0ea0| 88 | . | size: 8 0xea2-0xea3 (1)
0x0ea0| 2e 55 8d bf 90 c9 26 0f | .U....&. | value: 3338730552672462351 0xea3-0xeab (8)
@@ -339,12 +339,12 @@ $ fq -d matroska dv vorbis.mkv
0x0eb0|00 00 00 00 21 |....! |
| | | elements[0:2]: 0xeb5-0xed6 (33)
| | | [0]{}: element 0xeb5-0xebf (10)
-0x0eb0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0xeb5-0xeb7 (2)
+0x0eb0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0xeb5-0xeb7 (2)
| | | type: "utf8"
0x0eb0| 87 | . | size: 7 0xeb7-0xeb8 (1)
0x0eb0| 45 4e 43 4f 44 45 52 | ENCODER | value: "ENCODER" 0xeb8-0xebf (7)
| | | [1]{}: element 0xebf-0xed6 (23)
-0x0eb0| 44| D| id: "tag_string" (0x4487) (The value of the Tag) 0xebf-0xec1 (2)
+0x0eb0| 44| D| id: "tag_string" (0x4487) (The tag value) 0xebf-0xec1 (2)
0x0ec0|87 |. |
| | | type: "utf8"
0x0ec0| 94 | . | size: 20 0xec1-0xec2 (1)
@@ -356,13 +356,13 @@ $ fq -d matroska dv vorbis.mkv
0x0ed0| a2 | . | size: 34 0xed8-0xed9 (1)
| | | elements[0:2]: 0xed9-0xefb (34)
| | | [0]{}: element 0xed9-0xee4 (11)
-0x0ed0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0xed9-0xedb (2)
+0x0ed0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0xed9-0xedb (2)
| | | type: "utf8"
0x0ed0| 88 | . | size: 8 0xedb-0xedc (1)
0x0ed0| 44 55 52 41| DURA| value: "DURATION" 0xedc-0xee4 (8)
0x0ee0|54 49 4f 4e |TION |
| | | [1]{}: element 0xee4-0xefb (23)
-0x0ee0| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0xee4-0xee6 (2)
+0x0ee0| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0xee4-0xee6 (2)
| | | type: "utf8"
0x0ee0| 94 | . | size: 20 0xee6-0xee7 (1)
0x0ee0| 30 30 3a 30 30 3a 30 30 2e| 00:00:00.| value: "00:00:00.050000000" 0xee7-0xefb (20)
@@ -384,7 +384,7 @@ $ fq -d matroska dv vorbis.mkv
0x0f00| 81 | . | size: 1 0xf08-0xf09 (1)
0x0f00| 00 | . | value: 0 0xf09-0xf0a (1)
| | | [2]{}: element 0xf0a-0xfc7 (189)
-0x0f00| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0xf0a-0xf0b (1)
+0x0f00| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0xf0a-0xf0b (1)
| | | type: "binary"
0x0f00| 40 ba | @. | size: 186 0xf0b-0xf0d (2)
0x0f00| 81 | . | track_number: 1 0xf0d-0xf0e (1)
@@ -401,7 +401,7 @@ $ fq -d matroska dv vorbis.mkv
0x0f20|08 65 84 84 f6 56 3e d0 88 ae 42 68 41 0a e1 42|.e...V>...BhA..B|
* |until 0xfc6.7 (181) | |
| | | [3]{}: element 0xfc7-0x1019 (82)
-0x0fc0| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0xfc7-0xfc8 (1)
+0x0fc0| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0xfc7-0xfc8 (1)
| | | type: "binary"
0x0fc0| d0 | . | size: 80 0xfc8-0xfc9 (1)
0x0fc0| 81 | . | track_number: 1 0xfc9-0xfca (1)
@@ -466,7 +466,7 @@ $ fq -d matroska dv vorbis.mkv
0x10e0| 81 | . | size: 1 0x10ed-0x10ee (1)
0x10e0| 00 | . | value: 0 0x10ee-0x10ef (1)
| | | [1]{}: element 0x10ef-0x10fb (12)
-0x10e0| b7| .| id: "cue_track_positions" (0xb7) (Contain positions for different tracks corresponding to the timestamp) 0x10ef-0x10f0 (1)
+0x10e0| b7| .| id: "cue_track_positions" (0xb7) (Contains positions for different tracks corresponding to the timestamp) 0x10ef-0x10f0 (1)
| | | type: "master"
0x10f0|8a |. | size: 10 0x10f0-0x10f1 (1)
| | | elements[0:3]: 0x10f1-0x10fb (10)
@@ -481,7 +481,7 @@ $ fq -d matroska dv vorbis.mkv
0x10f0| 82 | . | size: 2 0x10f5-0x10f6 (1)
0x10f0| 0e c7 | .. | value: 3783 0x10f6-0x10f8 (2)
| | | [2]{}: element 0x10f8-0x10fb (3)
-0x10f0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an Element inside that Cluster) 0x10f8-0x10f9 (1)
+0x10f0| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an element inside that Cluster) 0x10f8-0x10f9 (1)
| | | type: "uinteger"
0x10f0| 81 | . | size: 1 0x10f9-0x10fa (1)
0x10f0| 09| | .| | value: 9 0x10fa-0x10fb (1)
diff --git a/format/matroska/testdata/vp8.fqtest b/format/matroska/testdata/vp8.fqtest
index 633994551..c1c9994ae 100644
--- a/format/matroska/testdata/vp8.fqtest
+++ b/format/matroska/testdata/vp8.fqtest
@@ -155,7 +155,7 @@ $ fq -d matroska dv vp8.mkv
0x00f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x107 (13)
0x0100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x11a (19)
-0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x109 (2)
+0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated UID that identifies the Segment amongst many others v4 RFC4122 with all bits randomly (or pseudorandomly) chosen) 0x107-0x109 (2)
| | | type: "binary"
0x0100| 90 | . | size: 16 0x109-0x10a (1)
0x0100| b6 f7 5d 8a 6f c3| ..].o.| value: raw bits 0x10a-0x11a (16)
@@ -177,7 +177,7 @@ $ fq -d matroska dv vp8.mkv
0x0120| 84 | . | size: 4 0x12b-0x12c (1)
0x0120| 37 00 fb fb| 7...| value: raw bits 0x12c-0x130 (4)
| | | [1]{}: element 0x130-0x173 (67)
-0x0130|ae |. | id: "track_entry" (0xae) (Describes a track with all Elements) 0x130-0x131 (1)
+0x0130|ae |. | id: "track_entry" (0xae) (Describes a track with all elements) 0x130-0x131 (1)
| | | type: "master"
0x0130| 01 00 00 00 00 00 00 3a | .......: | size: 58 0x131-0x139 (8)
| | | elements[0:8]: 0x139-0x173 (58)
@@ -187,13 +187,13 @@ $ fq -d matroska dv vp8.mkv
0x0130| 81 | . | size: 1 0x13a-0x13b (1)
0x0130| 01 | . | value: 1 0x13b-0x13c (1)
| | | [1]{}: element 0x13c-0x147 (11)
-0x0130| 73 c5 | s. | id: "track_uid" (0x73c5) (A unique ID to identify the Track) 0x13c-0x13e (2)
+0x0130| 73 c5 | s. | id: "track_uid" (0x73c5) (A UID that identifies the Track) 0x13c-0x13e (2)
| | | type: "uinteger"
0x0130| 88 | . | size: 8 0x13e-0x13f (1)
0x0130| f1| .| value: 17384833503613418420 0x13f-0x147 (8)
0x0140|43 55 f6 76 2f fb b4 |CU.v/.. |
| | | [2]{}: element 0x147-0x14a (3)
-0x0140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks using lacing) 0x147-0x148 (1)
+0x0140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks that use lacing) 0x147-0x148 (1)
| | | type: "uinteger"
0x0140| 81 | . | size: 1 0x148-0x149 (1)
0x0140| 00 | . | value: 0 0x149-0x14a (1)
@@ -251,7 +251,7 @@ $ fq -d matroska dv vp8.mkv
0x0180| 01 00 00 00 00 00 00 27 | .......' | size: 39 0x181-0x189 (8)
| | | elements[0:2]: 0x189-0x1b0 (39)
| | | [0]{}: element 0x189-0x18c (3)
-0x0180| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0x189-0x18b (2)
+0x0180| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0x189-0x18b (2)
| | | type: "master"
0x0180| 80 | . | size: 0 0x18b-0x18c (1)
| | | elements[0:0]: 0x18c-0x18c (0)
@@ -262,12 +262,12 @@ $ fq -d matroska dv vp8.mkv
0x0190|00 00 00 00 00 1a |...... |
| | | elements[0:2]: 0x196-0x1b0 (26)
| | | [0]{}: element 0x196-0x1a0 (10)
-0x0190| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x196-0x198 (2)
+0x0190| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x196-0x198 (2)
| | | type: "utf8"
0x0190| 87 | . | size: 7 0x198-0x199 (1)
0x0190| 45 4e 43 4f 44 45 52| ENCODER| value: "ENCODER" 0x199-0x1a0 (7)
| | | [1]{}: element 0x1a0-0x1b0 (16)
-0x01a0|44 87 |D. | id: "tag_string" (0x4487) (The value of the Tag) 0x1a0-0x1a2 (2)
+0x01a0|44 87 |D. | id: "tag_string" (0x4487) (The tag value) 0x1a0-0x1a2 (2)
| | | type: "utf8"
0x01a0| 8d | . | size: 13 0x1a2-0x1a3 (1)
0x01a0| 4c 61 76 66 35 38 2e 34 35 2e 31 30 30| Lavf58.45.100| value: "Lavf58.45.100" 0x1a3-0x1b0 (13)
@@ -277,12 +277,12 @@ $ fq -d matroska dv vp8.mkv
0x01b0| 01 00 00 00 00 00 00 5e | .......^ | size: 94 0x1b2-0x1ba (8)
| | | elements[0:3]: 0x1ba-0x218 (94)
| | | [0]{}: element 0x1ba-0x1c8 (14)
-0x01b0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0x1ba-0x1bc (2)
+0x01b0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0x1ba-0x1bc (2)
| | | type: "master"
0x01b0| 8b | . | size: 11 0x1bc-0x1bd (1)
| | | elements[0:1]: 0x1bd-0x1c8 (11)
| | | [0]{}: element 0x1bd-0x1c8 (11)
-0x01b0| 63 c5 | c. | id: "tag_track_uid" (0x63c5) (A unique ID to identify the Track(s) the tags belong to) 0x1bd-0x1bf (2)
+0x01b0| 63 c5 | c. | id: "tag_track_uid" (0x63c5) (A UID that identifies the Track(s) that the tags belong to) 0x1bd-0x1bf (2)
| | | type: "uinteger"
0x01b0| 88| .| size: 8 0x1bf-0x1c0 (1)
0x01c0|f1 43 55 f6 76 2f fb b4 |.CU.v/.. | value: 17384833503613418420 0x1c0-0x1c8 (8)
@@ -293,12 +293,12 @@ $ fq -d matroska dv vp8.mkv
0x01d0|00 21 |.! |
| | | elements[0:2]: 0x1d2-0x1f3 (33)
| | | [0]{}: element 0x1d2-0x1dc (10)
-0x01d0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x1d2-0x1d4 (2)
+0x01d0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x1d2-0x1d4 (2)
| | | type: "utf8"
0x01d0| 87 | . | size: 7 0x1d4-0x1d5 (1)
0x01d0| 45 4e 43 4f 44 45 52 | ENCODER | value: "ENCODER" 0x1d5-0x1dc (7)
| | | [1]{}: element 0x1dc-0x1f3 (23)
-0x01d0| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x1dc-0x1de (2)
+0x01d0| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x1dc-0x1de (2)
| | | type: "utf8"
0x01d0| 94 | . | size: 20 0x1de-0x1df (1)
0x01d0| 4c| L| value: "Lavc58.91.100 libvpx" 0x1df-0x1f3 (20)
@@ -310,13 +310,13 @@ $ fq -d matroska dv vp8.mkv
0x01f0| a2 | . | size: 34 0x1f5-0x1f6 (1)
| | | elements[0:2]: 0x1f6-0x218 (34)
| | | [0]{}: element 0x1f6-0x201 (11)
-0x01f0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x1f6-0x1f8 (2)
+0x01f0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x1f6-0x1f8 (2)
| | | type: "utf8"
0x01f0| 88 | . | size: 8 0x1f8-0x1f9 (1)
0x01f0| 44 55 52 41 54 49 4f| DURATIO| value: "DURATION" 0x1f9-0x201 (8)
0x0200|4e |N |
| | | [1]{}: element 0x201-0x218 (23)
-0x0200| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x201-0x203 (2)
+0x0200| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x201-0x203 (2)
| | | type: "utf8"
0x0200| 94 | . | size: 20 0x203-0x204 (1)
0x0200| 30 30 3a 30 30 3a 30 30 2e 30 34 30| 00:00:00.040| value: "00:00:00.040000000" 0x204-0x218 (20)
@@ -337,7 +337,7 @@ $ fq -d matroska dv vp8.mkv
0x0220| 81 | . | size: 1 0x225-0x226 (1)
0x0220| 00 | . | value: 0 0x226-0x227 (1)
| | | [2]{}: element 0x227-0x1470 (4681)
-0x0220| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x227-0x228 (1)
+0x0220| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x227-0x228 (1)
| | | type: "binary"
0x0220| 52 46 | RF | size: 4678 0x228-0x22a (2)
0x0220| 81 | . | track_number: 1 0x22a-0x22b (1)
@@ -392,7 +392,7 @@ $ fq -d matroska dv vp8.mkv
0x1470| 81 | . | size: 1 0x147e-0x147f (1)
0x1470| 00| .| value: 0 0x147f-0x1480 (1)
| | | [1]{}: element 0x1480-0x148c (12)
-0x1480|b7 |. | id: "cue_track_positions" (0xb7) (Contain positions for different tracks corresponding to the timestamp) 0x1480-0x1481 (1)
+0x1480|b7 |. | id: "cue_track_positions" (0xb7) (Contains positions for different tracks corresponding to the timestamp) 0x1480-0x1481 (1)
| | | type: "master"
0x1480| 8a | . | size: 10 0x1481-0x1482 (1)
| | | elements[0:3]: 0x1482-0x148c (10)
@@ -407,7 +407,7 @@ $ fq -d matroska dv vp8.mkv
0x1480| 82 | . | size: 2 0x1486-0x1487 (1)
0x1480| 01 e4 | .. | value: 484 0x1487-0x1489 (2)
| | | [2]{}: element 0x1489-0x148c (3)
-0x1480| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an Element inside that Cluster) 0x1489-0x148a (1)
+0x1480| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an element inside that Cluster) 0x1489-0x148a (1)
| | | type: "uinteger"
0x1480| 81 | . | size: 1 0x148a-0x148b (1)
0x1480| 09| | .| | value: 9 0x148b-0x148c (1)
diff --git a/format/matroska/testdata/vp9.fqtest b/format/matroska/testdata/vp9.fqtest
index 1866e0cd1..e4b118b36 100644
--- a/format/matroska/testdata/vp9.fqtest
+++ b/format/matroska/testdata/vp9.fqtest
@@ -155,7 +155,7 @@ $ fq -d matroska dv vp9.mkv
0x00f0| 4c 61 76 66 35 38| Lavf58| value: "Lavf58.45.100" 0xfa-0x107 (13)
0x0100|2e 34 35 2e 31 30 30 |.45.100 |
| | | [4]{}: element 0x107-0x11a (19)
-0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated unique ID to identify the Segment amongst many others chosen) 0x107-0x109 (2)
+0x0100| 73 a4 | s. | id: "segment_uuid" (0x73a4) (A randomly generated UID that identifies the Segment amongst many others v4 RFC4122 with all bits randomly (or pseudorandomly) chosen) 0x107-0x109 (2)
| | | type: "binary"
0x0100| 90 | . | size: 16 0x109-0x10a (1)
0x0100| 79 44 d8 c6 65 1a| yD..e.| value: raw bits 0x10a-0x11a (16)
@@ -177,7 +177,7 @@ $ fq -d matroska dv vp9.mkv
0x0120| 84 | . | size: 4 0x12b-0x12c (1)
0x0120| 11 c5 1b 5b| ...[| value: raw bits 0x12c-0x130 (4)
| | | [1]{}: element 0x130-0x173 (67)
-0x0130|ae |. | id: "track_entry" (0xae) (Describes a track with all Elements) 0x130-0x131 (1)
+0x0130|ae |. | id: "track_entry" (0xae) (Describes a track with all elements) 0x130-0x131 (1)
| | | type: "master"
0x0130| 01 00 00 00 00 00 00 3a | .......: | size: 58 0x131-0x139 (8)
| | | elements[0:8]: 0x139-0x173 (58)
@@ -187,13 +187,13 @@ $ fq -d matroska dv vp9.mkv
0x0130| 81 | . | size: 1 0x13a-0x13b (1)
0x0130| 01 | . | value: 1 0x13b-0x13c (1)
| | | [1]{}: element 0x13c-0x147 (11)
-0x0130| 73 c5 | s. | id: "track_uid" (0x73c5) (A unique ID to identify the Track) 0x13c-0x13e (2)
+0x0130| 73 c5 | s. | id: "track_uid" (0x73c5) (A UID that identifies the Track) 0x13c-0x13e (2)
| | | type: "uinteger"
0x0130| 88 | . | size: 8 0x13e-0x13f (1)
0x0130| 3e| >| value: 4477069849203489639 0x13f-0x147 (8)
0x0140|21 bf 4e ac 62 bb 67 |!.N.b.g |
| | | [2]{}: element 0x147-0x14a (3)
-0x0140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks using lacing) 0x147-0x148 (1)
+0x0140| 9c | . | id: "flag_lacing" (0x9c) (Set to 1 if the track **MAY** contain blocks that use lacing) 0x147-0x148 (1)
| | | type: "uinteger"
0x0140| 81 | . | size: 1 0x148-0x149 (1)
0x0140| 00 | . | value: 0 0x149-0x14a (1)
@@ -251,7 +251,7 @@ $ fq -d matroska dv vp9.mkv
0x0180| 01 00 00 00 00 00 00 27 | .......' | size: 39 0x181-0x189 (8)
| | | elements[0:2]: 0x189-0x1b0 (39)
| | | [0]{}: element 0x189-0x18c (3)
-0x0180| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0x189-0x18b (2)
+0x0180| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0x189-0x18b (2)
| | | type: "master"
0x0180| 80 | . | size: 0 0x18b-0x18c (1)
| | | elements[0:0]: 0x18c-0x18c (0)
@@ -262,12 +262,12 @@ $ fq -d matroska dv vp9.mkv
0x0190|00 00 00 00 00 1a |...... |
| | | elements[0:2]: 0x196-0x1b0 (26)
| | | [0]{}: element 0x196-0x1a0 (10)
-0x0190| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x196-0x198 (2)
+0x0190| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x196-0x198 (2)
| | | type: "utf8"
0x0190| 87 | . | size: 7 0x198-0x199 (1)
0x0190| 45 4e 43 4f 44 45 52| ENCODER| value: "ENCODER" 0x199-0x1a0 (7)
| | | [1]{}: element 0x1a0-0x1b0 (16)
-0x01a0|44 87 |D. | id: "tag_string" (0x4487) (The value of the Tag) 0x1a0-0x1a2 (2)
+0x01a0|44 87 |D. | id: "tag_string" (0x4487) (The tag value) 0x1a0-0x1a2 (2)
| | | type: "utf8"
0x01a0| 8d | . | size: 13 0x1a2-0x1a3 (1)
0x01a0| 4c 61 76 66 35 38 2e 34 35 2e 31 30 30| Lavf58.45.100| value: "Lavf58.45.100" 0x1a3-0x1b0 (13)
@@ -277,12 +277,12 @@ $ fq -d matroska dv vp9.mkv
0x01b0| 01 00 00 00 00 00 00 62 | .......b | size: 98 0x1b2-0x1ba (8)
| | | elements[0:3]: 0x1ba-0x21c (98)
| | | [0]{}: element 0x1ba-0x1c8 (14)
-0x01b0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the Tag applies to) 0x1ba-0x1bc (2)
+0x01b0| 63 c0 | c. | id: "targets" (0x63c0) (Specifies which other elements the metadata represented by the tag value applies to) 0x1ba-0x1bc (2)
| | | type: "master"
0x01b0| 8b | . | size: 11 0x1bc-0x1bd (1)
| | | elements[0:1]: 0x1bd-0x1c8 (11)
| | | [0]{}: element 0x1bd-0x1c8 (11)
-0x01b0| 63 c5 | c. | id: "tag_track_uid" (0x63c5) (A unique ID to identify the Track(s) the tags belong to) 0x1bd-0x1bf (2)
+0x01b0| 63 c5 | c. | id: "tag_track_uid" (0x63c5) (A UID that identifies the Track(s) that the tags belong to) 0x1bd-0x1bf (2)
| | | type: "uinteger"
0x01b0| 88| .| size: 8 0x1bf-0x1c0 (1)
0x01c0|3e 21 bf 4e ac 62 bb 67 |>!.N.b.g | value: 4477069849203489639 0x1c0-0x1c8 (8)
@@ -293,12 +293,12 @@ $ fq -d matroska dv vp9.mkv
0x01d0|00 25 |.% |
| | | elements[0:2]: 0x1d2-0x1f7 (37)
| | | [0]{}: element 0x1d2-0x1dc (10)
-0x01d0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x1d2-0x1d4 (2)
+0x01d0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x1d2-0x1d4 (2)
| | | type: "utf8"
0x01d0| 87 | . | size: 7 0x1d4-0x1d5 (1)
0x01d0| 45 4e 43 4f 44 45 52 | ENCODER | value: "ENCODER" 0x1d5-0x1dc (7)
| | | [1]{}: element 0x1dc-0x1f7 (27)
-0x01d0| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x1dc-0x1de (2)
+0x01d0| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x1dc-0x1de (2)
| | | type: "utf8"
0x01d0| 98 | . | size: 24 0x1de-0x1df (1)
0x01d0| 4c| L| value: "Lavc58.91.100 libvpx-vp9" 0x1df-0x1f7 (24)
@@ -310,13 +310,13 @@ $ fq -d matroska dv vp9.mkv
0x01f0| a2 | . | size: 34 0x1f9-0x1fa (1)
| | | elements[0:2]: 0x1fa-0x21c (34)
| | | [0]{}: element 0x1fa-0x205 (11)
-0x01f0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the Tag that is going to be stored) 0x1fa-0x1fc (2)
+0x01f0| 45 a3 | E. | id: "tag_name" (0x45a3) (The name of the tag value that is going to be stored) 0x1fa-0x1fc (2)
| | | type: "utf8"
0x01f0| 88 | . | size: 8 0x1fc-0x1fd (1)
0x01f0| 44 55 52| DUR| value: "DURATION" 0x1fd-0x205 (8)
0x0200|41 54 49 4f 4e |ATION |
| | | [1]{}: element 0x205-0x21c (23)
-0x0200| 44 87 | D. | id: "tag_string" (0x4487) (The value of the Tag) 0x205-0x207 (2)
+0x0200| 44 87 | D. | id: "tag_string" (0x4487) (The tag value) 0x205-0x207 (2)
| | | type: "utf8"
0x0200| 94 | . | size: 20 0x207-0x208 (1)
0x0200| 30 30 3a 30 30 3a 30 30| 00:00:00| value: "00:00:00.040000000" 0x208-0x21c (20)
@@ -337,7 +337,7 @@ $ fq -d matroska dv vp9.mkv
0x0220| 81 | . | size: 1 0x229-0x22a (1)
0x0220| 00 | . | value: 0 0x22a-0x22b (1)
| | | [2]{}: element 0x22b-0x176a (5439)
-0x0220| a3 | . | id: "simple_block" (0xa3) (Similar to Block) 0x22b-0x22c (1)
+0x0220| a3 | . | id: "simple_block" (0xa3) (Similar to Block ) but without all the extra information) 0x22b-0x22c (1)
| | | type: "binary"
0x0220| 55 3c | U< | size: 5436 0x22c-0x22e (2)
0x0220| 81 | . | track_number: 1 0x22e-0x22f (1)
@@ -393,7 +393,7 @@ $ fq -d matroska dv vp9.mkv
0x1770| 81 | . | size: 1 0x1778-0x1779 (1)
0x1770| 00 | . | value: 0 0x1779-0x177a (1)
| | | [1]{}: element 0x177a-0x1786 (12)
-0x1770| b7 | . | id: "cue_track_positions" (0xb7) (Contain positions for different tracks corresponding to the timestamp) 0x177a-0x177b (1)
+0x1770| b7 | . | id: "cue_track_positions" (0xb7) (Contains positions for different tracks corresponding to the timestamp) 0x177a-0x177b (1)
| | | type: "master"
0x1770| 8a | . | size: 10 0x177b-0x177c (1)
| | | elements[0:3]: 0x177c-0x1786 (10)
@@ -408,7 +408,7 @@ $ fq -d matroska dv vp9.mkv
0x1780|82 |. | size: 2 0x1780-0x1781 (1)
0x1780| 01 e8 | .. | value: 488 0x1781-0x1783 (2)
| | | [2]{}: element 0x1783-0x1786 (3)
-0x1780| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an Element inside that Cluster) 0x1783-0x1784 (1)
+0x1780| f0 | . | id: "cue_relative_position" (0xf0) (The relative position inside the Cluster of the referenced SimpleBlock or BlockGroup with 0 being the first possible position for an element inside that Cluster) 0x1783-0x1784 (1)
| | | type: "uinteger"
0x1780| 81 | . | size: 1 0x1784-0x1785 (1)
0x1780| 09| | .| | value: 9 0x1785-0x1786 (1)