Ticket #7986: t7986_mythtranscode_buildindex_cleanup.diff

programs/mythtranscode/mpeg2fix.cpp

@@ -746 +746 @@
         return 0;
     }
 
+    mkvfile = !strcmp(inputFC->iformat->name, "mkv") ? 1 : 0;
+
     if (offset)
         av_seek_frame(inputFC, vid_id, offset, AVSEEK_FLAG_BYTE);
 
@@ -2576 +2578 @@
     if (!InitAV(fname.constData(), NULL, 0))
         return TRANSCODE_EXIT_UNKNOWN_ERROR;
 
+    if (mkvfile)
+    {
+        VERBOSE(MPF_IMPORTANT, "Seek tables are not required for MKV");
+        return TRANSCODE_EXIT_UNKNOWN_ERROR;
+    }
+
     av_init_packet(&pkt);
 
     while (av_read_frame(inputFC, &pkt) >= 0)

programs/mythtranscode/main.cpp

@@ -568 +568 @@
         return TRANSCODE_EXIT_REMOTE_FILE;
     }
 
-    if (outfile.isNull())
+    if (outfile.isNull() && !build_index)
         outfile = infile + ".tmp";
 
     if (jobID >= 0)
@@ -576 +576 @@
 
     Transcode *transcode = new Transcode(pginfo);
 
-    VERBOSE(VB_GENERAL, QString("Transcoding from %1 to %2")
-                        .arg(infile).arg(outfile));
+    if (!build_index)
+        VERBOSE(VB_GENERAL, QString("Transcoding from %1 to %2")
+                            .arg(infile).arg(outfile));
 
     if (showprogress)
         transcode->ShowProgress(true);
     if (!recorderOptions.isEmpty())
         transcode->SetRecorderOptions(recorderOptions);
     int result = 0;
-    if (!mpeg2)
+    if (!mpeg2 && !build_index)
     {
         result = transcode->TranscodeFile(infile, outfile,
                                           profilename, useCutlist,
@@ -595 +596 @@
     }
 
     int exitcode = TRANSCODE_EXIT_OK;
-    if ((result == REENCODE_MPEG2TRANS) || mpeg2)
+    if ((result == REENCODE_MPEG2TRANS) || mpeg2 || build_index)
     {
         void (*update_func)(float) = NULL;
         int (*check_func)() = NULL;
@@ -647 +648 @@
     {
         if (jobID >= 0)
             JobQueue::ChangeJobStatus(jobID, JOB_STOPPING);
-        VERBOSE(VB_GENERAL, QString("Transcoding %1 done").arg(infile));
+        VERBOSE(VB_GENERAL, QString("%1 %2 done")
+                .arg(build_index ? "Building Index for" : "Transcoding")
+                .arg(infile));
     }
     else if (result == REENCODE_CUTLIST_CHANGE)
     {

programs/mythtranscode/mpeg2fix.h

@@ -244 +244 @@
     int aud_stream_count;
     int64_t ptsIncrement;
     int64_t ptsOffset;  //was initPTS
+    bool mkvfile;
 
     int discard;
     //control options