Packman Build Service PMBS

makemkv.changes Changed

makemkv.spec Changed

makemkv-bin-1.10.7.tar.xz/bin/amd64/makemkvcon -> makemkv-bin-1.10.8.tar.xz/bin/amd64/makemkvcon Changed

makemkv-bin-1.10.7.tar.xz/bin/i386/makemkvcon -> makemkv-bin-1.10.8.tar.xz/bin/i386/makemkvcon Changed

makemkv-bin-1.10.7.tar.xz/bin/i386/mmdtsdec -> makemkv-bin-1.10.8.tar.xz/bin/i386/mmdtsdec Changed

makemkv-bin-1.10.7.tar.xz/src/share/blues.jar -> makemkv-bin-1.10.8.tar.xz/src/share/blues.jar Changed

makemkv-oss-1.10.7.tar.xz/libabi/inc/lgpl/osslabi.h -> makemkv-oss-1.10.8.tar.xz/libabi/inc/lgpl/osslabi.h Changed

makemkv-oss-1.10.7.tar.xz/libabi/src/ossl_sha.c -> makemkv-oss-1.10.8.tar.xz/libabi/src/ossl_sha.c Changed

makemkv-oss-1.10.7.tar.xz/libdriveio/src/stdquery.cpp -> makemkv-oss-1.10.8.tar.xz/libdriveio/src/stdquery.cpp Changed

makemkv-oss-1.10.7.tar.xz/libebml/inc/ebml/EbmlConfig.h -> makemkv-oss-1.10.8.tar.xz/libebml/inc/ebml/EbmlConfig.h Changed

makemkv-oss-1.10.7.tar.xz/libebml/inc/ebml/EbmlMaster.h -> makemkv-oss-1.10.8.tar.xz/libebml/inc/ebml/EbmlMaster.h Changed

makemkv-oss-1.10.7.tar.xz/libebml/inc/ebml/EbmlVersion.h -> makemkv-oss-1.10.8.tar.xz/libebml/inc/ebml/EbmlVersion.h Changed

makemkv-oss-1.10.7.tar.xz/libebml/inc/ebml/MemReadIOCallback.h -> makemkv-oss-1.10.8.tar.xz/libebml/inc/ebml/MemReadIOCallback.h Changed

makemkv-oss-1.10.7.tar.xz/libebml/inc/ebml/SafeReadIOCallback.h -> makemkv-oss-1.10.8.tar.xz/libebml/inc/ebml/SafeReadIOCallback.h Changed

makemkv-oss-1.10.7.tar.xz/libebml/inc/ebml/c/libebml_t.h -> makemkv-oss-1.10.8.tar.xz/libebml/inc/ebml/c/libebml_t.h Changed

makemkv-oss-1.10.7.tar.xz/libebml/src/Debug.cpp -> makemkv-oss-1.10.8.tar.xz/libebml/src/Debug.cpp Changed

makemkv-oss-1.10.7.tar.xz/libebml/src/EbmlElement.cpp -> makemkv-oss-1.10.8.tar.xz/libebml/src/EbmlElement.cpp Changed

@@ -32,6 +32,7 @@
   \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 
+#include <cstdlib>
 #include <cstring>
 #include <lgpl/cassert>
 
@@ -221,8 +222,10 @@
   assert(i<Size);
   if (i<Size)
     return MyTable[i];
-  else
-    return *(EbmlSemantic*)NULL;
+
+  buf::string ss;
+  ss.format(128, "EbmlSemanticContext::GetSemantic: programming error: index i outside of table size (%u >= %u)", (unsigned int)i, (unsigned int)Size);
+  throw mkv_logic_error(ss);
 }
 
 
@@ -268,12 +271,12 @@
   int PossibleID_Length = 0;
   binary PossibleSize[8]; // we don't support size stored in more than 64 bits
   uint32 PossibleSizeLength = 0;
-  uint64 SizeUnknown;
-  uint64 SizeFound;
+  uint64 SizeUnknown = 0;
+  uint64 SizeFound = 0;
   bool bElementFound = false;
 
   binary BitMask;
-  uint64 aElementPosition, aSizePosition;
+  uint64 aElementPosition = 0, aSizePosition = 0;
   while (!bElementFound) {
     // read ID
     aElementPosition = DataStream.getFilePointer();
@@ -406,6 +409,10 @@
 
     } while (!bFound && MaxDataSize > ReadSize);
 
+    if (!bFound)
+      // we reached the maximum we could read without a proper ID
+      return NULL;
+
     SizeIdx = ReadIndex;
     ReadIndex -= PossibleID_Length;

makemkv-oss-1.10.7.tar.xz/libebml/src/EbmlMaster.cpp -> makemkv-oss-1.10.8.tar.xz/libebml/src/EbmlMaster.cpp Changed

makemkv-oss-1.10.7.tar.xz/libebml/src/EbmlVersion.cpp -> makemkv-oss-1.10.8.tar.xz/libebml/src/EbmlVersion.cpp Changed

makemkv-oss-1.10.7.tar.xz/libebml/src/StdIOCallback.cpp -> makemkv-oss-1.10.8.tar.xz/libebml/src/StdIOCallback.cpp Changed

makemkv-oss-1.10.7.tar.xz/libmakemkv/inc/lgpl/cassert -> makemkv-oss-1.10.8.tar.xz/libmakemkv/inc/lgpl/cassert Changed

@@ -22,13 +22,17 @@
 #define CASSERT_LGPL_H_INCLUDED
 
 #include <lgpl/stl.h>
+#include <lgpl/stdstring.h>
 
-class mkv_error_exception : public std::exception
+class mkv_error_exception_unbuffered : public std::exception
 {
     const char* m_message;
 public:
-  mkv_error_exception(const char* Message)
-    : m_message(Message)
+    mkv_error_exception_unbuffered(const char* Message) throw()
+        : m_message(Message)
+    {
+    }
+    ~mkv_error_exception_unbuffered() throw()
     {
     }
     const char* what() const throw()
@@ -37,6 +41,31 @@
     }
 };
 
+class mkv_error_exception_buffered : public std::exception
+{
+    buf::string m_message;
+public:
+    mkv_error_exception_buffered(const char* Message) throw()
+        : m_message(Message)
+    {
+    }
+    mkv_error_exception_buffered(const StringPointer& Message) throw()
+        : m_message(Message)
+    {
+    }
+    ~mkv_error_exception_buffered() throw()
+    {
+    }
+    const char* what() const throw()
+    {
+        return m_message.c_str();
+    }
+};
+
+typedef mkv_error_exception_buffered mkv_logic_error;
+
+#define mkv_error_exception(x) mkv_error_exception_unbuffered(x "\0")
+
 int MkvAssertHelper(const char* Message);
 
 #define MKV_ASSERT(_Expression_) \

makemkv-oss-1.10.7.tar.xz/libmakemkv/inc/lgpl/stdstring.h -> makemkv-oss-1.10.8.tar.xz/libmakemkv/inc/lgpl/stdstring.h Changed

makemkv-oss-1.10.7.tar.xz/libmakemkv/src/libmkv.cpp -> makemkv-oss-1.10.8.tar.xz/libmakemkv/src/libmkv.cpp Changed

makemkv-oss-1.10.7.tar.xz/libmakemkv/src/stdstring.cpp -> makemkv-oss-1.10.8.tar.xz/libmakemkv/src/stdstring.cpp Changed

makemkv-oss-1.10.7.tar.xz/libmatroska/inc/matroska/KaxCluster.h -> makemkv-oss-1.10.8.tar.xz/libmatroska/inc/matroska/KaxCluster.h Changed

@@ -53,19 +53,19 @@
     /*!
       \brief Addition of a frame without references
 
-      \param the timecode is expressed in nanoseconds, relative to the beggining of the Segment
+      \param timecode the timecode is expressed in nanoseconds, relative to the beggining of the Segment
     */
     bool AddFrame(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, KaxBlockGroup * & MyNewBlock, LacingType lacing = LACING_AUTO);
     /*!
       \brief Addition of a frame with a backward reference (P frame)
-      \param the timecode is expressed in nanoseconds, relative to the beggining of the Segment
+      \param timecode the timecode is expressed in nanoseconds, relative to the beggining of the Segment
 
     */
     bool AddFrame(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, KaxBlockGroup * & MyNewBlock, const KaxBlockGroup & PastBlock, LacingType lacing = LACING_AUTO);
 
     /*!
       \brief Addition of a frame with a backward+forward reference (B frame)
-      \param the timecode is expressed in nanoseconds, relative to the beggining of the Segment
+      \param timecode the timecode is expressed in nanoseconds, relative to the beggining of the Segment
 
     */
     bool AddFrame(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, KaxBlockGroup * & MyNewBlock, const KaxBlockGroup & PastBlock, const KaxBlockGroup & ForwBlock, LacingType lacing = LACING_AUTO);

makemkv-oss-1.10.7.tar.xz/libmatroska/inc/matroska/KaxSemantic.h -> makemkv-oss-1.10.8.tar.xz/libmatroska/inc/matroska/KaxSemantic.h Changed

@@ -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 @@
 public:
   filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
+
 #endif
 
 DECLARE_MKX_MASTER(KaxTracks)
@@ -272,6 +274,11 @@
 DECLARE_MKX_STRING(KaxTrackLanguage)
 };
 
+#if MATROSKA_VERSION >= 2
+DECLARE_MKX_STRING(KaxLanguageIETF)
+};
+#endif
+
 DECLARE_MKX_STRING(KaxCodecID)
 };
 
@@ -336,6 +343,9 @@
 DECLARE_MKX_UINTEGER(KaxVideoFlagInterlaced)
 };
 
+DECLARE_MKX_UINTEGER(KaxVideoFieldOrder)
+};
+
 DECLARE_MKX_UINTEGER(KaxVideoStereoMode)
 };
 
@@ -393,6 +403,103 @@
 public:
   filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
+
+DECLARE_MKX_MASTER(KaxVideoColour)
+};
+
+
+DECLARE_MKX_UINTEGER(KaxVideoColourMatrix)
+};
+
+DECLARE_MKX_UINTEGER(KaxVideoBitsPerChannel)
+};
+
+DECLARE_MKX_UINTEGER(KaxVideoChromaSubsampHorz)
+};
+
+DECLARE_MKX_UINTEGER(KaxVideoChromaSubsampVert)
+};
+
+DECLARE_MKX_UINTEGER(KaxVideoCbSubsampHorz)
+};
+
+DECLARE_MKX_UINTEGER(KaxVideoCbSubsampVert)
+};
+
+DECLARE_MKX_UINTEGER(KaxVideoChromaSitHorz)
+};
+
+DECLARE_MKX_UINTEGER(KaxVideoChromaSitVert)
+};
+
+DECLARE_MKX_UINTEGER(KaxVideoColourRange)
+};
+
+DECLARE_MKX_UINTEGER(KaxVideoColourTransferCharacter)
+};
+
+DECLARE_MKX_UINTEGER(KaxVideoColourPrimaries)
+};
+
+DECLARE_MKX_UINTEGER(KaxVideoColourMaxCLL)
+};
+
+DECLARE_MKX_UINTEGER(KaxVideoColourMaxFALL)
+};
+
+DECLARE_MKX_MASTER(KaxVideoColourMasterMeta)
+};
+
+
+DECLARE_MKX_FLOAT(KaxVideoRChromaX)
+};
+
+DECLARE_MKX_FLOAT(KaxVideoRChromaY)
+};
+
+DECLARE_MKX_FLOAT(KaxVideoGChromaX)
+};
+
+DECLARE_MKX_FLOAT(KaxVideoGChromaY)
+};
+
+DECLARE_MKX_FLOAT(KaxVideoBChromaX)
+};
+
+DECLARE_MKX_FLOAT(KaxVideoBChromaY)
+};
+
+DECLARE_MKX_FLOAT(KaxVideoWhitePointChromaX)
+};
+
+DECLARE_MKX_FLOAT(KaxVideoWhitePointChromaY)
+};
+
+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)
@@ -554,6 +661,7 @@
 public:
   filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
+
 #endif
 
 DECLARE_MKX_MASTER(KaxAttachments)
@@ -590,6 +698,7 @@
 
 DECLARE_MKX_UINTEGER(KaxFileUsedEndTime)
 };
+
 #endif
 
 DECLARE_MKX_MASTER(KaxChapters)
@@ -664,6 +773,11 @@
 DECLARE_MKX_STRING(KaxChapterLanguage)
 };
 
+#if MATROSKA_VERSION >= 2
+DECLARE_MKX_STRING(KaxChapLanguageIETF)
+};
+#endif
+
 DECLARE_MKX_STRING(KaxChapterCountry)
 };
 
@@ -727,6 +841,11 @@
 DECLARE_MKX_STRING(KaxTagLangue)
 };
 
+#if MATROSKA_VERSION >= 2
+DECLARE_MKX_STRING(KaxTagLanguageIETF)
+};
+#endif
+
 DECLARE_MKX_UINTEGER(KaxTagDefault)
 };

makemkv-oss-1.10.7.tar.xz/libmatroska/inc/matroska/KaxVersion.h -> makemkv-oss-1.10.8.tar.xz/libmatroska/inc/matroska/KaxVersion.h Changed

makemkv-oss-1.10.7.tar.xz/libmatroska/src/KaxSemantic.cpp -> makemkv-oss-1.10.8.tar.xz/libmatroska/src/KaxSemantic.cpp Changed

@@ -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.
@@ -254,6 +255,9 @@
 DEFINE_SEMANTIC_ITEM(true, true, KaxMaxBlockAdditionID)
 DEFINE_SEMANTIC_ITEM(false, true, KaxTrackName)
 DEFINE_SEMANTIC_ITEM(false, true, KaxTrackLanguage)
+#if MATROSKA_VERSION >= 2
+DEFINE_SEMANTIC_ITEM(false, true, KaxLanguageIETF)
+#endif // MATROSKA_VERSION
 DEFINE_SEMANTIC_ITEM(true, true, KaxCodecID)
 DEFINE_SEMANTIC_ITEM(false, true, KaxCodecPrivate)
 DEFINE_SEMANTIC_ITEM(false, true, KaxCodecName)
@@ -306,6 +310,9 @@
 DEFINE_MKX_UINTEGER_DEF(KaxMaxBlockAdditionID, 0x55EE, 2, KaxTrackEntry, "MaxBlockAdditionID", 0);
 DEFINE_MKX_UNISTRING(KaxTrackName, 0x536E, 2, KaxTrackEntry, "TrackName");
 DEFINE_MKX_STRING_DEF(KaxTrackLanguage, 0x22B59C, 3, KaxTrackEntry, "TrackLanguage", "eng");
+#if MATROSKA_VERSION >= 2
+DEFINE_MKX_STRING(KaxLanguageIETF, 0x22B59D, 3, KaxTrackEntry, "LanguageIETF");
+#endif
 DEFINE_MKX_STRING(KaxCodecID, 0x86, 1, KaxTrackEntry, "CodecID");
 DEFINE_MKX_BINARY (KaxCodecPrivate, 0x63A2, 2, KaxTrackEntry, "CodecPrivate");
 DEFINE_MKX_UNISTRING(KaxCodecName, 0x258688, 3, KaxTrackEntry, "CodecName");
@@ -336,6 +343,7 @@
 DEFINE_START_SEMANTIC(KaxTrackVideo)
 #if MATROSKA_VERSION >= 2
 DEFINE_SEMANTIC_ITEM(true, true, KaxVideoFlagInterlaced)
+DEFINE_SEMANTIC_ITEM(true, true, KaxVideoFieldOrder)
 DEFINE_SEMANTIC_ITEM(false, true, KaxVideoStereoMode)
 DEFINE_SEMANTIC_ITEM(false, true, KaxVideoAlphaMode)
 DEFINE_SEMANTIC_ITEM(false, true, KaxOldStereoMode) // not supported
@@ -354,12 +362,15 @@
 #if MATROSKA_VERSION >= 2
 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)
 
 DEFINE_MKX_MASTER(KaxTrackVideo, 0xE0, 1, KaxTrackEntry, "TrackVideo");
 #if MATROSKA_VERSION >= 2
 DEFINE_MKX_UINTEGER_DEF(KaxVideoFlagInterlaced, 0x9A, 1, KaxTrackVideo, "VideoFlagInterlaced", 0);
+DEFINE_MKX_UINTEGER_DEF(KaxVideoFieldOrder, 0x9D, 1, KaxTrackVideo, "VideoFieldOrder", 2);
 DEFINE_MKX_UINTEGER_DEF(KaxVideoStereoMode, 0x53B8, 2, KaxTrackVideo, "VideoStereoMode", 0);
 DEFINE_MKX_UINTEGER_DEF(KaxVideoAlphaMode, 0x53C0, 2, KaxTrackVideo, "VideoAlphaMode", 0);
 DEFINE_MKX_UINTEGER(KaxOldStereoMode, 0x53B9, 2, KaxTrackVideo, "OldStereoMode");
@@ -378,6 +389,78 @@
 #if MATROSKA_VERSION >= 2
 DEFINE_MKX_FLOAT(KaxVideoGamma, 0x2FB523, 3, KaxTrackVideo, "VideoGamma");
 DEFINE_MKX_FLOAT(KaxVideoFrameRate, 0x2383E3, 3, KaxTrackVideo, "VideoFrameRate");
+
+DEFINE_START_SEMANTIC(KaxVideoColour)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoColourMatrix)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoBitsPerChannel)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoChromaSubsampHorz)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoChromaSubsampVert)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoCbSubsampHorz)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoCbSubsampVert)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoChromaSitHorz)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoChromaSitVert)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoColourRange)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoColourTransferCharacter)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoColourPrimaries)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoColourMaxCLL)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoColourMaxFALL)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoColourMasterMeta)
+DEFINE_END_SEMANTIC(KaxVideoColour)
+
+DEFINE_MKX_MASTER(KaxVideoColour, 0x55B0, 2, KaxTrackVideo, "VideoColour");
+DEFINE_MKX_UINTEGER_DEF(KaxVideoColourMatrix, 0x55B1, 2, KaxVideoColour, "VideoColourMatrix", 2);
+DEFINE_MKX_UINTEGER_DEF(KaxVideoBitsPerChannel, 0x55B2, 2, KaxVideoColour, "VideoBitsPerChannel", 0);
+DEFINE_MKX_UINTEGER(KaxVideoChromaSubsampHorz, 0x55B3, 2, KaxVideoColour, "VideoChromaSubsampHorz");
+DEFINE_MKX_UINTEGER(KaxVideoChromaSubsampVert, 0x55B4, 2, KaxVideoColour, "VideoChromaSubsampVert");
+DEFINE_MKX_UINTEGER(KaxVideoCbSubsampHorz, 0x55B5, 2, KaxVideoColour, "VideoCbSubsampHorz");
+DEFINE_MKX_UINTEGER(KaxVideoCbSubsampVert, 0x55B6, 2, KaxVideoColour, "VideoCbSubsampVert");
+DEFINE_MKX_UINTEGER_DEF(KaxVideoChromaSitHorz, 0x55B7, 2, KaxVideoColour, "VideoChromaSitHorz", 0);
+DEFINE_MKX_UINTEGER_DEF(KaxVideoChromaSitVert, 0x55B8, 2, KaxVideoColour, "VideoChromaSitVert", 0);
+DEFINE_MKX_UINTEGER_DEF(KaxVideoColourRange, 0x55B9, 2, KaxVideoColour, "VideoColourRange", 0);
+DEFINE_MKX_UINTEGER_DEF(KaxVideoColourTransferCharacter, 0x55BA, 2, KaxVideoColour, "VideoColourTransferCharacter", 2);
+DEFINE_MKX_UINTEGER_DEF(KaxVideoColourPrimaries, 0x55BB, 2, KaxVideoColour, "VideoColourPrimaries", 2);
+DEFINE_MKX_UINTEGER(KaxVideoColourMaxCLL, 0x55BC, 2, KaxVideoColour, "VideoColourMaxCLL");
+DEFINE_MKX_UINTEGER(KaxVideoColourMaxFALL, 0x55BD, 2, KaxVideoColour, "VideoColourMaxFALL");
+
+DEFINE_START_SEMANTIC(KaxVideoColourMasterMeta)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoRChromaX)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoRChromaY)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoGChromaX)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoGChromaY)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoBChromaX)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoBChromaY)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoWhitePointChromaX)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoWhitePointChromaY)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoLuminanceMax)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoLuminanceMin)
+DEFINE_END_SEMANTIC(KaxVideoColourMasterMeta)
+
+DEFINE_MKX_MASTER(KaxVideoColourMasterMeta, 0x55D0, 2, KaxVideoColour, "VideoColourMasterMeta");
+DEFINE_MKX_FLOAT(KaxVideoRChromaX, 0x55D1, 2, KaxVideoColourMasterMeta, "VideoRChromaX");
+DEFINE_MKX_FLOAT(KaxVideoRChromaY, 0x55D2, 2, KaxVideoColourMasterMeta, "VideoRChromaY");
+DEFINE_MKX_FLOAT(KaxVideoGChromaX, 0x55D3, 2, KaxVideoColourMasterMeta, "VideoGChromaX");
+DEFINE_MKX_FLOAT(KaxVideoGChromaY, 0x55D4, 2, KaxVideoColourMasterMeta, "VideoGChromaY");
+DEFINE_MKX_FLOAT(KaxVideoBChromaX, 0x55D5, 2, KaxVideoColourMasterMeta, "VideoBChromaX");
+DEFINE_MKX_FLOAT(KaxVideoBChromaY, 0x55D6, 2, KaxVideoColourMasterMeta, "VideoBChromaY");
+DEFINE_MKX_FLOAT(KaxVideoWhitePointChromaX, 0x55D7, 2, KaxVideoColourMasterMeta, "VideoWhitePointChromaX");
+DEFINE_MKX_FLOAT(KaxVideoWhitePointChromaY, 0x55D8, 2, KaxVideoColourMasterMeta, "VideoWhitePointChromaY");
+DEFINE_MKX_FLOAT(KaxVideoLuminanceMax, 0x55D9, 2, KaxVideoColourMasterMeta, "VideoLuminanceMax");
+DEFINE_MKX_FLOAT(KaxVideoLuminanceMin, 0x55DA, 2, KaxVideoColourMasterMeta, "VideoLuminanceMin");
+
+DEFINE_START_SEMANTIC(KaxVideoProjection)
+DEFINE_SEMANTIC_ITEM(true, true, KaxVideoProjectionType)
+DEFINE_SEMANTIC_ITEM(false, true, KaxVideoProjectionPrivate)
+DEFINE_SEMANTIC_ITEM(true, true, KaxVideoProjectionPoseYaw)
+DEFINE_SEMANTIC_ITEM(true, true, KaxVideoProjectionPosePitch)
+DEFINE_SEMANTIC_ITEM(true, true, KaxVideoProjectionPoseRoll)
+DEFINE_END_SEMANTIC(KaxVideoProjection)
+
+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)
@@ -625,12 +708,18 @@
 DEFINE_START_SEMANTIC(KaxChapterDisplay)
 DEFINE_SEMANTIC_ITEM(true, true, KaxChapterString)
 DEFINE_SEMANTIC_ITEM(true, false, KaxChapterLanguage)
+#if MATROSKA_VERSION >= 2
+DEFINE_SEMANTIC_ITEM(false, true, KaxChapLanguageIETF)
+#endif // MATROSKA_VERSION
 DEFINE_SEMANTIC_ITEM(false, false, KaxChapterCountry)
 DEFINE_END_SEMANTIC(KaxChapterDisplay)
 
 DEFINE_MKX_MASTER(KaxChapterDisplay, 0x80, 1, KaxChapterAtom, "ChapterDisplay");
 DEFINE_MKX_UNISTRING(KaxChapterString, 0x85, 1, KaxChapterDisplay, "ChapterString");
 DEFINE_MKX_STRING_DEF(KaxChapterLanguage, 0x437C, 2, KaxChapterDisplay, "ChapterLanguage", "eng");
+#if MATROSKA_VERSION >= 2
+DEFINE_MKX_STRING(KaxChapLanguageIETF, 0x437D, 2, KaxChapterDisplay, "ChapLanguageIETF");
+#endif
 DEFINE_MKX_STRING(KaxChapterCountry, 0x437E, 2, KaxChapterDisplay, "ChapterCountry");
 
 DEFINE_START_SEMANTIC(KaxChapterProcess)
@@ -686,6 +775,9 @@
 DEFINE_SEMANTIC_ITEM(false, false, KaxTagSimple) // recursive
 DEFINE_SEMANTIC_ITEM(true, true, KaxTagName)
 DEFINE_SEMANTIC_ITEM(true, true, KaxTagLangue)
+#if MATROSKA_VERSION >= 2
+DEFINE_SEMANTIC_ITEM(false, true, KaxTagLanguageIETF)
+#endif // MATROSKA_VERSION
 DEFINE_SEMANTIC_ITEM(true, true, KaxTagDefault)
 DEFINE_SEMANTIC_ITEM(false, true, KaxTagString)
 DEFINE_SEMANTIC_ITEM(false, true, KaxTagBinary)
@@ -694,6 +786,9 @@
 DEFINE_MKX_MASTER(KaxTagSimple, 0x67C8, 2, KaxTag, "TagSimple");
 DEFINE_MKX_UNISTRING(KaxTagName, 0x45A3, 2, KaxTagSimple, "TagName");
 DEFINE_MKX_STRING_DEF(KaxTagLangue, 0x447A, 2, KaxTagSimple, "TagLanguage", "und");
+#if MATROSKA_VERSION >= 2
+DEFINE_MKX_STRING(KaxTagLanguageIETF, 0x447B, 2, KaxTagSimple, "TagLanguageIETF");
+#endif
 DEFINE_MKX_UINTEGER_DEF(KaxTagDefault, 0x4484, 2, KaxTagSimple, "TagDefault", 1);
 DEFINE_MKX_UNISTRING(KaxTagString, 0x4487, 2, KaxTagSimple, "TagString");
 DEFINE_MKX_BINARY (KaxTagBinary, 0x4485, 2, KaxTagSimple, "TagBinary");

makemkv-oss-1.10.7.tar.xz/libmatroska/src/KaxVersion.cpp -> makemkv-oss-1.10.8.tar.xz/libmatroska/src/KaxVersion.cpp Changed

makemkv-oss-1.10.7.tar.xz/makemkvgui/inc/ver_num.h -> makemkv-oss-1.10.8.tar.xz/makemkvgui/inc/ver_num.h Changed

makemkv-oss-1.10.7.tar.xz/makemkvgui/src/scsiinfo.cpp -> makemkv-oss-1.10.8.tar.xz/makemkvgui/src/scsiinfo.cpp Changed

@@ -25,7 +25,7 @@
     append_const(Qstr,Str);
 }
 
-static QString FormatProtectionString(AP_DiskFsFlags FsFlags,const uint8_t* CopyrightInfo,const uint8_t* MkbSmall,const uint8_t* SvmSmall)
+static QString FormatProtectionString(AP_DiskFsFlags FsFlags,const uint8_t* CopyrightInfo,const uint8_t* MkbSmall,const uint8_t* CCSmall,const uint8_t* SvmSmall)
 {
     bool have_css=false,have_aacs=false,have_bdsvm=false,have_cprm=false;
     unsigned int aacs_ver = 0;
@@ -75,12 +75,49 @@
 
     if (have_css)   append_item(str,"CSS/CPPM");
     if (have_cprm)  append_item(str,"CPRM/CPPM");
-    if (have_aacs)  append_item(str,"AACS");
-    if (aacs_ver)
+    if (have_aacs)
     {
-        char    ver[8];
-        sprintf(ver," v%u",aacs_ver);
-        append_const(str,ver);
+        uint8_t version  = (MkbSmall != NULL) ? MkbSmall[5] : 4;
+        uint8_t category = (CCSmall != NULL) ? ((CCSmall[1]>>5)&3) : 0;
+
+        append_item(str, "AACS");
+        switch (version)
+        {
+        default:
+        case 3:
+        case 4:
+            break;
+        case 10:
+            append_const(str, "/II");
+            break;
+        case 20:
+            append_const(str, "2.0");
+            break;
+        case 21:
+            append_const(str, "2.1");
+            break;
+        }
+        if (version >= 20)
+        {
+            switch (category)
+            {
+            case 0:
+                append_const(str, "/C");
+                break;
+            case 1:
+                append_const(str, "/B");
+                break;
+            case 2:
+                append_const(str, "/A");
+                break;
+            }
+        }
+        if (aacs_ver)
+        {
+            char    ver[8];
+            sprintf(ver, " v%u", aacs_ver);
+            append_const(str, ver);
+        }
     }
     if (have_bdsvm) append_item(str,"BD+");
 
@@ -241,6 +278,7 @@
     ProtectionString=FormatProtectionString(FsFlags,
         (items.copyright_info.Size>=8)?items.copyright_info.Data:NULL,
         (items.mkb_small.Size>=12)?items.mkb_small.Data:NULL,
+        (items.ccert_small.Size>=4)?items.ccert_small.Data:NULL,
         (items.svm_small.Size>=17)?items.svm_small.Data:NULL
         );
 
@@ -476,7 +514,8 @@
                 (
                 (0==cmemcmp(items.bd_disc_info.Data+4+8,"BDO",3)) ||
                 (0==cmemcmp(items.bd_disc_info.Data+4+8,"BDW",3)) ||
-                (0==cmemcmp(items.bd_disc_info.Data+4+8,"BDR",3))
+                (0==cmemcmp(items.bd_disc_info.Data+4+8,"BDR",3)) ||
+                (0==cmemcmp(items.bd_disc_info.Data+4+8,"BDU",3))
                 ) &&
                 true)
             {
@@ -487,6 +526,7 @@
                 case 1:     p="BD-ROM"; break;
                 case 2:     p="BD-R"; break;
                 case 4:     p="BD-RE"; break;
+                case 9:     p="BD-ROM UHD"; break;
                 default:    p=NULL; break;
                 }
                 if (NULL!=p)
@@ -506,6 +546,7 @@
                 {
                 case 1:     pw=AP_UI_STRING(APP_SI_DISCCBL25); break;
                 case 2:     pw=AP_UI_STRING(APP_SI_DISCCBL27); break;
+                case 5: // what is UHD channel bit length?
                 default:    pw=NULL; break;
                 }
                 if (NULL!=pw)

makemkv-oss-1.10.7.tar.xz/sstring/src/sstring.cpp -> makemkv-oss-1.10.8.tar.xz/sstring/src/sstring.cpp Changed

Changes of Revision 42