From: Steve Lhomme Date: Sun, 22 Jan 2017 16:32:44 +0000 (+0100) Subject: generate semantics using the new spectools, using the XML Schema for Matroska X-Git-Tag: release-1.4.6~5 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc2c5b649896b65a393f62fba301a2b01288020e;p=libmatroska generate semantics using the new spectools, using the XML Schema for Matroska aka ebml_specification.xml The display name for projection items has changed. --- diff --git a/matroska/KaxSemantic.h b/matroska/KaxSemantic.h index 344b74f..a781376 100644 --- a/matroska/KaxSemantic.h +++ b/matroska/KaxSemantic.h @@ -1,9 +1,10 @@ /********************************************************************** ** DO NOT EDIT, GENERATED WITH DATA2LIB +** https://github.com/Matroska-Org/foundation-source/tree/master/spectool ** ** libmatroska : parse Matroska files, see http://www.matroska.org/ ** -** Copyright (c) 2002-2010, Matroska (non-profit organisation) +** Copyright (c) 2002-2017, Matroska (non-profit organisation) ** All rights reserved. ** ** This file is part of libmatroska. @@ -208,6 +209,7 @@ DECLARE_MKX_BINARY (KaxEncryptedBlock) public: filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); }; + #endif DECLARE_MKX_MASTER(KaxTracks) @@ -473,6 +475,26 @@ DECLARE_MKX_FLOAT(KaxVideoLuminanceMax) DECLARE_MKX_FLOAT(KaxVideoLuminanceMin) }; + +DECLARE_MKX_MASTER(KaxVideoProjection) +}; + + +DECLARE_MKX_UINTEGER(KaxVideoProjectionType) +}; + +DECLARE_MKX_BINARY (KaxVideoProjectionPrivate) +}; + +DECLARE_MKX_FLOAT(KaxVideoProjectionPoseYaw) +}; + +DECLARE_MKX_FLOAT(KaxVideoProjectionPosePitch) +}; + +DECLARE_MKX_FLOAT(KaxVideoProjectionPoseRoll) +}; + #endif DECLARE_MKX_MASTER(KaxTrackAudio) @@ -634,6 +656,7 @@ DECLARE_MKX_UINTEGER(KaxCueRefCodecState) public: filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); }; + #endif DECLARE_MKX_MASTER(KaxAttachments) @@ -670,6 +693,7 @@ DECLARE_MKX_UINTEGER(KaxFileUsedStartTime) DECLARE_MKX_UINTEGER(KaxFileUsedEndTime) }; + #endif DECLARE_MKX_MASTER(KaxChapters) @@ -816,25 +840,6 @@ DECLARE_MKX_UNISTRING(KaxTagString) DECLARE_MKX_BINARY (KaxTagBinary) }; - -DECLARE_MKX_MASTER(KaxVideoProjection) -}; - -DECLARE_MKX_UINTEGER(KaxVideoProjectionType) -}; - -DECLARE_MKX_BINARY(KaxVideoProjectionPrivate) -}; - -DECLARE_MKX_FLOAT(KaxVideoProjectionPoseYaw) -}; - -DECLARE_MKX_FLOAT(KaxVideoProjectionPosePitch) -}; - -DECLARE_MKX_FLOAT(KaxVideoProjectionPoseRoll) -}; - END_LIBMATROSKA_NAMESPACE #endif // LIBMATROSKA_SEMANTIC_H diff --git a/src/KaxSemantic.cpp b/src/KaxSemantic.cpp index 4c9d94a..f2a3958 100644 --- a/src/KaxSemantic.cpp +++ b/src/KaxSemantic.cpp @@ -1,9 +1,10 @@ /********************************************************************** ** DO NOT EDIT, GENERATED WITH DATA2LIB +** https://github.com/Matroska-Org/foundation-source/tree/master/spectool ** ** libmatroska : parse Matroska files, see http://www.matroska.org/ ** -** Copyright (c) 2002-2010, Matroska (non-profit organisation) +** Copyright (c) 2002-2017, Matroska (non-profit organisation) ** All rights reserved. ** ** This file is part of libmatroska. @@ -356,7 +357,6 @@ DEFINE_SEMANTIC_ITEM(false, true, KaxVideoColourSpace) DEFINE_SEMANTIC_ITEM(false, true, KaxVideoGamma) // not supported DEFINE_SEMANTIC_ITEM(false, true, KaxVideoFrameRate) // not supported DEFINE_SEMANTIC_ITEM(false, true, KaxVideoColour) - DEFINE_SEMANTIC_ITEM(false, true, KaxVideoProjection) #endif // MATROSKA_VERSION DEFINE_END_SEMANTIC(KaxTrackVideo) @@ -449,12 +449,12 @@ DEFINE_SEMANTIC_ITEM(true, true, KaxVideoProjectionPosePitch) DEFINE_SEMANTIC_ITEM(true, true, KaxVideoProjectionPoseRoll) DEFINE_END_SEMANTIC(KaxVideoProjection) -DEFINE_MKX_MASTER(KaxVideoProjection, 0x7670, 2, KaxTrackVideo, "Projection"); -DEFINE_MKX_UINTEGER_DEF(KaxVideoProjectionType, 0x7671, 2, KaxVideoProjection, "ProjectionType", 0); -DEFINE_MKX_BINARY(KaxVideoProjectionPrivate, 0x7672, 2, KaxVideoProjection, "ProjectionPrivate"); -DEFINE_MKX_FLOAT_DEF(KaxVideoProjectionPoseYaw, 0x7673, 2, KaxVideoProjection, "ProjectionPoseYaw", 0); -DEFINE_MKX_FLOAT_DEF(KaxVideoProjectionPosePitch, 0x7674, 2, KaxVideoProjection, "ProjectionPosePitch", 0); -DEFINE_MKX_FLOAT_DEF(KaxVideoProjectionPoseRoll, 0x7675, 2, KaxVideoProjection, "ProjectionPoseRoll", 0); +DEFINE_MKX_MASTER(KaxVideoProjection, 0x7670, 2, KaxTrackVideo, "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); +DEFINE_MKX_FLOAT_DEF(KaxVideoProjectionPosePitch, 0x7674, 2, KaxVideoProjection, "VideoProjectionPosePitch", 0); +DEFINE_MKX_FLOAT_DEF(KaxVideoProjectionPoseRoll, 0x7675, 2, KaxVideoProjection, "VideoProjectionPoseRoll", 0); #endif DEFINE_START_SEMANTIC(KaxTrackAudio)