Ticket #3222: mythburn.py.diff

mythburn.py

@@ -1350 +1350 @@
             fatalError("Failed while running ffmpeg (Pass 2) to re-encode video.\n"
                        "Command was %s" % command)
 
-def encodeNuvToMPEG2(chanid, starttime, destvideofile, folder, profile, usecutlist):
+def encodeNuvToMPEG2(chanid, starttime, mediafile, destvideofile, folder, profile, usecutlist):
     """Encodes a nuv video source file to MPEG2 video and AC3 audio, using mythtranscode & ffmpeg"""
 
     # make sure mythtranscode hasn't left some stale fifos hanging around
@@ -1391 +1391 @@
         if name == "-s":
             outvideores = value
 
-    if (usecutlist == True):
+    if chanid != -1:
+        if (usecutlist == True):
+            PID=os.spawnlp(os.P_NOWAIT, "mythtranscode", "mythtranscode",
+                        '-p', '27',
+                        '-c', chanid,
+                        '-s', starttime,
+                        '--honorcutlist',
+                        '-f', folder)
+            write("mythtranscode started (using cut list) PID = %s" % PID)
+        else:
+            PID=os.spawnlp(os.P_NOWAIT, "mythtranscode", "mythtranscode",
+                        '-p', '27',
+                        '-c', chanid,
+                        '-s', starttime,
+                        '-f', folder)
+
+            write("mythtranscode started PID = %s" % PID)
+    elif mediafile != -1:
         PID=os.spawnlp(os.P_NOWAIT, "mythtranscode", "mythtranscode",
-                    '-p', '27',
-                    '-c', chanid,
-                    '-s', starttime,
-                    '--honorcutlist',
-                    '-f', folder)
-        write("mythtranscode started (using cut list) PID = %s" % PID)
+                '-p', '27',
+                '-i', mediafile,
+                '-f', folder)
+        write("mythtranscode started (using file) PID = %s" % PID)
     else:
-        PID=os.spawnlp(os.P_NOWAIT, "mythtranscode", "mythtranscode",
-                    '-p', '27',
-                    '-c', chanid,
-                    '-s', starttime,
-                    '-f', folder)
-
-        write("mythtranscode started PID = %s" % PID)
+        fatalError("no video source passed to encodeNuvToMPEG2.\n")
 
 
     samplerate, channels = getAudioParams(folder)
@@ -3148 +3157 @@
 
             write("Re-encoding audio and video from nuv file")
 
-            # Run from local file?
-            if file.hasAttribute("localfilename"):
-                mediafile = file.attributes["localfilename"].value
-
             # what encoding profile should we use
             if file.hasAttribute("encodingprofile"):
                 profile = file.attributes["encodingprofile"].value
             else:
                 profile = defaultEncodingProfile
 
-            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")
-
-            #do the re-encode
-            encodeNuvToMPEG2(chanid, starttime, os.path.join(folder, "newfile2.mpg"), folder,
-                             profile, usecutlist)
+            if 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:
             #we need to re-encode the file, make sure we get the right video/audio streams