Packman Build Service PMBS

makemkv.changes Changed

makemkv.spec Changed

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

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

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

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

makemkv-oss-1.10.8.tar.xz/libdriveio/inc/driveio/driveio.h -> makemkv-oss-1.10.9.tar.xz/libdriveio/inc/driveio/driveio.h Changed

@@ -53,6 +53,7 @@
     // dicat_Invalid
     diid_InvalidValue=0,
     diid_DriveioTag=(dicat_Invalid<<24) + (1<<16),
+    diid_DriveioPad=(dicat_Invalid<<24) + (2<<16),
 
     // dicat_DriveStandard
     diid_InquiryData=(dicat_DriveStandard<<24)+(0<<16),
@@ -152,7 +153,8 @@
 void            DIO_CDECL   DriveInfoList_GetItem(DIO_INFOLIST List,size_t Index,DriveInfoItem *Item);
 int             DIO_CDECL   DriveInfoList_GetItemById(DIO_INFOLIST List,DriveInfoId Id,DriveInfoItem *Item);
 int             DIO_CDECL   DriveInfoList_AddItem(DIO_INFOLIST List,DriveInfoId Id,const void* Data,size_t Size);
-size_t          DIO_CDECL   DriveInfoList_Serialize(DIO_INFOLIST List,void* Buffer,size_t BufferSize);
+int             DIO_CDECL   DriveInfoList_AddOrUpdateItem(DIO_INFOLIST List, DriveInfoId Id, const void* Data, size_t Size);
+size_t          DIO_CDECL   DriveInfoList_Serialize(DIO_INFOLIST List, void* Buffer, size_t BufferSize);
 DIO_INFOLIST    DIO_CDECL   DriveInfoList_Deserialize(const void* Buffer,size_t BufferSize);
 size_t          DIO_CDECL   DriveInfoList_GetSerializedChunkSize(const void* Buffer);
 void            DIO_CDECL   DriveInfoList_GetSerializedChunkInfo(const void* Buffer,DriveInfoItem *Item);

makemkv-oss-1.10.8.tar.xz/libdriveio/src/infolist.cpp -> makemkv-oss-1.10.9.tar.xz/libdriveio/src/infolist.cpp Changed

@@ -73,6 +73,7 @@
     }
     ~CDriveInfoList();
     bool AddItem(DriveInfoId Id,const void* Data,size_t Size);
+    bool AddOrUpdateItem(DriveInfoId Id, const void* Data, size_t Size);
     size_t GetCount();
     void GetItem(size_t Index,DriveInfoItem *Item);
     bool GetItemById(DriveInfoId Id,DriveInfoItem *Item);
@@ -153,7 +154,7 @@
         pitem = m_last;
     } else {
         // slist is way too slow for random access.
-        // on the other hand this list normally contains less then
+        // on the other hand this list normally contains less than
         // 100 items, so enumeration/search performance should
         // not be an issue
         pitem = m_first;
@@ -181,6 +182,26 @@
     return false;
 }
 
+bool CDriveInfoList::AddOrUpdateItem(DriveInfoId Id, const void* Data, size_t Size)
+{
+    CDriveInfoItem* pitem;
+
+    for (pitem = m_first; pitem != NULL; pitem = pitem->m_next)
+    {
+        if (pitem->m_item.Id == Id)
+        {
+            if (pitem->m_item.Size >= Size)
+            {
+                pitem->m_item.Size = Size;
+                memcpy((void*)(pitem->m_item.Data), Data, Size);
+            } else {
+                return false;
+            }
+        }
+    }
+
+    return AddItem(Id,Data,Size);
+}
 
 static void uint32_put_ns(uint32_t Value,void *Buf)
 {
@@ -296,6 +317,13 @@
     return plist->AddItem(Id,Data,Size) ? 0 : -1;
 }
 
+extern "C" int DIO_CDECL DriveInfoList_AddOrUpdateItem(DIO_INFOLIST List, DriveInfoId Id, const void* Data, size_t Size)
+{
+    LibDriveIo::CDriveInfoList* plist = (LibDriveIo::CDriveInfoList*) List;
+
+    return plist->AddOrUpdateItem(Id, Data, Size) ? 0 : -1;
+}
+
 extern "C" size_t DIO_CDECL DriveInfoList_GetCount(DIO_INFOLIST List)
 {
     LibDriveIo::CDriveInfoList* plist = (LibDriveIo::CDriveInfoList*) List;

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

@@ -38,7 +38,7 @@
 #define AUTO_DURATION_TIMECODE      4500000000ll
 #define BAD_TIMECODE                ((1ll<<62)+1)
 
-#define CNZ(x) if (!(x)) { throw mkv_error_exception_unbuffered( "Error in " #x ); };
+#define CNZ(x) if (!(x)) { ThrowMkvExceptionUnbuffered( "Error in " #x ); };
 
 template <class Tv,class Te>
 static inline Tv& GetChild(EbmlMaster *node)
@@ -52,6 +52,11 @@
     return GetChild<Tv,Te>(&node);
 }
 
+static void ThrowMkvExceptionUnbuffered(const char* Msg)
+{
+    throw mkv_error_exception_unbuffered(Msg);
+};
+
 static inline int64_t ScaleTimecode(int64_t UnscaledTimecode)
 {
     return UnscaledTimecode / TIMECODE_SCALE;
@@ -803,6 +808,7 @@
     int64_t max_duration=0;
     uint64_t prg_val=0;
     int64_t frame_end;
+    unsigned int clusterlen = (track_info.size() > 64) ? 5 : 4;
 
     while(true)
     {
@@ -958,7 +964,7 @@
             {
                 CNZ(curr_cluster->WriteHead(File, 3));
             } else {
-                CNZ(curr_cluster->WriteHead(File, 4));
+                CNZ(curr_cluster->WriteHead(File, clusterlen));
             }
 
             cluster_timecode = GetClusterTimecode(Input);

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

Changes of Revision 44