Commit 875df0ab authored by Moritz Bunkus's avatar Moritz Bunkus

Make CueDuration a child of CueTrackPositions

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/foundation_src@863 a6f86f6d-0131-4f8e-9e7b-e335508773d5
parent a4dc114f
......@@ -192,10 +192,10 @@ extern const ebml_context MATROSKA_ContextTrackEntry;
extern const ebml_context MATROSKA_ContextTracks;
extern const ebml_context MATROSKA_ContextCueTime;
extern const ebml_context MATROSKA_ContextCueDuration;
extern const ebml_context MATROSKA_ContextCueTrack;
extern const ebml_context MATROSKA_ContextCueClusterPosition;
extern const ebml_context MATROSKA_ContextCueRelativePosition;
extern const ebml_context MATROSKA_ContextCueDuration;
extern const ebml_context MATROSKA_ContextCueBlockNumber;
extern const ebml_context MATROSKA_ContextCueCodecState;
extern const ebml_context MATROSKA_ContextCueRefTime;
......
......@@ -394,10 +394,10 @@ const ebml_semantic EBML_SemanticTracks[] = {
};
const ebml_context MATROSKA_ContextTracks = {0x1654AE6B, EBML_MASTER_CLASS, 0, 0, "Tracks", EBML_SemanticTracks, EBML_SemanticGlobals, NULL};
const ebml_context MATROSKA_ContextCueTime = {0xB3, EBML_INTEGER_CLASS, 0, 0, "CueTime", NULL, EBML_SemanticGlobals, NULL};
const ebml_context MATROSKA_ContextCueDuration = {0xB2, EBML_INTEGER_CLASS, 0, 0, "CueDuration", NULL, EBML_SemanticGlobals, NULL};
const ebml_context MATROSKA_ContextCueTrack = {0xF7, EBML_INTEGER_CLASS, 0, 0, "CueTrack", NULL, EBML_SemanticGlobals, NULL};
const ebml_context MATROSKA_ContextCueClusterPosition = {0xF1, EBML_INTEGER_CLASS, 0, 0, "CueClusterPosition", NULL, EBML_SemanticGlobals, NULL};
const ebml_context MATROSKA_ContextCueRelativePosition = {0xF0, EBML_INTEGER_CLASS, 0, 0, "CueRelativePosition", NULL, EBML_SemanticGlobals, NULL};
const ebml_context MATROSKA_ContextCueDuration = {0xB2, EBML_INTEGER_CLASS, 0, 0, "CueDuration", NULL, EBML_SemanticGlobals, NULL};
const ebml_context MATROSKA_ContextCueBlockNumber = {0x5378, EBML_INTEGER_CLASS, 1, (intptr_t)1, "CueBlockNumber", NULL, EBML_SemanticGlobals, NULL};
const ebml_context MATROSKA_ContextCueCodecState = {0xEA, EBML_INTEGER_CLASS, 1, (intptr_t)0, "CueCodecState", NULL, EBML_SemanticGlobals, NULL};
const ebml_context MATROSKA_ContextCueRefTime = {0x96, EBML_INTEGER_CLASS, 0, 0, "CueRefTime", NULL, EBML_SemanticGlobals, NULL};
......@@ -418,6 +418,7 @@ const ebml_semantic EBML_SemanticCueTrackPositions[] = {
{1, 1, &MATROSKA_ContextCueTrack, 0},
{1, 1, &MATROSKA_ContextCueClusterPosition, 0},
{0, 1, &MATROSKA_ContextCueRelativePosition, PROFILE_MATROSKA_V1|PROFILE_MATROSKA_V2|PROFILE_MATROSKA_V3|PROFILE_DIVX|PROFILE_WEBM},
{0, 1, &MATROSKA_ContextCueDuration, PROFILE_MATROSKA_V1|PROFILE_MATROSKA_V2|PROFILE_MATROSKA_V3|PROFILE_DIVX|PROFILE_WEBM},
{0, 1, &MATROSKA_ContextCueBlockNumber, 0},
{0, 1, &MATROSKA_ContextCueCodecState, PROFILE_MATROSKA_V1|PROFILE_DIVX|PROFILE_WEBM},
{0, 0, &MATROSKA_ContextCueReference, PROFILE_MATROSKA_V1|PROFILE_DIVX|PROFILE_WEBM},
......@@ -427,7 +428,6 @@ const ebml_context MATROSKA_ContextCueTrackPositions = {0xB7, EBML_MASTER_CLASS,
const ebml_semantic EBML_SemanticCuePoint[] = {
{1, 1, &MATROSKA_ContextCueTime, 0},
{0, 1, &MATROSKA_ContextCueDuration, PROFILE_MATROSKA_V1|PROFILE_MATROSKA_V2|PROFILE_MATROSKA_V3|PROFILE_DIVX|PROFILE_WEBM},
{1, 0, &MATROSKA_ContextCueTrackPositions, 0},
{0, 0, NULL ,0} // end of the table
};
......
......@@ -155,11 +155,11 @@
<element name="Cues" level="1" id="0x1C53BB6B" type="master" minver="1">A top-level element to speed seeking access. All entries are local to the segment. Should be mandatory for non <a href="http://www.matroska.org/technical/streaming/index.hmtl">"live" streams</a>.</element>
<element name="CuePoint" level="2" id="0xBB" type="master" mandatory="1" multiple="1" minver="1">Contains all information relative to a seek point in the segment.</element>
<element name="CueTime" level="3" id="0xB3" type="uinteger" mandatory="1" minver="1">Absolute timecode according to the segment time base.</element>
<element name="CueDuration" level="3" id="0xB2" type="uinteger" mandatory="0" minver="4" webm="0">The duration of the block according to the segment time base. If missing the track's DefaultDuration does not apply and no duration information is available in terms of the cues.</element>
<element name="CueTrackPositions" level="3" id="0xB7" type="master" mandatory="1" multiple="1" minver="1">Contain positions for different tracks corresponding to the timecode.</element>
<element name="CueTrack" level="4" id="0xF7" type="uinteger" mandatory="1" minver="1" range="not 0">The track for which a position is given.</element>
<element name="CueClusterPosition" level="4" id="0xF1" type="uinteger" mandatory="1" minver="1">The <a href="http://www.matroska.org/technical/specs/notes.html#Position_References">position</a> of the Cluster containing the required Block.</element>
<element name="CueRelativePosition" level="4" id="0xF0" type="uinteger" mandatory="0" minver="4" webm="0">The relative position of the referenced block inside the cluster with 0 being the first possible position for an element inside that cluster.</element>
<element name="CueDuration" level="4" id="0xB2" type="uinteger" mandatory="0" minver="4" webm="0">The duration of the block according to the segment time base. If missing the track's DefaultDuration does not apply and no duration information is available in terms of the cues.</element>
<element name="CueBlockNumber" level="4" id="0x5378" type="uinteger" minver="1" default="1" range="not 0">Number of the Block in the specified Cluster.</element>
<element name="CueCodecState" level="4" id="0xEA" type="uinteger" minver="2" webm="0" default="0">The <a href="http://www.matroska.org/technical/specs/notes.html#Position_References">position</a> of the Codec State corresponding to this Cue element. 0 means that the data is taken from the initial Track Entry.</element>
<element name="CueReference" level="4" id="0xDB" type="master" multiple="1" minver="2" webm="0">The Clusters containing the required referenced Blocks.</element>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment