Ticket #6236: mythburn.py.3.diff

mythburn.py

@@ -67 +67 @@
 #*********************************************************************************
 #Dont change the stuff below!!
 #*********************************************************************************
-import os, string, socket, sys, getopt, traceback, signal
+import os, popen2, string, socket, sys, getopt, traceback, signal
 import xml.dom.minidom
 import Image, ImageDraw, ImageFont, ImageColor
 import MySQLdb, codecs, unicodedata
@@ -1821 +1821 @@
         os.remove(sourcefile)
 
 #############################################################
+# Re-encodes a mv2 video stream
+
+def encodeVideo(sourcefile, destinationfile, aspectratio, profile, deletesourceafterencode):
+    """Encodes an mv2 source file use ffmpeg"""
+
+    profileNode = findEncodingProfile(profile)
+
+    passes = int(getText(profileNode.getElementsByTagName("passes")[0]))
+
+    command = path_ffmpeg[0]
+
+    if cpuCount > 1:
+        command += " -threads %d" % cpuCount
+
+
+    parameters = profileNode.getElementsByTagName("parameter")
+
+    for param in parameters:
+        name = param.attributes["name"].value
+        value = param.attributes["value"].value
+
+        # do some parameter substitution
+        if value == "%inputfile":
+            value = quoteFilename(sourcefile)
+        if value == "%outputfile":
+            #Encode elementry stream only
+            command += " -f mpeg2video"
+            value = quoteFilename(destinationfile)
+        if value == "%aspect":
+            value = aspectratio
+
+        if name != "":
+            command += " " + name
+
+        if value != "":
+            command += " " + value
+
+    if passes == 1:
+        write(command)
+        result = runCommand(command)
+        if result!=0:
+            fatalError("Failed while running ffmpeg to re-encode video.\n"
+                       "Command was %s" % command)
+
+    else:
+        passLog = os.path.join(getTempPath(), 'pass')
+
+        pass1 = string.replace(command, "%passno","1")
+        pass1 = string.replace(pass1, "%passlogfile", passLog)
+        write("Pass 1 - " + pass1)
+        result = runCommand(pass1)
+
+        if result!=0:
+            fatalError("Failed while running ffmpeg (Pass 1) to re-encode video.\n"
+                       "Command was %s" % command)
+
+        if os.path.exists(destinationfile):
+            os.remove(destinationfile)
+
+        pass2 = string.replace(command, "%passno","2")
+        pass2 = string.replace(pass2, "%passlogfile", passLog)
+        write("Pass 2 - " + pass2)
+        result = runCommand(pass2)
+
+        if result!=0:
+            fatalError("Failed while running ffmpeg (Pass 2) to re-encode video.\n"
+                       "Command was %s" % command)
+
+    if deletesourceafterencode==True:
+        os.remove(sourcefile)
+
+
+#############################################################
 # Recombines a video and one or two audio streams back together
 # adding in the NAV packets required to create a DVD
 
@@ -2041 +2114 @@
             write("Failed to generate Project-X cutlist.")
             return False
 
-    pxbasename = os.path.splitext(os.path.basename(file))[0]
-
     if os.path.exists(file) != True:
         write("Error: input file doesn't exist on local filesystem")
         return False
 
+    # Projectx does not like spaces in file names,
+    # create a symbolic link in destination folder.
+    if os.path.exists(os.path.join(folder, "inputfile" )):
+        os.remove(os.path.join(folder, "inputfile" ))
+    os.symlink(file, os.path.join(folder, "inputfile" ))
+
+    file = os.path.join(folder, "inputfile" )
+    pxbasename = "inputfile"
 
     qdestdir = quoteFilename(folder)
     qpxbasename = quoteFilename(pxbasename)
     qfile = quoteFilename(file)
-    qcutlist = os.path.join(folder, "cutlist_x.txt")
+    qcutlist = quoteFilename(os.path.join(folder, "cutlist_x.txt"))
 
     command = path_projectx[0] + " -id %s" % getStreamList(folder)
+
+    if addSubtitles:
+        (txtindex, txtpage) = findTeletextSubtitles(folder, file)
+        createProjectxIni(folder, txtpage)
+        if txtpage != "-1":
+            command += ",%s -ini %s" % (txtindex,os.path.join(folder, "projectx.ini"))
+        else:
+            command += " -ini %s" % (os.path.join(folder, "projectx.ini"))
+
     if usecutlist == True:
         command += " -cut %s -out %s -name %s %s" % (qcutlist, qdestdir, qpxbasename, qfile)
     else:
@@ -2190 +2278 @@
                     else:
                         os.rename(streamFiles[streamIds.index(stream)], os.path.join(folder, "stream1.mp2"))
 
+            if streamFiles[streamIds.index(stream)].endswith(".sup"):
+                write("found subtitle streamID", False)
+                if os.path.exists(streamFiles[streamIds.index(stream)]):
+                    write("found subtitle stream file", False)
+                    os.rename(streamFiles[streamIds.index(stream)], os.path.join(folder, "stream.sup"))
+                    if os.path.exists(streamFiles[streamIds.index(stream)] + ".IFO"):
+                        os.rename(streamFiles[streamIds.index(stream)] + ".IFO", os.path.join(folder, "stream.sup.IFO"))
+                                
     # final chance to find the correct stream files
     if not os.path.exists(os.path.join(folder, "stream.mv2")):
         if os.path.exists(os.path.join(folder, pxbasename + ".m2v")):
@@ -2217 +2313 @@
     write("renameProjectXFiles end -----------------------------------------", False)
 
 #############################################################
+# Run projectx to look for teletext pages that hold subtitles
+
+def findTeletextSubtitles(folder, file):
+
+    # find captions
+    firststreamId = '-1'
+    firstlanguage = "N/A"
+    firstpage = '-1'
+
+    txtstreamId = '-1'
+    txtlanguage = "N/A"
+    txtpage = '-1'
+
+    streamId = '-1'
+    language = "N/A"
+    page = '-1'
+
+    qdestdir = quoteFilename(folder)
+    qfile = quoteFilename(file)
+
+    command = path_projectx[0] + " -out %s -name teletext_temp  %s" % (qdestdir, qfile)
+
+    projectx = popen2.Popen4(command,1)
+    
+    while projectx.poll() == -1:
+        line = projectx.fromchild.readline()
+
+        if len(line) == 0:
+            continue
+        if line.startswith("Teletext:"):
+            # we have found the teletext section
+            while 1:
+                line = projectx.fromchild.readline()
+                if line.startswith("Subpict.:"):
+                    break
+                index = line.find("PID: 0x")
+                if index >= 0:
+                    # found a stream
+                    streamId = line[index + 5:index + 10]
+                    write("Found Teletext stream: %s" % streamId, False)
+                    # get list of available pages
+                    pages = line[index + 11:-1]
+                    # strip trailing )
+                    closebrace = pages.find(")")
+                    if closebrace > 0:
+                        pages = pages[0:closebrace]
+                    # convert into array of pages
+                    pagelist = pages.split()
+    
+                    for pagedetails in pagelist:
+                        # look for caption pages
+                        index = pagedetails.find("_s")
+                        if index > 0:
+                            language = pagedetails[0:index]
+                            page = pagedetails[index+2:index+5]
+                            write("Found %s subtitles in page %s" % (language, page), False)
+                            if firstlanguage == "N/A":
+                                #retain first subtitles as fall back
+                                firstlanguage = language
+                                firstpage = page
+                                firststreamId = streamId
+                            if language == preferredlang1:
+                                txtlanguage = language
+                                txtpage = page
+                                txtstreamId = streamId
+                            else:
+                                if preferredlang1 != preferredlang2:
+                                    if language == preferredlang2 and txtlanguage == "N/A":
+                                        txtlanguage = language
+                                        txtpage = page
+                                        txtstreamId = streamId
+                                
+        if line.startswith("Subpict.:"):
+            break
+
+        if txtlanguage == preferredlang1:
+            break
+
+    if txtlanguage == "N/A":
+        txtlanguage = firstlanguage
+        txtpage = firstpage
+        txtstreamId = firststreamId
+
+    if txtlanguage != "N/A":
+        write("Found %s subtitles in PID: %s, at page %s" % (txtlanguage, txtstreamId, txtpage))
+    else:
+        write("Did not find any teletext subtitles")
+
+    #kill the projectx process, this is all we need from this run
+    os.system("pkill -P %d" % projectx.pid)
+    os.kill(projectx.pid,15)
+    projectx.wait()
+    return (streamId, txtpage)
+
+#############################################################
+# create an ini file 
+
+def createProjectxIni(folder, txtpage):
+    if os.path.exists(os.path.join(folder, "projectx.ini" )):
+        os.remove(os.path.join(folder, "projectx.ini" ))
+    inif = open(os.path.join(folder, "projectx.ini"),"w")
+    
+    if txtpage != "-1":
+        inif.write("SubtitlePanel.TtxPage1=%s\n" % txtpage)
+        inif.write("SubtitlePanel.decodeHiddenRows=0\n")
+    inif.write("SubtitlePanel.SubtitleExportFormat=SUP\n")
+
+    inif.close()
+
+#############################################################
 # convert time stamp to pts
 
 def ts2pts(time):
@@ -4869 +5075 @@
 
     #do we need to re-encode the file to make it DVD compliant?
     if not isFileOkayForDVD(file, folder):
-        if getFileType(folder) == 'nuv':
-            #file is a nuv file which ffmpeg has problems reading so use mythtranscode to pass
-            #the video and audio streams to ffmpeg to do the reencode
-
-            #we need to re-encode the file, make sure we get the right video/audio streams
-            #would be good if we could also split the file at the same time
-            getStreamInformation(mediafile, os.path.join(folder, "streaminfo.xml"), 0)
+        if string.lower(getVideoCodec(folder)) == "mpeg2video": 
+            #we need to demultiplex the file using projectx, 
+            #make sure we get the right video/audio streams,
+            #re-encode the video elementary stream to be dvd complient.
+            getStreamInformation(mediafile, os.path.join(folder, "streaminfo.xml"), 1)
 
             #choose which streams we need
             video, audio1, audio2 = selectStreams(folder)
@@ -4883 +5087 @@
             #choose which aspect ratio we should use
             aspectratio = selectAspectRatio(folder)
 
-            write("Re-encoding audio and video from nuv file")
+            # Run from local file?
+            if file.hasAttribute("localfilename"):
+                mediafile = file.attributes["localfilename"].value
+
+            # now attempt to split the source file into video and audio parts
+            # using projectX
+
+            # If this is a myth recording and there is a cut list available and the 
+            # user wants to use it run projectx to cut out commercials etc
+            if file.attributes["type"].value == "recording":
+                if file.attributes["usecutlist"].value == "1" and getText(infoDOM.getElementsByTagName("hascutlist")[0]) == "yes":
+                    chanid = getText(infoDOM.getElementsByTagName("chanid")[0])
+                    starttime = getText(infoDOM.getElementsByTagName("starttime")[0])
+                    write("File has a cut list - running Project-X to remove unwanted segments")
+                    if not runProjectX(chanid, starttime, folder, True, mediafile):
+                        fatalError("Failed to run Project-X to remove unwanted segments and demux")
+                else:
+                    # no cutlist so just demux this file
+                    chanid = getText(infoDOM.getElementsByTagName("chanid")[0])
+                    starttime = getText(infoDOM.getElementsByTagName("starttime")[0])
+                    write("Using Project-X to demux file")
+                    if not runProjectX(chanid, starttime, folder, False, mediafile):
+                        fatalError("Failed to run Project-X to demux file")
+            else:
+                # just demux this file
+                chanid = -1
+                starttime = -1
+                write("Running Project-X to demux file")
+                if not runProjectX(chanid, starttime, folder, False, mediafile):
+                    fatalError("Failed to run Project-X to demux file")
+
+            write("Re-encoding video")
 
             # what encoding profile should we use
             if file.hasAttribute("encodingprofile"):
@@ -4891 +5126 @@
             else:
                 profile = defaultEncodingProfile
 
-            if file.hasAttribute("localfilename"):
-                mediafile = file.attributes["localfilename"].value
-                chanid = -1
-                starttime = -1
-                usecutlist = -1
-            elif file.attributes["type"].value == "recording":
-                mediafile = -1
-                chanid = getText(infoDOM.getElementsByTagName("chanid")[0])
-                starttime = getText(infoDOM.getElementsByTagName("starttime")[0])
-                usecutlist = (file.attributes["usecutlist"].value == "1" and 
-                            getText(infoDOM.getElementsByTagName("hascutlist")[0]) == "yes")
-            else:
-                chanid = -1
-                starttime = -1
-                usecutlist = -1
-
-            encodeNuvToMPEG2(chanid, starttime, mediafile, os.path.join(folder, "newfile2.mpg"), folder,
-                         profile, usecutlist)
-            mediafile = os.path.join(folder, 'newfile2.mpg')
+            #do the re-encode 
+            encodeVideo(os.path.join(folder, "stream.mv2"), os.path.join(folder, "stream2.mv2"), aspectratio, profile, True)
+            if os.path.exists(os.path.join(folder, "stream2.mv2")):
+                os.rename(os.path.join(folder, "stream2.mv2"), os.path.join(folder, "stream.mv2"))
         else:
-            #we need to re-encode the file, make sure we get the right video/audio streams
-            #would be good if we could also split the file at the same time
-            getStreamInformation(mediafile, os.path.join(folder, "streaminfo.xml"), 0)
+            if getFileType(folder) == 'nuv':
+                #file is a nuv file which ffmpeg has problems reading so use mythtranscode to pass
+                #the video and audio streams to ffmpeg to do the reencode
 
-            #choose which streams we need
-            video, audio1, audio2 = selectStreams(folder)
+                #we need to re-encode the file, make sure we get the right video/audio streams
+                #would be good if we could also split the file at the same time
+                getStreamInformation(mediafile, os.path.join(folder, "streaminfo.xml"), 0)
 
-            #choose which aspect ratio we should use
-            aspectratio = selectAspectRatio(folder)
+                #choose which streams we need
+                video, audio1, audio2 = selectStreams(folder)
 
-            write("Re-encoding audio and video")
+                #choose which aspect ratio we should use
+                aspectratio = selectAspectRatio(folder)
 
-            # Run from local file?
-            if file.hasAttribute("localfilename"):
-                mediafile = file.attributes["localfilename"].value
+                write("Re-encoding audio and video from nuv file")
 
-            # what encoding profile should we use
-            if file.hasAttribute("encodingprofile"):
-                profile = file.attributes["encodingprofile"].value
+                # what encoding profile should we use
+                if file.hasAttribute("encodingprofile"):
+                    profile = file.attributes["encodingprofile"].value
+                else:
+                    profile = defaultEncodingProfile
+
+                if file.hasAttribute("localfilename"):
+                    mediafile = file.attributes["localfilename"].value
+                    chanid = -1
+                    starttime = -1
+                    usecutlist = -1
+                elif file.attributes["type"].value == "recording":
+                    mediafile = -1
+                    chanid = getText(infoDOM.getElementsByTagName("chanid")[0])
+                    starttime = getText(infoDOM.getElementsByTagName("starttime")[0])
+                    usecutlist = (file.attributes["usecutlist"].value == "1" and 
+                                getText(infoDOM.getElementsByTagName("hascutlist")[0]) == "yes")
+                else:
+                    chanid = -1
+                    starttime = -1
+                    usecutlist = -1
+
+                encodeNuvToMPEG2(chanid, starttime, mediafile, os.path.join(folder, "newfile2.mpg"), folder,
+                             profile, usecutlist)
+                mediafile = os.path.join(folder, 'newfile2.mpg')
             else:
-                profile = defaultEncodingProfile
+                #we need to re-encode the file, make sure we get the right video/audio streams
+                #would be good if we could also split the file at the same time
+                getStreamInformation(mediafile, os.path.join(folder, "streaminfo.xml"), 0)
 
-            #do the re-encode 
-            encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video,
-                            audio1, audio2, aspectratio, profile)
-            mediafile = os.path.join(folder, 'newfile2.mpg')
+                #choose which streams we need
+                video, audio1, audio2 = selectStreams(folder)
 
-    #remove an intermediate file
-    if os.path.exists(os.path.join(folder, "newfile1.mpg")):
-        os.remove(os.path.join(folder,'newfile1.mpg'))
+                #choose which aspect ratio we should use
+                aspectratio = selectAspectRatio(folder)
 
-    # the file is now DVD compliant now we need to remove commercials
-    # and split it into video, audio, subtitle parts
+                write("Re-encoding audio and video")
 
-    # find out what streams we have available now
-    getStreamInformation(mediafile, os.path.join(folder, "streaminfo.xml"), 1)
+                # Run from local file?
+                if file.hasAttribute("localfilename"):
+                    mediafile = file.attributes["localfilename"].value
 
-    # choose which streams we need
-    video, audio1, audio2 = selectStreams(folder)
+                # what encoding profile should we use
+                if file.hasAttribute("encodingprofile"):
+                    profile = file.attributes["encodingprofile"].value
+                else:
+                    profile = defaultEncodingProfile
 
-    # now attempt to split the source file into video and audio parts
-    # using projectX
+                #do the re-encode 
+                encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video,
+                                audio1, audio2, aspectratio, profile)
+                mediafile = os.path.join(folder, 'newfile2.mpg')
 
-    # If this is an mpeg2 myth recording and there is a cut list available and the 
-    # user wants to use it run projectx to cut out commercials etc
-    if file.attributes["type"].value == "recording":
-        if file.attributes["usecutlist"].value == "1" and getText(infoDOM.getElementsByTagName("hascutlist")[0]) == "yes":
-            chanid = getText(infoDOM.getElementsByTagName("chanid")[0])
-            starttime = getText(infoDOM.getElementsByTagName("starttime")[0])
-            write("File has a cut list - running Project-X to remove unwanted segments")
-            if not runProjectX(chanid, starttime, folder, True, mediafile):
-                fatalError("Failed to run Project-X to remove unwanted segments and demux")
-        else:
-            # no cutlist so just demux this file
-            chanid = getText(infoDOM.getElementsByTagName("chanid")[0])
-            starttime = getText(infoDOM.getElementsByTagName("starttime")[0])
-            write("Using Project-X to demux file")
+            #remove an intermediate file
+            if os.path.exists(os.path.join(folder, "newfile1.mpg")):
+                os.remove(os.path.join(folder,'newfile1.mpg'))
+
+            # the file is now DVD compliant split it into video and audio parts
+
+            # find out what streams we have available now
+            getStreamInformation(mediafile, os.path.join(folder, "streaminfo.xml"), 1)
+
+            # choose which streams we need
+            video, audio1, audio2 = selectStreams(folder)
+
+            # now attempt to split the source file into video and audio parts
+            # using projectX
+
+            # If this is an mpeg2 myth recording and there is a cut list available and the 
+            # user wants to use it run projectx to cut out commercials etc
+            if file.attributes["type"].value == "recording":
+                # no cutlist so just demux this file
+                chanid = getText(infoDOM.getElementsByTagName("chanid")[0])
+                starttime = getText(infoDOM.getElementsByTagName("starttime")[0])
+                write("Using Project-X to demux file")
+                if not runProjectX(chanid, starttime, folder, False, mediafile):
+                    fatalError("Failed to run Project-X to demux file")
+            else:
+                # just demux this file
+                chanid = -1
+                starttime = -1
+                write("Running Project-X to demux file")
+                if not runProjectX(chanid, starttime, folder, False, mediafile):
+                    fatalError("Failed to run Project-X to demux file")
+
+        
+    else:
+        #remove an intermediate file
+        if os.path.exists(os.path.join(folder, "newfile1.mpg")):
+            os.remove(os.path.join(folder,'newfile1.mpg'))
+
+        # the file is now DVD compliant now we need to remove commercials
+        # and split it into video, audio, subtitle parts
+
+        # find out what streams we have available now
+        getStreamInformation(mediafile, os.path.join(folder, "streaminfo.xml"), 1)
+
+        # choose which streams we need
+        video, audio1, audio2 = selectStreams(folder)
+
+        # now attempt to split the source file into video and audio parts
+        # using projectX
+
+        # If this is an mpeg2 myth recording and there is a cut list available and the 
+        # user wants to use it run projectx to cut out commercials etc
+        if file.attributes["type"].value == "recording":
+            if file.attributes["usecutlist"].value == "1" and getText(infoDOM.getElementsByTagName("hascutlist")[0]) == "yes":
+                chanid = getText(infoDOM.getElementsByTagName("chanid")[0])
+                starttime = getText(infoDOM.getElementsByTagName("starttime")[0])
+                write("File has a cut list - running Project-X to remove unwanted segments")
+                if not runProjectX(chanid, starttime, folder, True, mediafile):
+                    fatalError("Failed to run Project-X to remove unwanted segments and demux")
+            else:
+                # no cutlist so just demux this file
+                chanid = getText(infoDOM.getElementsByTagName("chanid")[0])
+                starttime = getText(infoDOM.getElementsByTagName("starttime")[0])
+                write("Using Project-X to demux file")
+                if not runProjectX(chanid, starttime, folder, False, mediafile):
+                    fatalError("Failed to run Project-X to demux file")
+        else:
+            # just demux this file
+            chanid = -1
+            starttime = -1
+            write("Running Project-X to demux file")
             if not runProjectX(chanid, starttime, folder, False, mediafile):
                 fatalError("Failed to run Project-X to demux file")
-    else:
-        # just demux this file
-        chanid = -1
-        starttime = -1
-        write("Running Project-X to demux file")
-        if not runProjectX(chanid, starttime, folder, False, mediafile):
-            fatalError("Failed to run Project-X to demux file")
 
     # we now have a video stream and one or more audio streams
     # check if we need to convert any of the audio streams to ac3