[matroska] r726 - in trunk/libmatroska: matroska src

Author: robux4
Date: 2004-08-25 18:22:14 +0400 (Wed, 25 Aug 2004)
New Revision: 726

Modified:
   trunk/libmatroska/matroska/KaxTrackVideo.h
   trunk/libmatroska/src/KaxTrackVideo.cpp
Log:
add the new PixelCropXXX elements

Modified: trunk/libmatroska/matroska/KaxTrackVideo.h
===================================================================
--- trunk/libmatroska/matroska/KaxTrackVideo.h	2004-08-23 21:19:26 UTC (rev 725)
+++ trunk/libmatroska/matroska/KaxTrackVideo.h	2004-08-25 14:22:14 UTC (rev 726)
@@ -102,6 +102,50 @@
 		EbmlElement * Clone() const {return new KaxVideoPixelHeight(*this);}
 };
 
+class MATROSKA_DLL_API KaxVideoPixelCropBottom : public EbmlUInteger {
+	public:
+		KaxVideoPixelCropBottom(0) {}
+		KaxVideoPixelCropBottom(const KaxVideoPixelCropBottom & ElementToClone) :EbmlUInteger(ElementToClone) {}
+		static EbmlElement & Create() {return *(new KaxVideoPixelCropBottom);}
+		const EbmlCallbacks & Generic() const {return ClassInfos;}
+		static const EbmlCallbacks ClassInfos;
+		operator const EbmlId &() const {return ClassInfos.GlobalId;}
+		EbmlElement * Clone() const {return new KaxVideoPixelCropBottom(*this);}
+};
+
+class MATROSKA_DLL_API KaxVideoPixelCropTop : public EbmlUInteger {
+	public:
+		KaxVideoPixelCropTop(0) {}
+		KaxVideoPixelCropTop(const KaxVideoPixelCropTop & ElementToClone) :EbmlUInteger(ElementToClone) {}
+		static EbmlElement & Create() {return *(new KaxVideoPixelCropTop);}
+		const EbmlCallbacks & Generic() const {return ClassInfos;}
+		static const EbmlCallbacks ClassInfos;
+		operator const EbmlId &() const {return ClassInfos.GlobalId;}
+		EbmlElement * Clone() const {return new KaxVideoPixelCropTop(*this);}
+};
+
+class MATROSKA_DLL_API KaxVideoPixelCropLeft : public EbmlUInteger {
+	public:
+		KaxVideoPixelCropLeft(0) {}
+		KaxVideoPixelCropLeft(const KaxVideoPixelCropLeft & ElementToClone) :EbmlUInteger(ElementToClone) {}
+		static EbmlElement & Create() {return *(new KaxVideoPixelCropLeft);}
+		const EbmlCallbacks & Generic() const {return ClassInfos;}
+		static const EbmlCallbacks ClassInfos;
+		operator const EbmlId &() const {return ClassInfos.GlobalId;}
+		EbmlElement * Clone() const {return new KaxVideoPixelCropLeft(*this);}
+};
+
+class MATROSKA_DLL_API KaxVideoPixelCropRight : public EbmlUInteger {
+	public:
+		KaxVideoPixelCropRight(0) {}
+		KaxVideoPixelCropRight(const KaxVideoPixelCropRight & ElementToClone) :EbmlUInteger(ElementToClone) {}
+		static EbmlElement & Create() {return *(new KaxVideoPixelCropRight);}
+		const EbmlCallbacks & Generic() const {return ClassInfos;}
+		static const EbmlCallbacks ClassInfos;
+		operator const EbmlId &() const {return ClassInfos.GlobalId;}
+		EbmlElement * Clone() const {return new KaxVideoPixelCropRight(*this);}
+};
+
 class MATROSKA_DLL_API KaxVideoDisplayWidth : public EbmlUInteger {
 	public:
 		KaxVideoDisplayWidth() {}

Modified: trunk/libmatroska/src/KaxTrackVideo.cpp
===================================================================
--- trunk/libmatroska/src/KaxTrackVideo.cpp	2004-08-23 21:19:26 UTC (rev 725)
+++ trunk/libmatroska/src/KaxTrackVideo.cpp	2004-08-25 14:22:14 UTC (rev 726)
@@ -40,13 +40,17 @@
 START_LIBMATROSKA_NAMESPACE
 
 #if MATROSKA_VERSION == 1
-const EbmlSemantic KaxTrackVideo_ContextList[6] =
+const EbmlSemantic KaxTrackVideo_ContextList[10] =
 #else // MATROSKA_VERSION
-const EbmlSemantic KaxTrackVideo_ContextList[11] =
+const EbmlSemantic KaxTrackVideo_ContextList[15] =
 #endif // MATROSKA_VERSION
 {
 	EbmlSemantic(true , true, KaxVideoPixelWidth::ClassInfos),
 	EbmlSemantic(true , true, KaxVideoPixelHeight::ClassInfos),
+	EbmlSemantic(false, true, KaxVideoPixelCropBottom::ClassInfos),
+	EbmlSemantic(false, true, KaxVideoPixelCropTop::ClassInfos),
+	EbmlSemantic(false, true, KaxVideoPixelCropLeft::ClassInfos),
+	EbmlSemantic(false, true, KaxVideoPixelCropRight::ClassInfos),
 	EbmlSemantic(false, true, KaxVideoDisplayWidth::ClassInfos),
 	EbmlSemantic(false, true, KaxVideoDisplayHeight::ClassInfos),
 	EbmlSemantic(false, true, KaxVideoColourSpace::ClassInfos),
@@ -63,6 +67,10 @@
 const EbmlSemanticContext KaxTrackVideo_Context = EbmlSemanticContext(countof(KaxTrackVideo_ContextList), KaxTrackVideo_ContextList, &KaxTrackEntry_Context, *GetKaxGlobal_Context, &KaxTrackVideo::ClassInfos);
 const EbmlSemanticContext KaxVideoPixelWidth_Context = EbmlSemanticContext(0, NULL, &KaxTrackVideo_Context, *GetKaxGlobal_Context, &KaxVideoPixelWidth::ClassInfos);
 const EbmlSemanticContext KaxVideoPixelHeight_Context = EbmlSemanticContext(0, NULL, &KaxTrackVideo_Context, *GetKaxGlobal_Context, &KaxVideoPixelHeight::ClassInfos);
+const EbmlSemanticContext KaxVideoPixelCropBottom_Context = EbmlSemanticContext(0, NULL, &KaxTrackVideo_Context, *GetKaxGlobal_Context, &KaxVideoPixelCropBottom::ClassInfos);
+const EbmlSemanticContext KaxVideoPixelCropTop_Context = EbmlSemanticContext(0, NULL, &KaxTrackVideo_Context, *GetKaxGlobal_Context, &KaxVideoPixelCropTop::ClassInfos);
+const EbmlSemanticContext KaxVideoPixelCropRight_Context = EbmlSemanticContext(0, NULL, &KaxTrackVideo_Context, *GetKaxGlobal_Context, &KaxVideoPixelCropLeft::ClassInfos);
+const EbmlSemanticContext KaxVideoPixelCropLeft_Context = EbmlSemanticContext(0, NULL, &KaxTrackVideo_Context, *GetKaxGlobal_Context, &KaxVideoPixelCropRight::ClassInfos);
 const EbmlSemanticContext KaxVideoDisplayWidth_Context = EbmlSemanticContext(0, NULL, &KaxTrackVideo_Context, *GetKaxGlobal_Context, &KaxVideoDisplayWidth::ClassInfos);
 const EbmlSemanticContext KaxVideoDisplayHeight_Context = EbmlSemanticContext(0, NULL, &KaxTrackVideo_Context, *GetKaxGlobal_Context, &KaxVideoDisplayHeight::ClassInfos);
 const EbmlSemanticContext KaxVideoColourSpace_Context = EbmlSemanticContext(0, NULL, &KaxTrackVideo_Context, *GetKaxGlobal_Context, &KaxVideoColourSpace::ClassInfos);
@@ -75,24 +83,32 @@
 const EbmlSemanticContext KaxVideoGamma_Context = EbmlSemanticContext(0, NULL, &KaxTrackVideo_Context, *GetKaxGlobal_Context, &KaxVideoGamma::ClassInfos);
 #endif // MATROSKA_VERSION
 
-EbmlId KaxTrackVideo_TheId         (0xE0, 1);
-EbmlId KaxVideoPixelWidth_TheId    (0xB0, 1);
-EbmlId KaxVideoPixelHeight_TheId   (0xBA, 1);
-EbmlId KaxVideoDisplayWidth_TheId  (0x54B0, 2);
-EbmlId KaxVideoDisplayHeight_TheId (0x54BA, 2);
-EbmlId KaxVideoColourSpace_TheId   (0x2EB524, 3);
-EbmlId KaxVideoFrameRate_TheId     (0x2383E3, 3);
+EbmlId KaxTrackVideo_TheId          (0xE0, 1);
+EbmlId KaxVideoPixelWidth_TheId     (0xB0, 1);
+EbmlId KaxVideoPixelHeight_TheId    (0xBA, 1);
+EbmlId KaxVideoPixelCropBottom_TheId(0x54AA, 2);
+EbmlId KaxVideoPixelCropTop_TheId   (0x54BB, 2);
+EbmlId KaxVideoPixelCropLeft_TheId  (0x54CC, 2);
+EbmlId KaxVideoPixelCropRight_TheId (0x54DD, 2);
+EbmlId KaxVideoDisplayWidth_TheId   (0x54B0, 2);
+EbmlId KaxVideoDisplayHeight_TheId  (0x54BA, 2);
+EbmlId KaxVideoColourSpace_TheId    (0x2EB524, 3);
+EbmlId KaxVideoFrameRate_TheId      (0x2383E3, 3);
 #if MATROSKA_VERSION >= 2
-EbmlId KaxVideoFlagInterlaced_TheId(0x9A, 1);
-EbmlId KaxVideoStereoMode_TheId    (0x53B9, 2);
-EbmlId KaxVideoDisplayUnit_TheId   (0x54B2, 2);
-EbmlId KaxVideoAspectRatio_TheId   (0x54B3, 1);
-EbmlId KaxVideoGamma_TheId         (0x2FB523, 3);
+EbmlId KaxVideoFlagInterlaced_TheId (0x9A, 1);
+EbmlId KaxVideoStereoMode_TheId     (0x53B9, 2);
+EbmlId KaxVideoDisplayUnit_TheId    (0x54B2, 2);
+EbmlId KaxVideoAspectRatio_TheId    (0x54B3, 1);
+EbmlId KaxVideoGamma_TheId          (0x2FB523, 3);
 #endif // MATROSKA_VERSION
 
 const EbmlCallbacks KaxTrackVideo::ClassInfos(KaxTrackVideo::Create, KaxTrackVideo_TheId, "TrackAudio", KaxTrackVideo_Context);
 const EbmlCallbacks KaxVideoPixelWidth::ClassInfos(KaxVideoPixelWidth::Create, KaxVideoPixelWidth_TheId, "VideoPixelWidth", KaxVideoPixelWidth_Context);
 const EbmlCallbacks KaxVideoPixelHeight::ClassInfos(KaxVideoPixelHeight::Create, KaxVideoPixelHeight_TheId, "VideoPixelHeight", KaxVideoPixelHeight_Context);
+const EbmlCallbacks KaxVideoPixelCropBottom::ClassInfos(KaxVideoPixelCropBottom::Create, KaxVideoPixelCropBottom_TheId, "VideoPixelCropBottom", KaxVideoPixelCropBottom_Context);
+const EbmlCallbacks KaxVideoPixelCropTop::ClassInfos(KaxVideoPixelCropTop::Create, KaxVideoPixelCropTop_TheId, "VideoPixelCropTop", KaxVideoPixelCropTop_Context);
+const EbmlCallbacks KaxVideoPixelCropLeft::ClassInfos(KaxVideoPixelCropLeft::Create, KaxVideoPixelCropLeft_TheId, "VideoPixelCropLeft", KaxVideoPixelCropLeft_Context);
+const EbmlCallbacks KaxVideoPixelCropRight::ClassInfos(KaxVideoPixelCropRight::Create, KaxVideoPixelCropRight_TheId, "VideoPixelCropRight", KaxVideoPixelCropRight_Context);
 const EbmlCallbacks KaxVideoDisplayWidth::ClassInfos(KaxVideoDisplayWidth::Create, KaxVideoDisplayWidth_TheId, "VideoDisplayWidth", KaxVideoDisplayWidth_Context);
 const EbmlCallbacks KaxVideoDisplayHeight::ClassInfos(KaxVideoDisplayHeight::Create, KaxVideoDisplayHeight_TheId, "VideoDisplayHeight", KaxVideoDisplayHeight_Context);
 const EbmlCallbacks KaxVideoColourSpace::ClassInfos(KaxVideoColourSpace::Create, KaxVideoColourSpace_TheId, "VideoColourSpace", KaxVideoColourSpace_Context);