From: Moritz Bunkus Date: Tue, 19 Mar 2013 11:07:42 +0000 (+0100) Subject: Add new element 'DefaultDecodedFieldDuration' X-Git-Tag: release-1.4.0~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=734b6a180346eb7206a6fb90b50964867ca60231;p=libmatroska Add new element 'DefaultDecodedFieldDuration' See http://lists.matroska.org/pipermail/matroska-devel/2012-December/004371.html --- diff --git a/matroska/KaxSemantic.h b/matroska/KaxSemantic.h index 070dfff..5914de7 100644 --- a/matroska/KaxSemantic.h +++ b/matroska/KaxSemantic.h @@ -243,6 +243,11 @@ DECLARE_MKX_UINTEGER(KaxTrackMaxCache) DECLARE_MKX_UINTEGER(KaxTrackDefaultDuration) }; +#if MATROSKA_VERSION >= 2 +DECLARE_MKX_UINTEGER(KaxTrackDefaultDecodedFieldDuration) +}; +#endif + DECLARE_MKX_FLOAT(KaxTrackTimecodeScale) public: filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); diff --git a/src/KaxSemantic.cpp b/src/KaxSemantic.cpp index 948070d..4b9563b 100644 --- a/src/KaxSemantic.cpp +++ b/src/KaxSemantic.cpp @@ -242,6 +242,9 @@ DEFINE_SEMANTIC_ITEM(true, true, KaxTrackFlagLacing) DEFINE_SEMANTIC_ITEM(true, true, KaxTrackMinCache) DEFINE_SEMANTIC_ITEM(false, true, KaxTrackMaxCache) DEFINE_SEMANTIC_ITEM(false, true, KaxTrackDefaultDuration) +#if MATROSKA_VERSION >= 2 +DEFINE_SEMANTIC_ITEM(false, true, KaxTrackDefaultDecodedFieldDuration) +#endif // MATROSKA_VERSION DEFINE_SEMANTIC_ITEM(true, true, KaxTrackTimecodeScale) #if MATROSKA_VERSION >= 2 DEFINE_SEMANTIC_ITEM(false, true, KaxTrackOffset) // not supported @@ -287,6 +290,9 @@ DEFINE_MKX_UINTEGER_DEF(KaxTrackFlagLacing, 0x9C, 1, KaxTrackEntry, "TrackFlagLa DEFINE_MKX_UINTEGER_DEF(KaxTrackMinCache, 0x6DE7, 2, KaxTrackEntry, "TrackMinCache", 0); DEFINE_MKX_UINTEGER(KaxTrackMaxCache, 0x6DF8, 2, KaxTrackEntry, "TrackMaxCache"); DEFINE_MKX_UINTEGER(KaxTrackDefaultDuration, 0x23E383, 3, KaxTrackEntry, "TrackDefaultDuration"); +#if MATROSKA_VERSION >= 2 +DEFINE_MKX_UINTEGER(KaxTrackDefaultDecodedFieldDuration, 0x234E7A, 3, KaxTrackEntry, "TrackDefaultDecodedFieldDuration"); +#endif DEFINE_MKX_FLOAT_DEF(KaxTrackTimecodeScale, 0x23314F, 3, KaxTrackEntry, "TrackTimecodeScale", 1); #if MATROSKA_VERSION >= 2 DEFINE_MKX_SINTEGER_DEF(KaxTrackOffset, 0x537F, 2, KaxTrackEntry, "TrackOffset", 0);