diff --git a/matroska/KaxDefines.h b/matroska/KaxDefines.h index 556e7eaf..ed813c5c 100644 --- a/matroska/KaxDefines.h +++ b/matroska/KaxDefines.h @@ -12,9 +12,9 @@ #include #define DEFINE_MKX_CONTEXT(a) DEFINE_xxx_CONTEXT(a,GetKaxGlobal_Context) -#define DEFINE_MKX_MASTER_CONS(a,b,c,d,e) DEFINE_xxx_MASTER_CONS(a,b,c,d,e,GetKaxGlobal_Context) -#define DEFINE_MKX_MASTER(a,b,c,d,e) DEFINE_xxx_MASTER(a,b,c,d,e,GetKaxGlobal_Context) -#define DEFINE_MKX_MASTER_ORPHAN(a,b,c,d) DEFINE_xxx_MASTER_ORPHAN(a,b,c,d,GetKaxGlobal_Context) +#define DEFINE_MKX_MASTER_CONS(a,b,c,d,i,e) DEFINE_xxx_MASTER_CONS(a,b,c,d,i,e,GetKaxGlobal_Context) +#define DEFINE_MKX_MASTER(a,b,c,d,i,e) DEFINE_xxx_MASTER(a,b,c,d,i,e,GetKaxGlobal_Context) +#define DEFINE_MKX_MASTER_ORPHAN(a,b,c,i,d) DEFINE_xxx_MASTER_ORPHAN(a,b,c,i,d,GetKaxGlobal_Context) #define DEFINE_MKX_UINTEGER_DEF(a,b,c,d,e,v) DEFINE_xxx_UINTEGER_DEF(a,b,c,d,e,GetKaxGlobal_Context,v) #define DEFINE_MKX_SINTEGER_DEF(a,b,c,d,e,v) DEFINE_xxx_SINTEGER_DEF(a,b,c,d,e,GetKaxGlobal_Context,v) #define DEFINE_MKX_UINTEGER(a,b,c,d,e) DEFINE_xxx_CLASS_CONS(a,b,c,d,e,GetKaxGlobal_Context) \ diff --git a/src/KaxSemantic.cpp b/src/KaxSemantic.cpp index e6324dc4..d79b8bbc 100644 --- a/src/KaxSemantic.cpp +++ b/src/KaxSemantic.cpp @@ -29,20 +29,20 @@ DEFINE_SEMANTIC_ITEM(false, false, KaxChapters) DEFINE_SEMANTIC_ITEM(false, false, KaxTags) DEFINE_END_SEMANTIC(KaxSegment) -DEFINE_MKX_MASTER_ORPHAN(KaxSegment, 0x18538067, 4, "Segment") +DEFINE_MKX_MASTER_ORPHAN(KaxSegment, 0x18538067, 4, true, "Segment") DEFINE_START_SEMANTIC(KaxSeekHead) DEFINE_SEMANTIC_ITEM(true, false, KaxSeek) DEFINE_END_SEMANTIC(KaxSeekHead) -DEFINE_MKX_MASTER(KaxSeekHead, 0x114D9B74, 4, KaxSegment, "SeekHeader") +DEFINE_MKX_MASTER(KaxSeekHead, 0x114D9B74, 4, KaxSegment, false, "SeekHeader") DEFINE_START_SEMANTIC(KaxSeek) DEFINE_SEMANTIC_ITEM(true, true, KaxSeekID) DEFINE_SEMANTIC_ITEM(true, true, KaxSeekPosition) DEFINE_END_SEMANTIC(KaxSeek) -DEFINE_MKX_MASTER(KaxSeek, 0x4DBB, 2, KaxSeekHead, "SeekPoint") +DEFINE_MKX_MASTER(KaxSeek, 0x4DBB, 2, KaxSeekHead, false, "SeekPoint") DEFINE_MKX_BINARY (KaxSeekID, 0x53AB, 2, KaxSeek, "SeekID") DEFINE_MKX_UINTEGER(KaxSeekPosition, 0x53AC, 2, KaxSeek, "SeekPosition") @@ -63,7 +63,7 @@ DEFINE_SEMANTIC_ITEM(true, true, KaxMuxingApp) DEFINE_SEMANTIC_ITEM(true, true, KaxWritingApp) DEFINE_END_SEMANTIC(KaxInfo) -DEFINE_MKX_MASTER(KaxInfo, 0x1549A966, 4, KaxSegment, "Info") +DEFINE_MKX_MASTER(KaxInfo, 0x1549A966, 4, KaxSegment, false, "Info") DEFINE_MKX_BINARY (KaxSegmentUID, 0x73A4, 2, KaxInfo, "SegmentUID") DEFINE_MKX_UNISTRING(KaxSegmentFilename, 0x7384, 2, KaxInfo, "SegmentFilename") DEFINE_MKX_BINARY (KaxPrevUID, 0x3CB923, 3, KaxInfo, "PrevUID") @@ -78,7 +78,7 @@ DEFINE_SEMANTIC_ITEM(true, true, KaxChapterTranslateCodec) DEFINE_SEMANTIC_ITEM(false, false, KaxChapterTranslateEditionUID) DEFINE_END_SEMANTIC(KaxChapterTranslate) -DEFINE_MKX_MASTER(KaxChapterTranslate, 0x6924, 2, KaxInfo, "ChapterTranslate") +DEFINE_MKX_MASTER(KaxChapterTranslate, 0x6924, 2, KaxInfo, false, "ChapterTranslate") DEFINE_MKX_BINARY (KaxChapterTranslateID, 0x69A5, 2, KaxChapterTranslate, "ChapterTranslateID") DEFINE_MKX_UINTEGER(KaxChapterTranslateCodec, 0x69BF, 2, KaxChapterTranslate, "ChapterTranslateCodec") DEFINE_MKX_UINTEGER(KaxChapterTranslateEditionUID, 0x69FC, 2, KaxChapterTranslate, "ChapterTranslateEditionUID") @@ -99,14 +99,14 @@ DEFINE_SEMANTIC_ITEM(false, false, KaxBlockGroup) DEFINE_SEMANTIC_ITEM(false, false, KaxEncryptedBlock) // not supported DEFINE_END_SEMANTIC(KaxCluster) -DEFINE_MKX_MASTER_CONS(KaxCluster, 0x1F43B675, 4, KaxSegment, "Cluster") +DEFINE_MKX_MASTER_CONS(KaxCluster, 0x1F43B675, 4, KaxSegment, true, "Cluster") DEFINE_MKX_UINTEGER(KaxClusterTimecode, 0xE7, 1, KaxCluster, "ClusterTimecode") DEFINE_START_SEMANTIC(KaxClusterSilentTracks) DEFINE_SEMANTIC_ITEM(false, false, KaxClusterSilentTrackNumber) // not supported DEFINE_END_SEMANTIC(KaxClusterSilentTracks) -DEFINE_MKX_MASTER(KaxClusterSilentTracks, 0x5854, 2, KaxCluster, "ClusterSilentTracks") +DEFINE_MKX_MASTER(KaxClusterSilentTracks, 0x5854, 2, KaxCluster, false, "ClusterSilentTracks") DEFINE_MKX_UINTEGER(KaxClusterSilentTrackNumber, 0x58D7, 2, KaxClusterSilentTracks, "ClusterSilentTrackNumber") DEFINE_MKX_UINTEGER(KaxClusterPosition, 0xA7, 1, KaxCluster, "ClusterPosition") DEFINE_MKX_UINTEGER(KaxClusterPrevSize, 0xAB, 1, KaxCluster, "ClusterPrevSize") @@ -126,7 +126,7 @@ DEFINE_SEMANTIC_ITEM(false, true, KaxSlices) // not supported DEFINE_SEMANTIC_ITEM(false, true, KaxReferenceFrame) // DivX specific DEFINE_END_SEMANTIC(KaxBlockGroup) -DEFINE_MKX_MASTER_CONS(KaxBlockGroup, 0xA0, 1, KaxCluster, "BlockGroup") +DEFINE_MKX_MASTER_CONS(KaxBlockGroup, 0xA0, 1, KaxCluster, false, "BlockGroup") DEFINE_MKX_BINARY_CONS(KaxBlock, 0xA1, 1, KaxBlockGroup, "Block") DEFINE_MKX_BINARY_CONS(KaxBlockVirtual, 0xA2, 1, KaxBlockGroup, "BlockVirtual") @@ -134,14 +134,14 @@ DEFINE_START_SEMANTIC(KaxBlockAdditions) DEFINE_SEMANTIC_ITEM(true, false, KaxBlockMore) DEFINE_END_SEMANTIC(KaxBlockAdditions) -DEFINE_MKX_MASTER(KaxBlockAdditions, 0x75A1, 2, KaxBlockGroup, "BlockAdditions") +DEFINE_MKX_MASTER(KaxBlockAdditions, 0x75A1, 2, KaxBlockGroup, false, "BlockAdditions") DEFINE_START_SEMANTIC(KaxBlockMore) DEFINE_SEMANTIC_ITEM(true, true, KaxBlockAdditional) DEFINE_SEMANTIC_ITEM(true, true, KaxBlockAddID) DEFINE_END_SEMANTIC(KaxBlockMore) -DEFINE_MKX_MASTER(KaxBlockMore, 0xA6, 1, KaxBlockAdditions, "BlockMore") +DEFINE_MKX_MASTER(KaxBlockMore, 0xA6, 1, KaxBlockAdditions, false, "BlockMore") DEFINE_MKX_BINARY (KaxBlockAdditional, 0xA5, 1, KaxBlockMore, "BlockAdditional") DEFINE_MKX_UINTEGER_DEF(KaxBlockAddID, 0xEE, 1, KaxBlockMore, "BlockAddID", 1) DEFINE_MKX_UINTEGER(KaxBlockDuration, 0x9B, 1, KaxBlockGroup, "BlockDuration") @@ -155,7 +155,7 @@ DEFINE_START_SEMANTIC(KaxSlices) DEFINE_SEMANTIC_ITEM(false, false, KaxTimeSlice) // not supported DEFINE_END_SEMANTIC(KaxSlices) -DEFINE_MKX_MASTER(KaxSlices, 0x8E, 1, KaxBlockGroup, "Slices") +DEFINE_MKX_MASTER(KaxSlices, 0x8E, 1, KaxBlockGroup, false, "Slices") DEFINE_START_SEMANTIC(KaxTimeSlice) DEFINE_SEMANTIC_ITEM(false, true, KaxSliceLaceNumber) // not supported @@ -165,7 +165,7 @@ DEFINE_SEMANTIC_ITEM(false, true, KaxSliceDelay) // not supported DEFINE_SEMANTIC_ITEM(false, true, KaxSliceDuration) // not supported DEFINE_END_SEMANTIC(KaxTimeSlice) -DEFINE_MKX_MASTER(KaxTimeSlice, 0xE8, 1, KaxSlices, "TimeSlice") +DEFINE_MKX_MASTER(KaxTimeSlice, 0xE8, 1, KaxSlices, false, "TimeSlice") DEFINE_MKX_UINTEGER(KaxSliceLaceNumber, 0xCC, 1, KaxTimeSlice, "SliceLaceNumber") DEFINE_MKX_UINTEGER_DEF(KaxSliceFrameNumber, 0xCD, 1, KaxTimeSlice, "SliceFrameNumber", 0) DEFINE_MKX_UINTEGER_DEF(KaxSliceBlockAddID, 0xCB, 1, KaxTimeSlice, "SliceBlockAddID", 0) @@ -177,7 +177,7 @@ DEFINE_SEMANTIC_ITEM(true, true, KaxReferenceOffset) // DivX specific DEFINE_SEMANTIC_ITEM(true, true, KaxReferenceTimeCode) // DivX specific DEFINE_END_SEMANTIC(KaxReferenceFrame) -DEFINE_MKX_MASTER(KaxReferenceFrame, 0xC8, 1, KaxBlockGroup, "ReferenceFrame") +DEFINE_MKX_MASTER(KaxReferenceFrame, 0xC8, 1, KaxBlockGroup, false, "ReferenceFrame") DEFINE_MKX_UINTEGER(KaxReferenceOffset, 0xC9, 1, KaxReferenceFrame, "ReferenceOffset") DEFINE_MKX_UINTEGER(KaxReferenceTimeCode, 0xCA, 1, KaxReferenceFrame, "ReferenceTimeCode") DEFINE_MKX_BINARY (KaxEncryptedBlock, 0xAF, 1, KaxCluster, "EncryptedBlock") @@ -186,7 +186,7 @@ DEFINE_START_SEMANTIC(KaxTracks) DEFINE_SEMANTIC_ITEM(true, false, KaxTrackEntry) DEFINE_END_SEMANTIC(KaxTracks) -DEFINE_MKX_MASTER(KaxTracks, 0x1654AE6B, 4, KaxSegment, "Tracks") +DEFINE_MKX_MASTER(KaxTracks, 0x1654AE6B, 4, KaxSegment, false, "Tracks") DEFINE_START_SEMANTIC(KaxTrackEntry) DEFINE_SEMANTIC_ITEM(true, true, KaxTrackNumber) @@ -235,7 +235,7 @@ DEFINE_SEMANTIC_ITEM(false, true, KaxTrickMasterTrackSegmentUID) // DivX specifi DEFINE_SEMANTIC_ITEM(false, true, KaxContentEncodings) DEFINE_END_SEMANTIC(KaxTrackEntry) -DEFINE_MKX_MASTER_CONS(KaxTrackEntry, 0xAE, 1, KaxTracks, "TrackEntry") +DEFINE_MKX_MASTER_CONS(KaxTrackEntry, 0xAE, 1, KaxTracks, false, "TrackEntry") DEFINE_MKX_UINTEGER(KaxTrackNumber, 0xD7, 1, KaxTrackEntry, "TrackNumber") DEFINE_MKX_UINTEGER(KaxTrackUID, 0x73C5, 2, KaxTrackEntry, "TrackUID") DEFINE_MKX_UINTEGER(KaxTrackType, 0x83, 1, KaxTrackEntry, "TrackType") @@ -263,7 +263,7 @@ DEFINE_SEMANTIC_ITEM(true, true, KaxBlockAddIDType) DEFINE_SEMANTIC_ITEM(false, true, KaxBlockAddIDExtraData) DEFINE_END_SEMANTIC(KaxBlockAdditionMapping) -DEFINE_MKX_MASTER(KaxBlockAdditionMapping, 0x41E4, 2, KaxTrackEntry, "BlockAdditionMapping") +DEFINE_MKX_MASTER(KaxBlockAdditionMapping, 0x41E4, 2, KaxTrackEntry, false, "BlockAdditionMapping") DEFINE_MKX_UINTEGER(KaxBlockAddIDValue, 0x41F0, 2, KaxBlockAdditionMapping, "BlockAddIDValue") DEFINE_MKX_STRING(KaxBlockAddIDName, 0x41A4, 2, KaxBlockAdditionMapping, "BlockAddIDName") DEFINE_MKX_UINTEGER_DEF(KaxBlockAddIDType, 0x41E7, 2, KaxBlockAdditionMapping, "BlockAddIDType", 0) @@ -289,7 +289,7 @@ DEFINE_SEMANTIC_ITEM(true, true, KaxTrackTranslateCodec) DEFINE_SEMANTIC_ITEM(false, false, KaxTrackTranslateEditionUID) DEFINE_END_SEMANTIC(KaxTrackTranslate) -DEFINE_MKX_MASTER(KaxTrackTranslate, 0x6624, 2, KaxTrackEntry, "TrackTranslate") +DEFINE_MKX_MASTER(KaxTrackTranslate, 0x6624, 2, KaxTrackEntry, false, "TrackTranslate") DEFINE_MKX_BINARY (KaxTrackTranslateTrackID, 0x66A5, 2, KaxTrackTranslate, "TrackTranslateTrackID") DEFINE_MKX_UINTEGER(KaxTrackTranslateCodec, 0x66BF, 2, KaxTrackTranslate, "TrackTranslateCodec") DEFINE_MKX_UINTEGER(KaxTrackTranslateEditionUID, 0x66FC, 2, KaxTrackTranslate, "TrackTranslateEditionUID") @@ -317,7 +317,7 @@ DEFINE_SEMANTIC_ITEM(false, true, KaxVideoColour) DEFINE_SEMANTIC_ITEM(false, true, KaxVideoProjection) DEFINE_END_SEMANTIC(KaxTrackVideo) -DEFINE_MKX_MASTER(KaxTrackVideo, 0xE0, 1, KaxTrackEntry, "TrackVideo") +DEFINE_MKX_MASTER(KaxTrackVideo, 0xE0, 1, KaxTrackEntry, false, "TrackVideo") DEFINE_MKX_UINTEGER_DEF(KaxVideoFlagInterlaced, 0x9A, 1, KaxTrackVideo, "VideoFlagInterlaced", 0) DEFINE_MKX_UINTEGER_DEF(KaxVideoFieldOrder, 0x9D, 1, KaxTrackVideo, "VideoFieldOrder", 2) DEFINE_MKX_UINTEGER_DEF(KaxVideoStereoMode, 0x53B8, 2, KaxTrackVideo, "VideoStereoMode", 0) @@ -354,7 +354,7 @@ DEFINE_SEMANTIC_ITEM(false, true, KaxVideoColourMaxFALL) DEFINE_SEMANTIC_ITEM(false, true, KaxVideoColourMasterMeta) DEFINE_END_SEMANTIC(KaxVideoColour) -DEFINE_MKX_MASTER(KaxVideoColour, 0x55B0, 2, KaxTrackVideo, "VideoColour") +DEFINE_MKX_MASTER(KaxVideoColour, 0x55B0, 2, KaxTrackVideo, false, "VideoColour") DEFINE_MKX_UINTEGER_DEF(KaxVideoColourMatrix, 0x55B1, 2, KaxVideoColour, "VideoColourMatrix", 2) DEFINE_MKX_UINTEGER_DEF(KaxVideoBitsPerChannel, 0x55B2, 2, KaxVideoColour, "VideoBitsPerChannel", 0) DEFINE_MKX_UINTEGER(KaxVideoChromaSubsampHorz, 0x55B3, 2, KaxVideoColour, "VideoChromaSubsampHorz") @@ -382,7 +382,7 @@ DEFINE_SEMANTIC_ITEM(false, true, KaxVideoLuminanceMax) DEFINE_SEMANTIC_ITEM(false, true, KaxVideoLuminanceMin) DEFINE_END_SEMANTIC(KaxVideoColourMasterMeta) -DEFINE_MKX_MASTER(KaxVideoColourMasterMeta, 0x55D0, 2, KaxVideoColour, "VideoColourMasterMeta") +DEFINE_MKX_MASTER(KaxVideoColourMasterMeta, 0x55D0, 2, KaxVideoColour, false, "VideoColourMasterMeta") DEFINE_MKX_FLOAT(KaxVideoRChromaX, 0x55D1, 2, KaxVideoColourMasterMeta, "VideoRChromaX") DEFINE_MKX_FLOAT(KaxVideoRChromaY, 0x55D2, 2, KaxVideoColourMasterMeta, "VideoRChromaY") DEFINE_MKX_FLOAT(KaxVideoGChromaX, 0x55D3, 2, KaxVideoColourMasterMeta, "VideoGChromaX") @@ -402,7 +402,7 @@ DEFINE_SEMANTIC_ITEM(true, true, KaxVideoProjectionPosePitch) DEFINE_SEMANTIC_ITEM(true, true, KaxVideoProjectionPoseRoll) DEFINE_END_SEMANTIC(KaxVideoProjection) -DEFINE_MKX_MASTER(KaxVideoProjection, 0x7670, 2, KaxTrackVideo, "VideoProjection") +DEFINE_MKX_MASTER(KaxVideoProjection, 0x7670, 2, KaxTrackVideo, false, "VideoProjection") DEFINE_MKX_UINTEGER_DEF(KaxVideoProjectionType, 0x7671, 2, KaxVideoProjection, "VideoProjectionType", 0) DEFINE_MKX_BINARY (KaxVideoProjectionPrivate, 0x7672, 2, KaxVideoProjection, "VideoProjectionPrivate") DEFINE_MKX_FLOAT_DEF(KaxVideoProjectionPoseYaw, 0x7673, 2, KaxVideoProjection, "VideoProjectionPoseYaw", 0) @@ -418,7 +418,7 @@ DEFINE_SEMANTIC_ITEM(false, true, KaxAudioBitDepth) DEFINE_SEMANTIC_ITEM(true, true, KaxEmphasis) DEFINE_END_SEMANTIC(KaxTrackAudio) -DEFINE_MKX_MASTER(KaxTrackAudio, 0xE1, 1, KaxTrackEntry, "TrackAudio") +DEFINE_MKX_MASTER(KaxTrackAudio, 0xE1, 1, KaxTrackEntry, false, "TrackAudio") DEFINE_MKX_FLOAT_DEF(KaxAudioSamplingFreq, 0xB5, 1, KaxTrackAudio, "AudioSamplingFreq", 8000) DEFINE_MKX_FLOAT(KaxAudioOutputSamplingFreq, 0x78B5, 2, KaxTrackAudio, "AudioOutputSamplingFreq") DEFINE_MKX_UINTEGER_DEF(KaxAudioChannels, 0x9F, 1, KaxTrackAudio, "AudioChannels", 1) @@ -431,20 +431,20 @@ DEFINE_SEMANTIC_ITEM(false, true, KaxTrackCombinePlanes) DEFINE_SEMANTIC_ITEM(false, true, KaxTrackJoinBlocks) DEFINE_END_SEMANTIC(KaxTrackOperation) -DEFINE_MKX_MASTER(KaxTrackOperation, 0xE2, 1, KaxTrackEntry, "TrackOperation") +DEFINE_MKX_MASTER(KaxTrackOperation, 0xE2, 1, KaxTrackEntry, false, "TrackOperation") DEFINE_START_SEMANTIC(KaxTrackCombinePlanes) DEFINE_SEMANTIC_ITEM(true, false, KaxTrackPlane) DEFINE_END_SEMANTIC(KaxTrackCombinePlanes) -DEFINE_MKX_MASTER(KaxTrackCombinePlanes, 0xE3, 1, KaxTrackOperation, "TrackCombinePlanes") +DEFINE_MKX_MASTER(KaxTrackCombinePlanes, 0xE3, 1, KaxTrackOperation, false, "TrackCombinePlanes") DEFINE_START_SEMANTIC(KaxTrackPlane) DEFINE_SEMANTIC_ITEM(true, true, KaxTrackPlaneUID) DEFINE_SEMANTIC_ITEM(true, true, KaxTrackPlaneType) DEFINE_END_SEMANTIC(KaxTrackPlane) -DEFINE_MKX_MASTER(KaxTrackPlane, 0xE4, 1, KaxTrackCombinePlanes, "TrackPlane") +DEFINE_MKX_MASTER(KaxTrackPlane, 0xE4, 1, KaxTrackCombinePlanes, false, "TrackPlane") DEFINE_MKX_UINTEGER(KaxTrackPlaneUID, 0xE5, 1, KaxTrackPlane, "TrackPlaneUID") DEFINE_MKX_UINTEGER(KaxTrackPlaneType, 0xE6, 1, KaxTrackPlane, "TrackPlaneType") @@ -452,7 +452,7 @@ DEFINE_START_SEMANTIC(KaxTrackJoinBlocks) DEFINE_SEMANTIC_ITEM(true, false, KaxTrackJoinUID) DEFINE_END_SEMANTIC(KaxTrackJoinBlocks) -DEFINE_MKX_MASTER(KaxTrackJoinBlocks, 0xE9, 1, KaxTrackOperation, "TrackJoinBlocks") +DEFINE_MKX_MASTER(KaxTrackJoinBlocks, 0xE9, 1, KaxTrackOperation, false, "TrackJoinBlocks") DEFINE_MKX_UINTEGER(KaxTrackJoinUID, 0xED, 1, KaxTrackJoinBlocks, "TrackJoinUID") DEFINE_MKX_UINTEGER(KaxTrickTrackUID, 0xC0, 1, KaxTrackEntry, "TrickTrackUID") DEFINE_MKX_BINARY (KaxTrickTrackSegmentUID, 0xC1, 1, KaxTrackEntry, "TrickTrackSegmentUID") @@ -464,7 +464,7 @@ DEFINE_START_SEMANTIC(KaxContentEncodings) DEFINE_SEMANTIC_ITEM(true, false, KaxContentEncoding) DEFINE_END_SEMANTIC(KaxContentEncodings) -DEFINE_MKX_MASTER(KaxContentEncodings, 0x6D80, 2, KaxTrackEntry, "ContentEncodings") +DEFINE_MKX_MASTER(KaxContentEncodings, 0x6D80, 2, KaxTrackEntry, false, "ContentEncodings") DEFINE_START_SEMANTIC(KaxContentEncoding) DEFINE_SEMANTIC_ITEM(true, true, KaxContentEncodingOrder) @@ -474,7 +474,7 @@ DEFINE_SEMANTIC_ITEM(false, true, KaxContentCompression) DEFINE_SEMANTIC_ITEM(false, true, KaxContentEncryption) DEFINE_END_SEMANTIC(KaxContentEncoding) -DEFINE_MKX_MASTER(KaxContentEncoding, 0x6240, 2, KaxContentEncodings, "ContentEncoding") +DEFINE_MKX_MASTER(KaxContentEncoding, 0x6240, 2, KaxContentEncodings, false, "ContentEncoding") DEFINE_MKX_UINTEGER_DEF(KaxContentEncodingOrder, 0x5031, 2, KaxContentEncoding, "ContentEncodingOrder", 0) DEFINE_MKX_UINTEGER_DEF(KaxContentEncodingScope, 0x5032, 2, KaxContentEncoding, "ContentEncodingScope", 1) DEFINE_MKX_UINTEGER_DEF(KaxContentEncodingType, 0x5033, 2, KaxContentEncoding, "ContentEncodingType", 0) @@ -484,7 +484,7 @@ DEFINE_SEMANTIC_ITEM(true, true, KaxContentCompAlgo) DEFINE_SEMANTIC_ITEM(false, true, KaxContentCompSettings) DEFINE_END_SEMANTIC(KaxContentCompression) -DEFINE_MKX_MASTER(KaxContentCompression, 0x5034, 2, KaxContentEncoding, "ContentCompression") +DEFINE_MKX_MASTER(KaxContentCompression, 0x5034, 2, KaxContentEncoding, false, "ContentCompression") DEFINE_MKX_UINTEGER_DEF(KaxContentCompAlgo, 0x4254, 2, KaxContentCompression, "ContentCompAlgo", 0) DEFINE_MKX_BINARY (KaxContentCompSettings, 0x4255, 2, KaxContentCompression, "ContentCompSettings") @@ -498,7 +498,7 @@ DEFINE_SEMANTIC_ITEM(false, true, KaxContentSigAlgo) // not supported DEFINE_SEMANTIC_ITEM(false, true, KaxContentSigHashAlgo) // not supported DEFINE_END_SEMANTIC(KaxContentEncryption) -DEFINE_MKX_MASTER(KaxContentEncryption, 0x5035, 2, KaxContentEncoding, "ContentEncryption") +DEFINE_MKX_MASTER(KaxContentEncryption, 0x5035, 2, KaxContentEncoding, false, "ContentEncryption") DEFINE_MKX_UINTEGER_DEF(KaxContentEncAlgo, 0x47E1, 2, KaxContentEncryption, "ContentEncAlgo", 0) DEFINE_MKX_BINARY (KaxContentEncKeyID, 0x47E2, 2, KaxContentEncryption, "ContentEncKeyID") @@ -506,7 +506,7 @@ DEFINE_START_SEMANTIC(KaxContentEncAESSettings) DEFINE_SEMANTIC_ITEM(true, true, KaxAESSettingsCipherMode) DEFINE_END_SEMANTIC(KaxContentEncAESSettings) -DEFINE_MKX_MASTER(KaxContentEncAESSettings, 0x47E7, 2, KaxContentEncryption, "ContentEncAESSettings") +DEFINE_MKX_MASTER(KaxContentEncAESSettings, 0x47E7, 2, KaxContentEncryption, false, "ContentEncAESSettings") DEFINE_MKX_UINTEGER(KaxAESSettingsCipherMode, 0x47E8, 2, KaxContentEncAESSettings, "AESSettingsCipherMode") DEFINE_MKX_BINARY (KaxContentSignature, 0x47E3, 2, KaxContentEncryption, "ContentSignature") DEFINE_MKX_BINARY (KaxContentSigKeyID, 0x47E4, 2, KaxContentEncryption, "ContentSigKeyID") @@ -517,14 +517,14 @@ DEFINE_START_SEMANTIC(KaxCues) DEFINE_SEMANTIC_ITEM(true, false, KaxCuePoint) DEFINE_END_SEMANTIC(KaxCues) -DEFINE_MKX_MASTER(KaxCues, 0x1C53BB6B, 4, KaxSegment, "Cues") +DEFINE_MKX_MASTER(KaxCues, 0x1C53BB6B, 4, KaxSegment, false, "Cues") DEFINE_START_SEMANTIC(KaxCuePoint) DEFINE_SEMANTIC_ITEM(true, true, KaxCueTime) DEFINE_SEMANTIC_ITEM(true, false, KaxCueTrackPositions) DEFINE_END_SEMANTIC(KaxCuePoint) -DEFINE_MKX_MASTER(KaxCuePoint, 0xBB, 1, KaxCues, "CuePoint") +DEFINE_MKX_MASTER(KaxCuePoint, 0xBB, 1, KaxCues, false, "CuePoint") DEFINE_MKX_UINTEGER(KaxCueTime, 0xB3, 1, KaxCuePoint, "CueTime") DEFINE_START_SEMANTIC(KaxCueTrackPositions) @@ -537,7 +537,7 @@ DEFINE_SEMANTIC_ITEM(true, true, KaxCueCodecState) DEFINE_SEMANTIC_ITEM(false, false, KaxCueReference) DEFINE_END_SEMANTIC(KaxCueTrackPositions) -DEFINE_MKX_MASTER(KaxCueTrackPositions, 0xB7, 1, KaxCuePoint, "CueTrackPositions") +DEFINE_MKX_MASTER(KaxCueTrackPositions, 0xB7, 1, KaxCuePoint, false, "CueTrackPositions") DEFINE_MKX_UINTEGER(KaxCueTrack, 0xF7, 1, KaxCueTrackPositions, "CueTrack") DEFINE_MKX_UINTEGER(KaxCueClusterPosition, 0xF1, 1, KaxCueTrackPositions, "CueClusterPosition") DEFINE_MKX_UINTEGER(KaxCueRelativePosition, 0xF0, 1, KaxCueTrackPositions, "CueRelativePosition") @@ -552,7 +552,7 @@ DEFINE_SEMANTIC_ITEM(false, true, KaxCueRefNumber) // not supported DEFINE_SEMANTIC_ITEM(false, true, KaxCueRefCodecState) // not supported DEFINE_END_SEMANTIC(KaxCueReference) -DEFINE_MKX_MASTER(KaxCueReference, 0xDB, 1, KaxCueTrackPositions, "CueReference") +DEFINE_MKX_MASTER(KaxCueReference, 0xDB, 1, KaxCueTrackPositions, false, "CueReference") DEFINE_MKX_UINTEGER(KaxCueRefTime, 0x96, 1, KaxCueReference, "CueRefTime") DEFINE_MKX_UINTEGER(KaxCueRefCluster, 0x97, 1, KaxCueReference, "CueRefCluster") DEFINE_MKX_UINTEGER_DEF(KaxCueRefNumber, 0x535F, 2, KaxCueReference, "CueRefNumber", 1) @@ -562,7 +562,7 @@ DEFINE_START_SEMANTIC(KaxAttachments) DEFINE_SEMANTIC_ITEM(true, false, KaxAttached) DEFINE_END_SEMANTIC(KaxAttachments) -DEFINE_MKX_MASTER_CONS(KaxAttachments, 0x1941A469, 4, KaxSegment, "Attachments") +DEFINE_MKX_MASTER_CONS(KaxAttachments, 0x1941A469, 4, KaxSegment, false, "Attachments") DEFINE_START_SEMANTIC(KaxAttached) DEFINE_SEMANTIC_ITEM(false, true, KaxFileDescription) @@ -575,7 +575,7 @@ DEFINE_SEMANTIC_ITEM(false, true, KaxFileUsedStartTime) // DivX specific DEFINE_SEMANTIC_ITEM(false, true, KaxFileUsedEndTime) // DivX specific DEFINE_END_SEMANTIC(KaxAttached) -DEFINE_MKX_MASTER_CONS(KaxAttached, 0x61A7, 2, KaxAttachments, "AttachedFile") +DEFINE_MKX_MASTER_CONS(KaxAttached, 0x61A7, 2, KaxAttachments, false, "AttachedFile") DEFINE_MKX_UNISTRING(KaxFileDescription, 0x467E, 2, KaxAttached, "FileDescription") DEFINE_MKX_UNISTRING(KaxFileName, 0x466E, 2, KaxAttached, "FileName") DEFINE_MKX_STRING(KaxMimeType, 0x4660, 2, KaxAttached, "FileMimeType") @@ -589,7 +589,7 @@ DEFINE_START_SEMANTIC(KaxChapters) DEFINE_SEMANTIC_ITEM(true, false, KaxEditionEntry) DEFINE_END_SEMANTIC(KaxChapters) -DEFINE_MKX_MASTER(KaxChapters, 0x1043A770, 4, KaxSegment, "Chapters") +DEFINE_MKX_MASTER(KaxChapters, 0x1043A770, 4, KaxSegment, false, "Chapters") DEFINE_START_SEMANTIC(KaxEditionEntry) DEFINE_SEMANTIC_ITEM(false, true, KaxEditionUID) @@ -600,7 +600,7 @@ DEFINE_SEMANTIC_ITEM(false, false, KaxEditionDisplay) DEFINE_SEMANTIC_ITEM(true, false, KaxChapterAtom) DEFINE_END_SEMANTIC(KaxEditionEntry) -DEFINE_MKX_MASTER(KaxEditionEntry, 0x45B9, 2, KaxChapters, "EditionEntry") +DEFINE_MKX_MASTER(KaxEditionEntry, 0x45B9, 2, KaxChapters, false, "EditionEntry") DEFINE_MKX_UINTEGER(KaxEditionUID, 0x45BC, 2, KaxEditionEntry, "EditionUID") DEFINE_MKX_UINTEGER_DEF(KaxEditionFlagHidden, 0x45BD, 2, KaxEditionEntry, "EditionFlagHidden", 0) DEFINE_MKX_UINTEGER_DEF(KaxEditionFlagDefault, 0x45DB, 2, KaxEditionEntry, "EditionFlagDefault", 0) @@ -611,7 +611,7 @@ DEFINE_SEMANTIC_ITEM(true, true, KaxEditionString) DEFINE_SEMANTIC_ITEM(false, false, KaxEditionLanguageIETF) DEFINE_END_SEMANTIC(KaxEditionDisplay) -DEFINE_MKX_MASTER(KaxEditionDisplay, 0x4520, 2, KaxEditionEntry, "EditionDisplay") +DEFINE_MKX_MASTER(KaxEditionDisplay, 0x4520, 2, KaxEditionEntry, false, "EditionDisplay") DEFINE_MKX_UNISTRING(KaxEditionString, 0x4521, 2, KaxEditionDisplay, "EditionString") DEFINE_MKX_STRING(KaxEditionLanguageIETF, 0x45E4, 2, KaxEditionDisplay, "EditionLanguageIETF") @@ -632,7 +632,7 @@ DEFINE_SEMANTIC_ITEM(false, false, KaxChapterDisplay) DEFINE_SEMANTIC_ITEM(false, false, KaxChapterProcess) DEFINE_END_SEMANTIC(KaxChapterAtom) -DEFINE_MKX_MASTER(KaxChapterAtom, 0xB6, 1, KaxEditionEntry, "ChapterAtom") +DEFINE_MKX_MASTER(KaxChapterAtom, 0xB6, 1, KaxEditionEntry, false, "ChapterAtom") DEFINE_MKX_UINTEGER(KaxChapterUID, 0x73C4, 2, KaxChapterAtom, "ChapterUID") DEFINE_MKX_UNISTRING(KaxChapterStringUID, 0x5654, 2, KaxChapterAtom, "ChapterStringUID") DEFINE_MKX_UINTEGER(KaxChapterTimeStart, 0x91, 1, KaxChapterAtom, "ChapterTimeStart") @@ -648,7 +648,7 @@ DEFINE_START_SEMANTIC(KaxChapterTrack) DEFINE_SEMANTIC_ITEM(true, false, KaxChapterTrackNumber) DEFINE_END_SEMANTIC(KaxChapterTrack) -DEFINE_MKX_MASTER(KaxChapterTrack, 0x8F, 1, KaxChapterAtom, "ChapterTrack") +DEFINE_MKX_MASTER(KaxChapterTrack, 0x8F, 1, KaxChapterAtom, false, "ChapterTrack") DEFINE_MKX_UINTEGER(KaxChapterTrackNumber, 0x89, 1, KaxChapterTrack, "ChapterTrackNumber") DEFINE_START_SEMANTIC(KaxChapterDisplay) @@ -658,7 +658,7 @@ DEFINE_SEMANTIC_ITEM(false, false, KaxChapLanguageIETF) DEFINE_SEMANTIC_ITEM(false, false, KaxChapterCountry) DEFINE_END_SEMANTIC(KaxChapterDisplay) -DEFINE_MKX_MASTER(KaxChapterDisplay, 0x80, 1, KaxChapterAtom, "ChapterDisplay") +DEFINE_MKX_MASTER(KaxChapterDisplay, 0x80, 1, KaxChapterAtom, false, "ChapterDisplay") DEFINE_MKX_UNISTRING(KaxChapterString, 0x85, 1, KaxChapterDisplay, "ChapterString") DEFINE_MKX_STRING_DEF(KaxChapterLanguage, 0x437C, 2, KaxChapterDisplay, "ChapterLanguage", "eng") DEFINE_MKX_STRING(KaxChapLanguageIETF, 0x437D, 2, KaxChapterDisplay, "ChapLanguageIETF") @@ -670,7 +670,7 @@ DEFINE_SEMANTIC_ITEM(false, true, KaxChapterProcessPrivate) DEFINE_SEMANTIC_ITEM(false, false, KaxChapterProcessCommand) DEFINE_END_SEMANTIC(KaxChapterProcess) -DEFINE_MKX_MASTER(KaxChapterProcess, 0x6944, 2, KaxChapterAtom, "ChapterProcess") +DEFINE_MKX_MASTER(KaxChapterProcess, 0x6944, 2, KaxChapterAtom, false, "ChapterProcess") DEFINE_MKX_UINTEGER_DEF(KaxChapterProcessCodecID, 0x6955, 2, KaxChapterProcess, "ChapterProcessCodecID", 0) DEFINE_MKX_BINARY (KaxChapterProcessPrivate, 0x450D, 2, KaxChapterProcess, "ChapterProcessPrivate") @@ -679,7 +679,7 @@ DEFINE_SEMANTIC_ITEM(true, true, KaxChapterProcessTime) DEFINE_SEMANTIC_ITEM(true, true, KaxChapterProcessData) DEFINE_END_SEMANTIC(KaxChapterProcessCommand) -DEFINE_MKX_MASTER(KaxChapterProcessCommand, 0x6911, 2, KaxChapterProcess, "ChapterProcessCommand") +DEFINE_MKX_MASTER(KaxChapterProcessCommand, 0x6911, 2, KaxChapterProcess, false, "ChapterProcessCommand") DEFINE_MKX_UINTEGER(KaxChapterProcessTime, 0x6922, 2, KaxChapterProcessCommand, "ChapterProcessTime") DEFINE_MKX_BINARY (KaxChapterProcessData, 0x6933, 2, KaxChapterProcessCommand, "ChapterProcessData") @@ -687,14 +687,14 @@ DEFINE_START_SEMANTIC(KaxTags) DEFINE_SEMANTIC_ITEM(true, false, KaxTag) DEFINE_END_SEMANTIC(KaxTags) -DEFINE_MKX_MASTER(KaxTags, 0x1254C367, 4, KaxSegment, "Tags") +DEFINE_MKX_MASTER(KaxTags, 0x1254C367, 4, KaxSegment, false, "Tags") DEFINE_START_SEMANTIC(KaxTag) DEFINE_SEMANTIC_ITEM(true, true, KaxTagTargets) DEFINE_SEMANTIC_ITEM(true, false, KaxTagSimple) DEFINE_END_SEMANTIC(KaxTag) -DEFINE_MKX_MASTER(KaxTag, 0x7373, 2, KaxTags, "Tag") +DEFINE_MKX_MASTER(KaxTag, 0x7373, 2, KaxTags, false, "Tag") DEFINE_START_SEMANTIC(KaxTagTargets) DEFINE_SEMANTIC_ITEM(true, true, KaxTagTargetTypeValue) @@ -705,7 +705,7 @@ DEFINE_SEMANTIC_ITEM(false, false, KaxTagChapterUID) DEFINE_SEMANTIC_ITEM(false, false, KaxTagAttachmentUID) DEFINE_END_SEMANTIC(KaxTagTargets) -DEFINE_MKX_MASTER(KaxTagTargets, 0x63C0, 2, KaxTag, "TagTargets") +DEFINE_MKX_MASTER(KaxTagTargets, 0x63C0, 2, KaxTag, false, "TagTargets") DEFINE_MKX_UINTEGER_DEF(KaxTagTargetTypeValue, 0x68CA, 2, KaxTagTargets, "TagTargetTypeValue", 50) DEFINE_MKX_STRING(KaxTagTargetType, 0x63CA, 2, KaxTagTargets, "TagTargetType") DEFINE_MKX_UINTEGER_DEF(KaxTagTrackUID, 0x63C5, 2, KaxTagTargets, "TagTrackUID", 0) @@ -724,7 +724,7 @@ DEFINE_SEMANTIC_ITEM(false, true, KaxTagString) DEFINE_SEMANTIC_ITEM(false, true, KaxTagBinary) DEFINE_END_SEMANTIC(KaxTagSimple) -DEFINE_MKX_MASTER(KaxTagSimple, 0x67C8, 2, KaxTag, "TagSimple") +DEFINE_MKX_MASTER(KaxTagSimple, 0x67C8, 2, KaxTag, false, "TagSimple") DEFINE_MKX_UNISTRING(KaxTagName, 0x45A3, 2, KaxTagSimple, "TagName") DEFINE_MKX_STRING_DEF(KaxTagLangue, 0x447A, 2, KaxTagSimple, "TagLanguage", "und") DEFINE_MKX_STRING(KaxTagLanguageIETF, 0x447B, 2, KaxTagSimple, "TagLanguageIETF")