[matroska] r1201 - in trunk/libmatroska: matroska src
[email protected] Tue, 30 Aug 2005 18:28:30 +0400 (MSD)
| Newsgroups | gmane.comp.multimedia.matroska.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: robux4
Date: 2005-08-30 18:28:27 +0400 (Tue, 30 Aug 2005)
New Revision: 1201
Modified:
trunk/libmatroska/matroska/KaxChapters.h
trunk/libmatroska/matroska/KaxTrackEntryData.h
trunk/libmatroska/src/KaxAttached.cpp
trunk/libmatroska/src/KaxChapters.cpp
trunk/libmatroska/src/KaxTrackEntryData.cpp
trunk/libmatroska/src/KaxTracks.cpp
Log:
added: KaxChapterSegmentEditionUID and KaxTrackAttachmentLink
Modified: trunk/libmatroska/matroska/KaxChapters.h
===================================================================
--- trunk/libmatroska/matroska/KaxChapters.h 2005-08-30 14:20:13 UTC (rev 1200)
+++ trunk/libmatroska/matroska/KaxChapters.h 2005-08-30 14:28:27 UTC (rev 1201)
@@ -190,6 +190,18 @@
bool ValidateSize() const { return (Size == 16);}
};
+class MATROSKA_DLL_API KaxChapterSegmentEditionUID : public EbmlBinary {
+public:
+ KaxChapterSegmentEditionUID() {}
+ KaxChapterSegmentEditionUID(const KaxChapterSegmentEditionUID & ElementToClone) :EbmlBinary(ElementToClone) {}
+ static EbmlElement & Create() {return *(new KaxChapterSegmentEditionUID);}
+ const EbmlCallbacks & Generic() const {return ClassInfos;}
+ static const EbmlCallbacks ClassInfos;
+ operator const EbmlId &() const {return ClassInfos.GlobalId;}
+ EbmlElement * Clone() const {return new KaxChapterSegmentEditionUID(*this);}
+ bool ValidateSize() const { return (Size == 16);}
+};
+
class MATROSKA_DLL_API KaxChapterPhysicalEquiv : public EbmlUInteger {
public:
KaxChapterPhysicalEquiv(): EbmlUInteger() {}
Modified: trunk/libmatroska/matroska/KaxTrackEntryData.h
===================================================================
--- trunk/libmatroska/matroska/KaxTrackEntryData.h 2005-08-30 14:20:13 UTC (rev 1200)
+++ trunk/libmatroska/matroska/KaxTrackEntryData.h 2005-08-30 14:28:27 UTC (rev 1201)
@@ -238,6 +238,18 @@
EbmlElement * Clone() const {return new KaxCodecName(*this);}
};
+class MATROSKA_DLL_API KaxTrackAttachmentLink : public EbmlBinary {
+ public:
+ KaxTrackAttachmentLink() {}
+ KaxTrackAttachmentLink(const KaxTrackAttachmentLink & ElementToClone) :EbmlBinary(ElementToClone){}
+ static EbmlElement & Create() {return *(new KaxTrackAttachmentLink);}
+ bool ValidateSize() const {return true;} // we don't mind about what's inside
+ const EbmlCallbacks & Generic() const {return ClassInfos;}
+ static const EbmlCallbacks ClassInfos;
+ operator const EbmlId &() const {return ClassInfos.GlobalId;}
+ EbmlElement * Clone() const {return new KaxTrackAttachmentLink(*this);}
+};
+
class MATROSKA_DLL_API KaxTrackOverlay : public EbmlUInteger {
public:
KaxTrackOverlay() {}
Modified: trunk/libmatroska/src/KaxAttached.cpp
===================================================================
--- trunk/libmatroska/src/KaxAttached.cpp 2005-08-30 14:20:13 UTC (rev 1200)
+++ trunk/libmatroska/src/KaxAttached.cpp 2005-08-30 14:28:27 UTC (rev 1201)
@@ -41,7 +41,11 @@
START_LIBMATROSKA_NAMESPACE
+#if MATROSKA_VERSION >= 2
EbmlSemantic KaxAttached_ContextList[5] =
+#else
+EbmlSemantic KaxAttached_ContextList[6] =
+#endif // MATROSKA_VERSION
{
EbmlSemantic(true, true, KaxFileName::ClassInfos),
EbmlSemantic(true, true, KaxMimeType::ClassInfos),
@@ -60,7 +64,7 @@
EbmlId KaxFileData_TheId (0x465C, 2);
EbmlId KaxFileUID_TheId (0x46AE, 2);
#if MATROSKA_VERSION >= 2
-EbmlId KaxFileReferral_TheId (0x3B40, 2);
+EbmlId KaxFileReferral_TheId (0x4675, 2);
#endif // MATROSKA_VERSION
const EbmlSemanticContext KaxAttached_Context = EbmlSemanticContext(countof(KaxAttached_ContextList), KaxAttached_ContextList, &KaxAttachments_Context, *GetKaxGlobal_Context, &KaxAttached::ClassInfos);
Modified: trunk/libmatroska/src/KaxChapters.cpp
===================================================================
--- trunk/libmatroska/src/KaxChapters.cpp 2005-08-30 14:20:13 UTC (rev 1200)
+++ trunk/libmatroska/src/KaxChapters.cpp 2005-08-30 14:28:27 UTC (rev 1201)
@@ -52,7 +52,7 @@
EbmlSemantic(true , false, KaxChapterAtom::ClassInfos),
};
-EbmlSemantic KaxChapterAtom_ContextList[11] =
+EbmlSemantic KaxChapterAtom_ContextList[12] =
{
EbmlSemantic(false, false, KaxChapterAtom::ClassInfos),
EbmlSemantic(true, true, KaxChapterUID::ClassInfos),
@@ -61,6 +61,7 @@
EbmlSemantic(true , true, KaxChapterFlagHidden::ClassInfos),
EbmlSemantic(true , true, KaxChapterFlagEnabled::ClassInfos),
EbmlSemantic(false, true, KaxChapterSegmentUID::ClassInfos),
+ EbmlSemantic(false, true, KaxChapterSegmentEditionUID::ClassInfos),
EbmlSemantic(false, true, KaxChapterPhysicalEquiv::ClassInfos),
EbmlSemantic(false, true, KaxChapterTrack::ClassInfos),
EbmlSemantic(false, false, KaxChapterDisplay::ClassInfos),
@@ -107,6 +108,7 @@
const EbmlSemanticContext KaxChapterFlagHidden_Context = EbmlSemanticContext(0, NULL, &KaxChapterAtom_Context, *GetKaxGlobal_Context, &KaxChapterFlagHidden::ClassInfos);
const EbmlSemanticContext KaxChapterFlagEnabled_Context = EbmlSemanticContext(0, NULL, &KaxChapterAtom_Context, *GetKaxGlobal_Context, &KaxChapterFlagEnabled::ClassInfos);
const EbmlSemanticContext KaxChapterSegmentUID_Context = EbmlSemanticContext(0, NULL, &KaxChapterAtom_Context, *GetKaxGlobal_Context, &KaxChapterSegmentUID::ClassInfos);
+const EbmlSemanticContext KaxChapterSegmentEditionUID_Context = EbmlSemanticContext(0, NULL, &KaxChapterAtom_Context, *GetKaxGlobal_Context, &KaxChapterSegmentEditionUID::ClassInfos);
const EbmlSemanticContext KaxChapterPhysicalEquiv_Context = EbmlSemanticContext(0, NULL, &KaxChapterAtom_Context, *GetKaxGlobal_Context, &KaxChapterPhysicalEquiv::ClassInfos);
const EbmlSemanticContext KaxChapterTrackNumber_Context = EbmlSemanticContext(0, NULL, &KaxChapterTrack_Context, *GetKaxGlobal_Context, &KaxChapterTrackNumber::ClassInfos);
const EbmlSemanticContext KaxChapterString_Context = EbmlSemanticContext(0, NULL, &KaxChapterDisplay_Context, *GetKaxGlobal_Context, &KaxChapterString::ClassInfos);
@@ -132,6 +134,7 @@
EbmlId KaxChapterFlagHidden_TheId (0x98, 1);
EbmlId KaxChapterFlagEnabled_TheId (0x4598, 2);
EbmlId KaxChapterSegmentUID_TheId (0x6E67, 2);
+EbmlId KaxChapterSegmentEditionUID_TheId(0x6EBC, 2);
EbmlId KaxChapterPhysicalEquiv_TheId (0x63C3, 2);
EbmlId KaxChapterTrack_TheId (0x8F, 1);
EbmlId KaxChapterTrackNumber_TheId (0x89, 1);
@@ -159,6 +162,7 @@
const EbmlCallbacks KaxChapterFlagHidden::ClassInfos(KaxChapterFlagHidden::Create, KaxChapterFlagHidden_TheId, "ChapterFlagHidden", KaxChapterFlagHidden_Context);
const EbmlCallbacks KaxChapterFlagEnabled::ClassInfos(KaxChapterFlagEnabled::Create, KaxChapterFlagEnabled_TheId, "ChapterFlagEnabled", KaxChapterFlagEnabled_Context);
const EbmlCallbacks KaxChapterSegmentUID::ClassInfos(KaxChapterSegmentUID::Create, KaxChapterSegmentUID_TheId, "ChapterSegmentUID", KaxChapterSegmentUID_Context);
+const EbmlCallbacks KaxChapterSegmentEditionUID::ClassInfos(KaxChapterSegmentEditionUID::Create, KaxChapterSegmentEditionUID_TheId, "ChapterSegmentEditionUID", KaxChapterSegmentEditionUID_Context);
const EbmlCallbacks KaxChapterPhysicalEquiv::ClassInfos(KaxChapterPhysicalEquiv::Create, KaxChapterPhysicalEquiv_TheId, "ChapterPhysicalEquiv", KaxChapterPhysicalEquiv_Context);
const EbmlCallbacks KaxChapterTrack::ClassInfos(KaxChapterTrack::Create, KaxChapterTrack_TheId, "ChapterTrack", KaxChapterTrack_Context);
const EbmlCallbacks KaxChapterTrackNumber::ClassInfos(KaxChapterTrackNumber::Create, KaxChapterTrackNumber_TheId, "ChapterTrackNumber", KaxChapterTrackNumber_Context);
Modified: trunk/libmatroska/src/KaxTrackEntryData.cpp
===================================================================
--- trunk/libmatroska/src/KaxTrackEntryData.cpp 2005-08-30 14:20:13 UTC (rev 1200)
+++ trunk/libmatroska/src/KaxTrackEntryData.cpp 2005-08-30 14:28:27 UTC (rev 1201)
@@ -61,6 +61,7 @@
EbmlId KaxCodecID_TheId (0x86, 1);
EbmlId KaxCodecPrivate_TheId (0x63A2, 2);
EbmlId KaxCodecName_TheId (0x258688, 3);
+EbmlId KaxTrackAttachmentLink_TheId (0x7446, 2);
EbmlId KaxTrackOverlay_TheId (0x6FAB, 2);
EbmlId KaxTrackTranslate_TheId (0x6624, 2);
EbmlId KaxTrackTranslateEditionUID_TheId(0x66FC, 2);
@@ -90,6 +91,7 @@
const EbmlSemanticContext KaxCodecID_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxCodecID::ClassInfos);
const EbmlSemanticContext KaxCodecPrivate_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxCodecPrivate::ClassInfos);
const EbmlSemanticContext KaxCodecName_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxCodecName::ClassInfos);
+const EbmlSemanticContext KaxTrackAttachmentLink_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxTrackAttachmentLink::ClassInfos);
const EbmlSemanticContext KaxTrackOverlay_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxTrackOverlay::ClassInfos);
const EbmlSemanticContext KaxTrackTranslate_Context = EbmlSemanticContext(countof(KaxTrackTranslate_ContextList), KaxTrackTranslate_ContextList, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxTrackTranslate::ClassInfos);
const EbmlSemanticContext KaxTrackTranslateEditionUID_Context = EbmlSemanticContext(0, NULL, &KaxTrackTranslate_Context, *GetKaxGlobal_Context, &KaxTrackTranslateEditionUID::ClassInfos);
@@ -119,6 +121,7 @@
const EbmlCallbacks KaxCodecID::ClassInfos(KaxCodecID::Create, KaxCodecID_TheId, "CodecID", KaxCodecID_Context);
const EbmlCallbacks KaxCodecPrivate::ClassInfos(KaxCodecPrivate::Create, KaxCodecPrivate_TheId, "CodecPrivate", KaxCodecPrivate_Context);
const EbmlCallbacks KaxCodecName::ClassInfos(KaxCodecName::Create, KaxCodecName_TheId, "CodecName", KaxCodecName_Context);
+const EbmlCallbacks KaxTrackAttachmentLink::ClassInfos(KaxTrackAttachmentLink::Create, KaxTrackAttachmentLink_TheId, "TrackAttachmentLink", KaxTrackAttachmentLink_Context);
const EbmlCallbacks KaxTrackOverlay::ClassInfos(KaxTrackOverlay::Create, KaxTrackOverlay_TheId, "TrackOverlay", KaxTrackOverlay_Context);
const EbmlCallbacks KaxTrackTranslate::ClassInfos(KaxTrackTranslate::Create, KaxTrackTranslate_TheId, "TrackTranslate", KaxTrackTranslate_Context);
const EbmlCallbacks KaxTrackTranslateEditionUID::ClassInfos(KaxTrackTranslateEditionUID::Create, KaxTrackTranslateEditionUID_TheId, "TrackTranslateEditionUID", KaxTrackTranslateEditionUID_Context);
Modified: trunk/libmatroska/src/KaxTracks.cpp
===================================================================
--- trunk/libmatroska/src/KaxTracks.cpp 2005-08-30 14:20:13 UTC (rev 1200)
+++ trunk/libmatroska/src/KaxTracks.cpp 2005-08-30 14:28:27 UTC (rev 1201)
@@ -49,9 +49,9 @@
};
#if MATROSKA_VERSION == 1
-const EbmlSemantic KaxTrackEntry_ContextList[21] =
+const EbmlSemantic KaxTrackEntry_ContextList[22] =
#else // MATROSKA_VERSION
-const EbmlSemantic KaxTrackEntry_ContextList[26] =
+const EbmlSemantic KaxTrackEntry_ContextList[27] =
#endif // MATROSKA_VERSION
{
EbmlSemantic(true , true, KaxTrackNumber::ClassInfos),
@@ -73,6 +73,7 @@
EbmlSemantic(true , true, KaxCodecID::ClassInfos),
EbmlSemantic(false, true, KaxCodecPrivate::ClassInfos),
EbmlSemantic(false, true, KaxCodecName::ClassInfos),
+ EbmlSemantic(false, true, KaxAttachmentLink::ClassInfos),
#if MATROSKA_VERSION >= 2
EbmlSemantic(false, true, KaxCodecSettings::ClassInfos),
EbmlSemantic(false, false,KaxCodecInfoURL::ClassInfos),