Packman Build Service PMBS

makemkv.spec Changed

makemkv-bin-1.7.7.tar.gz/bin/amd64/makemkvcon -> makemkv-bin-1.7.8.tar.gz/bin/amd64/makemkvcon Changed

makemkv-bin-1.7.7.tar.gz/bin/i386/makemkvcon -> makemkv-bin-1.7.8.tar.gz/bin/i386/makemkvcon Changed

makemkv-bin-1.7.7.tar.gz/bin/i386/mmdtsdec -> makemkv-bin-1.7.8.tar.gz/bin/i386/mmdtsdec Changed

makemkv-bin-1.7.7.tar.gz/bin/mipsel32/makemkvcon -> makemkv-bin-1.7.8.tar.gz/bin/mipsel32/makemkvcon Changed

makemkv-bin-1.7.7.tar.gz/makefile.linux -> makemkv-bin-1.7.8.tar.gz/makefile.linux Changed

makemkv-bin-1.7.8.tar.gz/src/share/wdtv.mmcp.xml Added

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<profile>
+    
+    <name lang="eng">WDTV</name>
+
+    
+    <mkvSettings 
+        ignoreForcedSubtitlesFlag="true"
+        useISO639Type2T="false"
+    />
+
+    
+    <profileSettings
+        app_DefaultSelectionString="-sel:all,+sel:(favlang|nolang),-sel:(havemulti|havecore),-sel:mvcvideo,=100:all,-10:favlang"
+    />
+
+    
+    <outputSettings name="copy" outputFormat="directCopy">
+        <description lang="eng">Copy track as is</description>
+        <description lang="ger">Track 1:1 kopieren</description>
+    </outputSettings>
+
+    <outputSettings name="copyzlib" outputFormat="directCopy">
+        <description lang="eng">Copy track as is (zlib compressed)</description>
+        <mkvTrackSettings compression="zlib" compressionLevel="9" />
+    </outputSettings>
+
+    <outputSettings name="lpcm" outputFormat="LPCM-raw">
+        <description lang="eng">Save as raw LPCM</description>
+        <description lang="ger">Als RAW LPCM speichern</description>
+    </outputSettings>
+
+    <outputSettings name="wavex" outputFormat="LPCM-wavex">
+        <description lang="eng">Save as LPCM in WAV container</description>
+        <description lang="ger">Als LPCM im WAV-Container speichern</description>
+    </outputSettings>
+
+    <outputSettings name="flac-best" outputFormat="FLAC">
+        <description lang="eng">Save as FLAC (best compression)</description>
+        <description lang="ger">Als FLAC speichern (höchste Komprimierungsstufe)</description>
+        <extraArgs>-compression_level 12</extraArgs>
+    </outputSettings>
+
+    <outputSettings name="flac-fast" outputFormat="FLAC">
+        <description lang="eng">Save as FLAC (fast compression)</description>
+        <extraArgs>-compression_level 5</extraArgs>
+    </outputSettings>
+
+    
+    <trackSettings input="default">
+        <output outputSettingsName="copy" 
+                defaultSelection="$app_DefaultSelectionString">
+        </output>
+    </trackSettings>
+
+    
+    <trackSettings input="LPCM-stereo">
+        <output outputSettingsName="lpcm"
+                defaultSelection="$app_DefaultSelectionString">
+        </output>
+    </trackSettings>
+
+    
+    <trackSettings input="LPCM-multi">
+        <output outputSettingsName="wavex"
+                defaultSelection="$app_DefaultSelectionString">
+        </output>
+    </trackSettings>
+
+    
+    <trackSettings input="PGS">
+        <output outputSettingsName="copyzlib"
+                defaultSelection="$app_DefaultSelectionString">
+        </output>
+    </trackSettings>
+    <trackSettings input="PGS-forced">
+        <output outputSettingsName="copyzlib"
+                defaultSelection="$app_DefaultSelectionString">
+        </output>
+    </trackSettings>
+
+</profile>

makemkv-oss-1.7.7.tar.gz/libabi/inc/lgpl/zlibabi.h -> makemkv-oss-1.7.8.tar.gz/libabi/inc/lgpl/zlibabi.h Changed

makemkv-oss-1.7.7.tar.gz/libabi/src/zlib.c -> makemkv-oss-1.7.8.tar.gz/libabi/src/zlib.c Changed

makemkv-oss-1.7.7.tar.gz/libmakemkv/inc/lgpl/world.h -> makemkv-oss-1.7.8.tar.gz/libmakemkv/inc/lgpl/world.h Changed

makemkv-oss-1.7.7.tar.gz/libmakemkv/inc/libmkv/libmkv.h -> makemkv-oss-1.7.8.tar.gz/libmakemkv/inc/libmkv/libmkv.h Changed

@@ -48,12 +48,20 @@
 
 static const unsigned int MKV_STREAM_FLAG_FORCED_SUBTITLE = 0x1000;
 
+static const unsigned int MKV_TRACK_COMPRESSION_ZLIB=0;
+static const unsigned int MKV_TRACK_COMPRESSION_BZ2=1;
+static const unsigned int MKV_TRACK_COMPRESSION_LZO=2;
+static const unsigned int MKV_TRACK_COMPRESSION_HEADERS=3;
+static const unsigned int MKV_TRACK_COMPRESSION_NONE=4;
+
 class IMkvChunk
 {
 public:
     virtual const uint8_t*  get_data()=0;
     virtual unsigned int    get_size()=0;
     virtual void*           get_ref()=0;
+    virtual bool            compress_start(unsigned int compressionType,unsigned int compressionLevel)=0;
+    virtual bool            compress_wait()=0;
 public:
     int64_t     timecode;
     int64_t     duration;
@@ -75,6 +83,12 @@
     mttSubtitle
 } MkvTrackType;
 
+typedef struct _MkvProfileTrackInfo
+{
+    unsigned int        compressionType;
+    unsigned int        compressionLevel;
+} MkvProfileTrackInfo;
+
 typedef struct _MkvTrackInfo
 {
     MkvTrackType        type;
@@ -101,6 +115,8 @@
 
     unsigned int        min_cache;
 
+    const MkvProfileTrackInfo*  profile_track_info;
+
     union _u
     {
         struct _video
@@ -202,7 +218,6 @@
 {
     int                 evoid[8];
     unsigned int        compatFlags;
-    unsigned int        headerRemoval;
 } MkvDebugInfo;
 
 typedef struct _MkvProfileInfo

makemkv-oss-1.7.7.tar.gz/libmakemkv/src/libmakemkv.vers -> makemkv-oss-1.7.8.tar.gz/libmakemkv/src/libmakemkv.vers Changed

makemkv-oss-1.7.7.tar.gz/libmakemkv/src/libmkv.cpp -> makemkv-oss-1.7.8.tar.gz/libmakemkv/src/libmkv.cpp Changed

@@ -48,6 +48,11 @@
     return GetChild<Tv,Te>(&node);
 }
 
+template <class Te> class NoDefault : public Te
+{
+    bool IsDefaultValue() const { return false; };
+};
+
 static inline int64_t ScaleTimecode(int64_t UnscaledTimecode)
 {
     return UnscaledTimecode / TIMECODE_SCALE;
@@ -458,7 +463,8 @@
     uint64_t        refs[2];
     unsigned int    duration_size;
     unsigned int    frame_count;
-    bool            header_removal;
+    unsigned int    compression_type;
+    unsigned int    compression_level;
 };
 
 class MyDataBuffer : public DataBuffer
@@ -506,8 +512,9 @@
 static DataBuffer* GetDataBuffer(IMkvChunk* frame,MyMkvTrackInfo* track)
 {
     DataBuffer* mkv_buffer;
-    if (track->header_removal)
-    { 
+
+    if (track->compression_type==MKV_TRACK_COMPRESSION_HEADERS)
+    {
         MKV_ASSERT(frame->get_size()>track->info.header_comp_size);
         if (memcmp(frame->get_data(),track->info.header_comp_data,track->info.header_comp_size))
         {
@@ -515,6 +522,8 @@
         }
         mkv_buffer = new MyDataBuffer(frame,track->info.header_comp_size);
     } else {
+        CNZ(frame->compress_start(track->compression_type,track->compression_level));
+        CNZ(frame->compress_wait());
         mkv_buffer = new MyDataBuffer(frame);
     }
     return mkv_buffer;
@@ -603,7 +612,6 @@
 
         ti = & track_info[i].info;
         track_info[i].frame_count = 0;
-        track_info[i].header_removal = false;
         track_info[i].duration_pos=0;
         track_info[i].refs[0]=BAD_TIMECODE;
         track_info[i].refs[1]=BAD_TIMECODE;
@@ -670,6 +678,7 @@
             {
                 lgpl_iso6392T(langBuf);
             }
+            cur_track->PushElement(*new NoDefault<KaxTrackLanguage>);
             GetChild<EbmlString,KaxTrackLanguage>(cur_track) = langBuf;
         } else {
             if (FormatInfo->debug.compatFlags&1)
@@ -760,15 +769,32 @@
             }
         }
 
-        if ( (ti->header_comp_size) && (FormatInfo->debug.headerRemoval&(1<<(ti->type-1))) )
+        if (track_info[i].info.profile_track_info)
+        {
+            track_info[i].compression_type=track_info[i].info.profile_track_info->compressionType;
+            track_info[i].compression_level=track_info[i].info.profile_track_info->compressionLevel;
+        } else {
+            track_info[i].compression_type=MKV_TRACK_COMPRESSION_NONE;
+        }
+
+        if ( (!ti->header_comp_size) && (track_info[i].compression_type==MKV_TRACK_COMPRESSION_HEADERS) )
+        {
+            track_info[i].compression_type=MKV_TRACK_COMPRESSION_NONE;
+        }
+
+        if (track_info[i].compression_type!=MKV_TRACK_COMPRESSION_NONE)
         {
-            track_info[i].header_removal = true;
             KaxContentEncodings &cs = GetChild<KaxContentEncodings>(*cur_track);
             KaxContentEncoding &ce = GetChild<KaxContentEncoding>(cs);
             KaxContentCompression &cc = GetChild<KaxContentCompression>(ce);
 
-            GetChild<EbmlUInteger,KaxContentCompAlgo>(cc) = 3;
-            GetChild<EbmlBinary,KaxContentCompSettings>(cc).CopyBuffer(ti->header_comp_data,ti->header_comp_size);
+            cc.PushElement(*new NoDefault<KaxContentCompAlgo>);
+            GetChild<EbmlUInteger,KaxContentCompAlgo>(cc) = track_info[i].compression_type;
+            
+            if (ti->header_comp_size)
+            {
+                GetChild<EbmlBinary,KaxContentCompSettings>(cc).CopyBuffer(ti->header_comp_data,ti->header_comp_size);
+            }
         }
     }
 
@@ -831,6 +857,16 @@
                     stream_id = i;
                 }
             }
+            if (track_info[i].compression_type==MKV_TRACK_COMPRESSION_ZLIB)
+            {
+                frames_scan = Input->MkvGetStream(i)->GetAvailableFramesCount();
+                for (unsigned int k=0;k<frames_scan;k++)
+                {
+                    CNZ(Input->MkvGetStream(i)->PeekFrame(k)->compress_start(
+                        track_info[i].compression_type,
+                        track_info[i].compression_level));
+                }
+            }
         }
         if (min_timecode==BAD_TIMECODE)
         {
@@ -968,6 +1004,12 @@
 
         MKV_ASSERT(frames_count>0);
 
+        if (frames_count>1)
+        {
+            CNZ(frame->compress_start(track_info[stream_id].compression_type,track_info[stream_id].compression_level));
+            CNZ(frame->compress_wait());
+        }
+
         frame_keyframe = frame->keyframe();
         same_frame_size = frame->get_size();
         all_same = true;
@@ -990,6 +1032,10 @@
                 frames_count=i;
                 break;
             }
+
+            CNZ(frame->compress_start(track_info[stream_id].compression_type,track_info[stream_id].compression_level));
+            CNZ(frame->compress_wait());
+
             if (frame->get_size()!=same_frame_size)
             {
                 all_same=false;

makemkv-oss-1.7.7.tar.gz/makemkvgui/inc/lgpl/apdefs.h -> makemkv-oss-1.7.8.tar.gz/makemkvgui/inc/lgpl/apdefs.h Changed

makemkv-oss-1.7.7.tar.gz/makemkvgui/inc/lgpl/aproxy.h -> makemkv-oss-1.7.8.tar.gz/makemkvgui/inc/lgpl/aproxy.h Changed

makemkv-oss-1.7.7.tar.gz/makemkvgui/inc/ver_num.h -> makemkv-oss-1.7.8.tar.gz/makemkvgui/inc/ver_num.h Changed

makemkv-oss-1.7.7.tar.gz/makemkvgui/src/api_posix.cpp -> makemkv-oss-1.7.8.tar.gz/makemkvgui/src/api_posix.cpp Changed

makemkv-oss-1.7.7.tar.gz/makemkvgui/src/macutil.mm -> makemkv-oss-1.7.8.tar.gz/makemkvgui/src/macutil.mm Changed

makemkv-oss-1.7.7.tar.gz/makemkvgui/src/mainwnd.cpp -> makemkv-oss-1.7.8.tar.gz/makemkvgui/src/mainwnd.cpp Changed

@@ -328,7 +328,7 @@
             return path;
         }
     }
-#endif    
+#endif
     return info.absoluteFilePath();
 }
 
@@ -600,11 +600,23 @@
 #else
     aboutQtAct = NULL;
 #endif
+
+#ifdef Q_WS_MAC
+    newInstanceAct = new QAction(UI_QSTRING(APP_IFACE_ACT_NEWINSTANCE_NAME), this);
+    newInstanceAct->setStatusTip(UI_QSTRING(APP_IFACE_ACT_NEWINSTANCE_STIP));
+    newInstanceAct->setShortcut(Qt::CTRL + Qt::Key_N);
+    newInstanceAct->setMenuRole(QAction::ApplicationSpecificRole);
+    connect(newInstanceAct, SIGNAL(triggered()), this, SLOT(SlotNewInstance()));
+#endif
+
 }
 
 void MainWnd::createMenus()
 {
     fileMenu = menuBar()->addMenu(UI_QSTRING(APP_IFACE_MENU_FILE));
+#ifdef Q_WS_MAC
+    fileMenu->addAction(newInstanceAct);
+#endif
     fileMenu->addAction(openFilesAct);
     drivesMenu = fileMenu->addMenu(UI_QSTRING(APP_IFACE_MENU_DRIVES));
     fileMenu->addAction(closeDiskAct);
@@ -1171,7 +1183,7 @@
             real_url = QLatin1String("http://127.0.0.1/?hide?") + url;
         }
     }
-    
+
     m_disable_onidle=true;
     QDesktopServices::openUrl(real_url);
     m_disable_onidle=false;
@@ -1292,6 +1304,15 @@
     }
 }
 
+int ApSpawnNewInstance();
+
+void MainWnd::SlotNewInstance()
+{
+#ifdef Q_WS_MAC
+    ApSpawnNewInstance();
+#endif
+}
+
 void CounterThread::startStop(CApClient* App)
 {
     m_app = App;

makemkv-oss-1.7.7.tar.gz/makemkvgui/src/mainwnd.h -> makemkv-oss-1.7.8.tar.gz/makemkvgui/src/mainwnd.h Changed

makemkv-oss-1.7.7.tar.gz/makemkvgui/src/str/en_utf16.cpp -> makemkv-oss-1.7.8.tar.gz/makemkvgui/src/str/en_utf16.cpp Changed

@@ -15,7 +15,7 @@
 
 */
 
-static const unsigned short en_po_str[19044]={
+static const unsigned short en_po_str[19106]={
 'e','n','g',':','E','n','g','l','i','s','h',0,
 'D','B','G',' ','A','S','S','E','R','T',':',' ','%','1',' ','a','t',' ','%','2',':','%','3',0,
 'L','I','B','M','K','V','_','T','R','A','C','E',':',' ','%','1',0,
@@ -405,6 +405,8 @@
 'N','o',' ','i','n','f','o','r','m','a','t','i','o','n',' ','a','v','a','i','l','a','b','l','e',0,
 'R','e','v','e','r','t',0,
 'R','e','v','e','r','t',' ','t','o',' ','o','r','i','g','i','n','a','l',' ','v','a','l','u','e',0,
+'N','e','w',' ','M','a','k','e','M','K','V',' ','i','n','s','t','a','n','c','e',0,
+'S','t','a','r','t',' ','s','e','c','o','n','d',' ','c','o','p','y',' ','o','f',' ','M','a','k','e','M','K','V',' ','a','p','p','l','i','c','a','t','i','o','n',0,
 '<','b','>','S','o','u','r','c','e',' ','i','n','f','o','r','m','a','t','i','o','n','<','/','b','>','<','b','r','>',0,
 '<','b','>','T','i','t','l','e',' ','i','n','f','o','r','m','a','t','i','o','n','<','/','b','>','<','b','r','>',0,
 '<','b','>','T','r','a','c','k',' ','i','n','f','o','r','m','a','t','i','o','n','<','/','b','>','<','b','r','>',0,
@@ -492,7 +494,7 @@
 'O','S',' ','d','e','v','i','c','e',' ','n','a','m','e',':',' ',0,
 0};
 
-static const unsigned int en_po_off[949]={
+static const unsigned int en_po_off[953]={
 1000,0,1001,12,1002,36,1003,53,1004,77,1005,124,1006,135,1007,136,1008,226,1009,275,2001,301,
 2002,350,2003,436,2004,490,2005,558,2006,668,2007,785,2008,940,2009,1063,2010,1191,2011,1236,2012,1380,
 2013,1491,2014,1604,2015,1652,2016,1734,2017,1897,2200,2012,2201,2030,2202,2054,2203,2083,2204,2113,2205,2142,
@@ -528,15 +530,15 @@
 6068,16580,6069,16594,6070,16599,6071,16608,6072,16615,6073,16622,6074,16630,6075,16643,6076,16648,6077,16672,6078,16703,
 6079,16758,6080,16828,6081,16836,6082,16841,6083,16860,6085,16884,6086,16889,6087,16922,6088,16964,6089,16984,6090,16989,
 6091,16994,6092,17003,6093,17010,6094,17030,6095,17044,6096,17065,6097,17073,6098,17097,6100,17159,6101,17170,6102,17182,
-6103,17190,6104,17195,6105,17220,6106,17227,6119,17252,6120,17282,6121,17311,6125,17340,6126,17360,6127,17390,6128,17418,
-6129,17440,6130,17454,6131,17480,6132,17488,6133,17511,6134,17522,6135,17534,6136,17554,6137,17574,6138,17586,6139,17851,
-6142,17883,6143,17906,6144,17917,6145,17934,6146,17944,6147,17969,6148,17977,6149,17997,6150,18039,6151,18063,6152,18103,
-6153,18112,6154,18133,6156,18154,6157,18159,6158,18164,6161,18190,6162,18204,6163,18230,6164,18248,6165,18251,6166,18261,
-6167,18272,6169,18295,6170,18309,6171,18344,6172,18377,6173,18386,6174,18404,6175,18429,6176,18445,6180,18467,6181,18475,
-6200,18486,6201,18492,6202,18498,6203,18504,6204,18514,6205,18519,6206,18531,6207,18540,6209,18554,6210,18567,6211,18578,
-6212,18593,6213,18605,6300,18614,6301,18643,6302,18661,6303,18676,6304,18686,6305,18697,6306,18713,6307,18732,6308,18748,
-6320,18771,6321,18803,6322,18835,6323,18860,6324,18876,6325,18888,6326,18900,6327,18920,6329,18939,6330,18960,6331,18993,
-6332,19026,0};
+6103,17190,6104,17195,6105,17220,6106,17227,6107,17252,6108,17273,6119,17314,6120,17344,6121,17373,6125,17402,6126,17422,
+6127,17452,6128,17480,6129,17502,6130,17516,6131,17542,6132,17550,6133,17573,6134,17584,6135,17596,6136,17616,6137,17636,
+6138,17648,6139,17913,6142,17945,6143,17968,6144,17979,6145,17996,6146,18006,6147,18031,6148,18039,6149,18059,6150,18101,
+6151,18125,6152,18165,6153,18174,6154,18195,6156,18216,6157,18221,6158,18226,6161,18252,6162,18266,6163,18292,6164,18310,
+6165,18313,6166,18323,6167,18334,6169,18357,6170,18371,6171,18406,6172,18439,6173,18448,6174,18466,6175,18491,6176,18507,
+6180,18529,6181,18537,6200,18548,6201,18554,6202,18560,6203,18566,6204,18576,6205,18581,6206,18593,6207,18602,6209,18616,
+6210,18629,6211,18640,6212,18655,6213,18667,6300,18676,6301,18705,6302,18723,6303,18738,6304,18748,6305,18759,6306,18775,
+6307,18794,6308,18810,6320,18833,6321,18865,6322,18897,6323,18922,6324,18938,6325,18950,6326,18962,6327,18982,6329,19001,
+6330,19022,6331,19055,6332,19088,0};
 
 extern "C" const unsigned short * en_po_getstr_utf16(unsigned int code)
 {

makemkv-oss-1.7.7.tar.gz/makemkvgui/src/win_rsrc.rc -> makemkv-oss-1.7.8.tar.gz/makemkvgui/src/win_rsrc.rc Changed

Changes of Revision 15