From ea1db4d983f6690b0e7ff25ea50f77e64e50bf20 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Sun, 3 Sep 2023 11:30:51 +0200 Subject: [PATCH] KaxSemantic: Make TrackOverlay deprecated https://github.com/ietf-wg-cellar/matroska-specification/pull/742 --- matroska/KaxSemantic.h | 2 ++ src/KaxSemantic.cpp | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/matroska/KaxSemantic.h b/matroska/KaxSemantic.h index 0ce79320..966c5070 100644 --- a/matroska/KaxSemantic.h +++ b/matroska/KaxSemantic.h @@ -312,6 +312,8 @@ DECLARE_MKX_UINTEGER_DEF(KaxCodecDecodeAll) }; DECLARE_MKX_UINTEGER(KaxTrackOverlay) +public: + libebml::filepos_t RenderData(libebml::IOCallback & output, bool bForceRender, ShouldWrite writeFilter) override; }; DECLARE_MKX_UINTEGER_DEF(KaxCodecDelay) diff --git a/src/KaxSemantic.cpp b/src/KaxSemantic.cpp index a679f3fb..bd384f08 100644 --- a/src/KaxSemantic.cpp +++ b/src/KaxSemantic.cpp @@ -283,7 +283,7 @@ DEFINE_MKX_UNISTRING(KaxCodecSettings, 0x3A9697, 3, KaxTrackEntry, "CodecSetting DEFINE_MKX_STRING(KaxCodecInfoURL, 0x3B4040, 3, KaxTrackEntry, "CodecInfoURL", VERSION_DEPRECATED) DEFINE_MKX_STRING(KaxCodecDownloadURL, 0x26B240, 3, KaxTrackEntry, "CodecDownloadURL", VERSION_DEPRECATED) DEFINE_MKX_UINTEGER_DEF(KaxCodecDecodeAll, 0xAA, 1, KaxTrackEntry, "CodecDecodeAll", VERSION_DEPRECATED, 1) -DEFINE_MKX_UINTEGER(KaxTrackOverlay, 0x6FAB, 2, KaxTrackEntry, "TrackOverlay", MatroskaProfile(false, false, 0)) +DEFINE_MKX_UINTEGER(KaxTrackOverlay, 0x6FAB, 2, KaxTrackEntry, "TrackOverlay", VERSION_DEPRECATED) DEFINE_MKX_UINTEGER_DEF(KaxCodecDelay, 0x56AA, 2, KaxTrackEntry, "CodecDelay", MatroskaProfile(true, false, 4), 0) DEFINE_MKX_UINTEGER_DEF(KaxSeekPreRoll, 0x56BB, 2, KaxTrackEntry, "SeekPreRoll", MatroskaProfile(true, false, 4), 0) @@ -857,6 +857,11 @@ libebml::filepos_t KaxCodecDecodeAll::RenderData(libebml::IOCallback & /* output return 0; } +libebml::filepos_t KaxTrackOverlay::RenderData(libebml::IOCallback & /* output */, bool /* bForceRender */, ShouldWrite /* writeFilter */) { + assert(false); // no you are not allowed to use this element ! + return 0; +} + libebml::filepos_t KaxOldStereoMode::RenderData(libebml::IOCallback & /* output */, bool /* bForceRender */, ShouldWrite /* writeFilter */) { assert(false); // no you are not allowed to use this element ! return 0;