Packman Build Service PMBS

makemkv.changes Changed

makemkv.spec Changed

makemkv-bin-1.14.5.tar.xz/bin/amd64/makemkvcon -> makemkv-bin-1.14.7.tar.xz/bin/amd64/makemkvcon Changed

makemkv-bin-1.14.5.tar.xz/bin/i386/makemkvcon -> makemkv-bin-1.14.7.tar.xz/bin/i386/makemkvcon Changed

makemkv-bin-1.14.5.tar.xz/src/share/appdata.tar -> makemkv-bin-1.14.7.tar.xz/src/share/appdata.tar Changed

makemkv-bin-1.14.5.tar.xz/src/share/blues.jar -> makemkv-bin-1.14.7.tar.xz/src/share/blues.jar Changed

makemkv-oss-1.14.5.tar.xz/libdriveio/inc/driveio/scsihlp.h -> makemkv-oss-1.14.7.tar.xz/libdriveio/inc/driveio/scsihlp.h Changed

makemkv-oss-1.14.5.tar.xz/libdriveio/src/scsihlp.cpp -> makemkv-oss-1.14.7.tar.xz/libdriveio/src/scsihlp.cpp Changed

@@ -430,3 +430,41 @@
     *dst = 0;
 }
 
+int LibDriveIo::ScsiErrorFromResult(const ScsiCmdResponse *CmdResult)
+{
+    if ((CmdResult->Status == 2) && (CmdResult->SenseLen >= 2))
+    {
+        uint8_t key, asc, ascq;
+        uint32_t code;
+        uint8_t rcode = CmdResult->SenseData[0] & 0x7f;
+
+        if ((rcode == 0x70) || (rcode == 0x71))
+        {
+            if (CmdResult->SenseLen >= 17)
+            {
+                key = CmdResult->SenseData[2] & 0x0f;
+                asc = CmdResult->SenseData[12];
+                ascq = CmdResult->SenseData[13];
+
+                code = (((uint32_t)key) << 16) | (((uint32_t)asc) << 8) | ascq;
+                return DRIVEIO_ERR_SCSI_SENSE(code);
+            }
+        }
+
+        if ((rcode == 0x72) || (rcode == 0x73))
+        {
+            if (CmdResult->SenseLen >= 8)
+            {
+                key = CmdResult->SenseData[1] & 0x0f;
+                asc = CmdResult->SenseData[2];
+                ascq = CmdResult->SenseData[3];
+
+                code = (((uint32_t)key) << 16) | (((uint32_t)asc) << 8) | ascq;
+                return DRIVEIO_ERR_SCSI_SENSE(code);
+            }
+        }
+    }
+
+    return DRIVEIO_ERR_SCSI_STATUS(CmdResult->Status);
+}
+

makemkv-oss-1.14.5.tar.xz/libmakemkv/inc/libmkv/libmkv.h -> makemkv-oss-1.14.7.tar.xz/libmakemkv/inc/libmkv/libmkv.h Changed

makemkv-oss-1.14.5.tar.xz/libmakemkv/src/libmkv.cpp -> makemkv-oss-1.14.7.tar.xz/libmakemkv/src/libmkv.cpp Changed

@@ -327,6 +327,7 @@
     unsigned int    compression_type;
     unsigned int    compression_level;
     EbmlBinary*     codec_private;
+    EbmlUInteger*   flag_default;
     uint64_t        stat_frames;
     uint64_t        stat_bytes;
     uint64_t        stat_bytes_out;
@@ -628,7 +629,8 @@
         GetChild<EbmlUInteger,KaxTrackType>(cur_track) = ttype;
 
         GetChild<EbmlUInteger,KaxTrackFlagDefault>(cur_track) = (0!=(ti->mkv_flags&MKV_TRACK_FLAG_DEFAULT))?1:0;
-        GetChild<EbmlUInteger,KaxTrackFlagDefault>(cur_track).ForceNoDefault();
+        track_info[i].flag_default = &GetChild<EbmlUInteger, KaxTrackFlagDefault>(cur_track);
+        track_info[i].flag_default->ForceNoDefault();
 
         if (0!=(ti->mkv_flags&MKV_TRACK_FLAG_FORCED))
         {
@@ -733,6 +735,7 @@
 
             GetChild<EbmlFloat,KaxAudioSamplingFreq>(aud_track) = ti->u.audio.sample_rate;
             GetChild<EbmlUInteger,KaxAudioChannels>(aud_track) = ti->u.audio.channels_count;
+            GetChild<EbmlUInteger, KaxAudioChannels>(aud_track).ForceNoDefault();
             if (0!=ti->u.audio.bits_per_sample)
             {
                 if ( (!(FormatInfo->debug.compatFlags&1)) || strcmp(ti->codec_id,"A_DTS") )
@@ -1219,8 +1222,19 @@
 
         if (track_info[i].stat_frames==0)
         {
+            if (0!=(track_info[i].info.mkv_flags&MKV_TRACK_FLAG_DEFAULT))
+            {
+                if (track_info[i-1].info.type==track_info[i].info.type)
+                {
+                    MKV_ASSERT(track_info[i-1].flag_default->GetSize()==1);
+                    track_info[i-1].flag_default->SetValue(1);
+                    track_info[i-1].flag_default->OverwriteData(File, true);
+                }
+            }
+
             VoidElement(tracks[i],File);
             my_world()->uc_emptytrack(Input,i,&track_info[i].info);
+            track_info[i].info.type = mttUnknown;
             continue;
         }

makemkv-oss-1.14.5.tar.xz/libmmbd/inc/libmmbd/mmbd.h -> makemkv-oss-1.14.7.tar.xz/libmmbd/inc/libmmbd/mmbd.h Changed

makemkv-oss-1.14.5.tar.xz/libmmbd/src/mmconn.cpp -> makemkv-oss-1.14.7.tar.xz/libmmbd/src/mmconn.cpp Changed

@@ -485,20 +485,34 @@
     }
 
 
-    if ( ((buf[0]&0xC0)!=0x00) && (0==(name_flags&MMBD_FLAG_BDPLUS_ONLY)) ) {
+    if (0!=(name_flags&MMBD_FLAG_BLOCK_KEY)) {
+        if (dbuf[0]&1) {
+            memcpy(buf, dbuf+1, 16);
+        } else {
+            memset(buf, 0x00, 16);
+        }
+        return 0;
+    }
 
 
-        if ((m_disc_flags&AP_MMBD_DISC_FLAG_BUSENC)!=0) {
-            (*m_aes_cbcd)(m_bus_key,iv,buf+16+0*BD_SECTOR_SIZE,BD_SECTOR_SIZE-16);
-            (*m_aes_cbcd)(m_bus_key,iv,buf+16+1*BD_SECTOR_SIZE,BD_SECTOR_SIZE-16);
-            (*m_aes_cbcd)(m_bus_key,iv,buf+16+2*BD_SECTOR_SIZE,BD_SECTOR_SIZE-16);
-        }
+    if ( ((buf[0]&0xC0)!=0x00) && (0==(name_flags&MMBD_FLAG_BDPLUS_ONLY)) ) {
 
 
         if (dbuf[0]&1) {
-             (*m_aes_cbcd)(dbuf+1,iv,buf+16,6128);
+
+            if ((m_disc_flags&AP_MMBD_DISC_FLAG_BUSENC)!=0) {
+                (*m_aes_cbcd)(m_bus_key, iv, buf+16+0*BD_SECTOR_SIZE, BD_SECTOR_SIZE-16);
+                (*m_aes_cbcd)(m_bus_key, iv, buf+16+1*BD_SECTOR_SIZE, BD_SECTOR_SIZE-16);
+                (*m_aes_cbcd)(m_bus_key, iv, buf+16+2*BD_SECTOR_SIZE, BD_SECTOR_SIZE-16);
+            }
+
+
+            (*m_aes_cbcd)(dbuf+1, iv, buf+16, 6128);
+            buf[0]&=0x3f;
+        } else {
+
+            memset(buf, 0x00, 6144);
         }
-        buf[0]&=0x3f;
     }

makemkv-oss-1.14.5.tar.xz/makemkvgui/inc/ver_num.h -> makemkv-oss-1.14.7.tar.xz/makemkvgui/inc/ver_num.h Changed

makemkv-oss-1.14.5.tar.xz/makemkvgui/src/mainwnd.cpp -> makemkv-oss-1.14.7.tar.xz/makemkvgui/src/mainwnd.cpp Changed

Changes of Revision 64