X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6eecc2f4fcc1e40f9fb093d08271dca3000d4b8d..a34ef895210161a8820e96829ac87806566e7858:/lib/python/Plugins/Extensions/DVDBurn/Process.py

diff --git a/lib/python/Plugins/Extensions/DVDBurn/Process.py b/lib/python/Plugins/Extensions/DVDBurn/Process.py
index 9cca8f70..89ca90fd 100644
--- a/lib/python/Plugins/Extensions/DVDBurn/Process.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/Process.py
@@ -10,8 +10,8 @@ class png2yuvTask(Task):
 		self.dumpFile = outputfile
 		self.weighting = 15
 
-	def run(self, callback, task_progress_changed):
-		Task.run(self, callback, task_progress_changed)
+	def run(self, callback):
+		Task.run(self, callback)
 		self.container.stdoutAvail.remove(self.processStdout)
 		self.container.dumpToFile(self.dumpFile)
 
@@ -26,8 +26,8 @@ class mpeg2encTask(Task):
 		self.inputFile = inputfile
 		self.weighting = 25
 		
-	def run(self, callback, task_progress_changed):
-		Task.run(self, callback, task_progress_changed)
+	def run(self, callback):
+		Task.run(self, callback)
 		self.container.readFromFile(self.inputFile)
 
 	def processOutputLine(self, line):
@@ -42,8 +42,8 @@ class spumuxTask(Task):
 		self.dumpFile = outputfile
 		self.weighting = 15
 
-	def run(self, callback, task_progress_changed):
-		Task.run(self, callback, task_progress_changed)
+	def run(self, callback):
+		Task.run(self, callback)
 		self.container.stdoutAvail.remove(self.processStdout)
 		self.container.dumpToFile(self.dumpFile)
 		self.container.readFromFile(self.inputFile)
@@ -85,23 +85,34 @@ class DemuxTask(Task):
 		title = job.project.titles[job.i]
 		self.global_preconditions.append(DiskspacePrecondition(title.estimatedDiskspace))
 		self.setTool("/usr/bin/projectx")
-		self.generated_files = [ ]
+		self.args += [inputfile, "-demux", "-out", self.job.workspace ]
 		self.end = 300
 		self.prog_state = 0
 		self.weighting = 1000
 		self.cutfile = self.job.workspace + "/cut_%d.Xcl" % (job.i+1)
 		self.cutlist = title.cutlist
-		self.args += [inputfile, "-demux", "-out", self.job.workspace ]
+		self.currentPID = None
+		self.relevantAudioPIDs = [ ]
+		self.getRelevantAudioPIDs(title)
+		self.generated_files = [ ]
+		self.mplex_streamfiles = [ ]
 		if len(self.cutlist) > 1:
 			self.args += [ "-cut", self.cutfile ]
 
 	def prepare(self):
 		self.writeCutfile()
 
+	def getRelevantAudioPIDs(self, title):
+		for audiotrack in title.properties.audiotracks:
+			if audiotrack.active.getValue():
+				self.relevantAudioPIDs.append(audiotrack.pid.getValue())
+
 	def processOutputLine(self, line):
 		line = line[:-1]
 		MSG_NEW_FILE = "---> new File: "
 		MSG_PROGRESS = "[PROGRESS] "
+		MSG_NEW_MP2 = "--> MPEG Audio (0x"
+		MSG_NEW_AC3 = "--> AC-3/DTS Audio on PID "
 
 		if line.startswith(MSG_NEW_FILE):
 			file = line[len(MSG_NEW_FILE):]
@@ -111,10 +122,14 @@ class DemuxTask(Task):
 		elif line.startswith(MSG_PROGRESS):
 			progress = line[len(MSG_PROGRESS):]
 			self.haveProgress(progress)
+		elif line.startswith(MSG_NEW_MP2) or line.startswith(MSG_NEW_AC3):
+			self.currentPID = str(int(line.rstrip()[-6:].rsplit('0x',1)[-1],16))
 
 	def haveNewFile(self, file):
-		print "PRODUCED FILE [%s]" % file
+		print "[DemuxTask] produced file:", file, self.currentPID
 		self.generated_files.append(file)
+		if self.currentPID in self.relevantAudioPIDs or file.endswith("m2v"):
+			self.mplex_streamfiles.append(file)
 
 	def haveProgress(self, progress):
 		#print "PROGRESS [%s]" % progress
@@ -131,7 +146,6 @@ class DemuxTask(Task):
 				if p > self.progress:
 					self.progress = p
 			except ValueError:
-				print "val error"
 				pass
 
 	def writeCutfile(self):
@@ -151,8 +165,8 @@ class DemuxTask(Task):
 	def cleanup(self, failed):
 		if failed:
 			import os
-			for f in self.generated_files:
-				os.remove(f)
+			for file in self.generated_files.itervalues():
+				os.remove(file)
 
 class MplexTaskPostcondition(Condition):
 	def check(self, task):
@@ -185,9 +199,9 @@ class MplexTask(Task):
 		# we don't want the ReturncodePostcondition in this case because for right now we're just gonna ignore the fact that mplex fails with a buffer underrun error on some streams (this always at the very end)
 
 	def prepare(self):
-		self.error = None			
+		self.error = None
 		if self.demux_task:
-			self.args += self.demux_task.generated_files
+			self.args += self.demux_task.mplex_streamfiles
 
 	def processOutputLine(self, line):
 		print "[MplexTask] ", line[:-1]
@@ -206,13 +220,13 @@ class RemoveESFiles(Task):
 
 	def prepare(self):
 		self.args += ["-f"]
-		self.args += self.demux_task.generated_files
+		self.args += self.demux_task.generated_files.values()
 		self.args += [self.demux_task.cutfile]
 
 class DVDAuthorTask(Task):
 	def __init__(self, job):
 		Task.__init__(self, job, "Authoring DVD")
-		self.weighting = 300
+		self.weighting = 20
 		self.setTool("/usr/bin/dvdauthor")
 		self.CWD = self.job.workspace
 		self.args += ["-x", self.job.workspace+"/dvdauthor.xml"]
@@ -222,6 +236,14 @@ class DVDAuthorTask(Task):
 		print "[DVDAuthorTask] ", line[:-1]
 		if not self.menupreview and line.startswith("STAT: Processing"):
 			self.callback(self, [], stay_resident=True)
+		elif line.startswith("STAT: VOBU"):
+			try:
+				progress = int(line.split("MB")[0].split(" ")[-1])
+				if progress:
+					self.job.mplextask.progress = progress
+					print "[DVDAuthorTask] update mplextask progress:", self.job.mplextask.progress, "of", self.job.mplextask.end
+			except:
+				print "couldn't set mux progress"
 
 class DVDAuthorFinalTask(Task):
 	def __init__(self, job):
@@ -233,7 +255,7 @@ class WaitForResidentTasks(Task):
 	def __init__(self, job):
 		Task.__init__(self, job, "waiting for dvdauthor to finalize")
 		
-	def run(self, callback, task_progress_changed):
+	def run(self, callback):
 		print "waiting for %d resident task(s) %s to finish..." % (len(self.job.resident_tasks),str(self.job.resident_tasks))
 		if self.job.resident_tasks == 0:
 			callback(self, [])
@@ -334,23 +356,24 @@ class RemoveDVDFolder(Task):
 class CheckDiskspaceTask(Task):
 	def __init__(self, job):
 		Task.__init__(self, job, "Checking free space")
-		totalsize = 50*1024*1024 # require an extra safety 50 MB
+		totalsize = 0 # require an extra safety 50 MB
 		maxsize = 0
 		for title in job.project.titles:
 			titlesize = title.estimatedDiskspace
 			if titlesize > maxsize: maxsize = titlesize
 			totalsize += titlesize
 		diskSpaceNeeded = totalsize + maxsize
+		job.estimateddvdsize = totalsize / 1024 / 1024
+		totalsize += 50*1024*1024 # require an extra safety 50 MB
 		self.global_preconditions.append(DiskspacePrecondition(diskSpaceNeeded))
 		self.weighting = 5
 
-	def run(self, callback, task_progress_changed):
+	def run(self, callback):
 		failed_preconditions = self.checkPreconditions(True) + self.checkPreconditions(False)
 		if len(failed_preconditions):
 			callback(self, failed_preconditions)
 			return
 		self.callback = callback
-		self.task_progress_changed = task_progress_changed
 		Task.processFinished(self, 0)
 
 class PreviewTask(Task):
@@ -361,9 +384,8 @@ class PreviewTask(Task):
 		self.path = path
 		self.weighting = 10
 
-	def run(self, callback, task_progress_changed):
+	def run(self, callback):
 		self.callback = callback
-		self.task_progress_changed = task_progress_changed
 		if self.job.menupreview:
 			self.previewProject()
 		else:
@@ -403,27 +425,6 @@ class PreviewTaskPostcondition(Condition):
 	def getErrorMessage(self, task):
 		return "Cancel"
 
-def formatTitle(template, title, track):
-	template = template.replace("$i", str(track))
-	template = template.replace("$t", title.name)
-	template = template.replace("$d", title.descr)
-	template = template.replace("$c", str(len(title.chaptermarks)+1))
-	template = template.replace("$A", str(title.audiotracks))
-	template = template.replace("$f", title.inputfile)
-	template = template.replace("$C", title.channel)
-	l = title.length
-	lengthstring = "%d:%02d:%02d" % (l/3600, l%3600/60, l%60)
-	template = template.replace("$l", lengthstring)
-	if title.timeCreate:
-		template = template.replace("$Y", str(title.timeCreate[0]))
-		template = template.replace("$M", str(title.timeCreate[1]))
-		template = template.replace("$D", str(title.timeCreate[2]))
-		timestring = "%d:%02d" % (title.timeCreate[3], title.timeCreate[4])
-		template = template.replace("$T", timestring)
-	else:
-		template = template.replace("$Y", "").replace("$M", "").replace("$D", "").replace("$T", "")
-	return template.decode("utf-8")
-
 class ImagingPostcondition(Condition):
 	def check(self, task):
 		return task.returncode == 0
@@ -439,9 +440,8 @@ class ImagePrepareTask(Task):
 		self.job = job
 		self.Menus = job.Menus
 		
-	def run(self, callback, task_progress_changed):			
+	def run(self, callback):
 		self.callback = callback
-		self.task_progress_changed = task_progress_changed
 		# we are doing it this weird way so that the TaskView Screen actually pops up before the spinner comes
 		from enigma import eTimer
 		self.delayTimer = eTimer()
@@ -451,7 +451,7 @@ class ImagePrepareTask(Task):
 	def conduct(self):
 		try:
 			from ImageFont import truetype
-			from Image import open as Image_open		
+			from Image import open as Image_open
 			s = self.job.project.settings
 			self.Menus.im_bg_orig = Image_open(s.menubg.getValue())
 			if self.Menus.im_bg_orig.size != (self.Menus.imgwidth, self.Menus.imgheight):
@@ -475,9 +475,8 @@ class MenuImageTask(Task):
 		self.menubgpngfilename = menubgpngfilename
 		self.highlightpngfilename = highlightpngfilename
 
-	def run(self, callback, task_progress_changed):
+	def run(self, callback):
 		self.callback = callback
-		self.task_progress_changed = task_progress_changed
 		try:
 			import ImageDraw, Image, os
 			s = self.job.project.settings
@@ -512,14 +511,13 @@ class MenuImageTask(Task):
 				menu_end_title = nr_titles+1
 			menu_i = 0
 			for title_no in range( menu_start_title , menu_end_title ):
-				i = title_no-1
-				top = s_top + ( menu_i * rowheight )
 				menu_i += 1
-				title = self.job.project.titles[i]
-				titleText = formatTitle(s.titleformat.getValue(), title, title_no)
+				title = self.job.project.titles[title_no-1]
+				top = s_top + ( menu_i * rowheight )
+				titleText = title.formatDVDmenuText(s.titleformat.getValue(), title_no).decode("utf-8")
 				draw_bg.text((s_left,top), titleText, fill=self.Menus.color_button, font=fonts[1])
 				draw_high.text((s_left,top), titleText, fill=1, font=self.Menus.fonts[1])
-				subtitleText = formatTitle(s.subtitleformat.getValue(), title, title_no)
+				subtitleText = title.formatDVDmenuText(s.subtitleformat.getValue(), title_no).decode("utf-8")
 				draw_bg.text((s_left,top+36), subtitleText, fill=self.Menus.color_button, font=fonts[2])
 				bottom = top+rowheight
 				if bottom > self.Menus.imgheight:
@@ -601,7 +599,7 @@ class Menus:
 			menuoutputfilename = job.workspace+"/dvdmenu"+num+".mpg"
 			spumuxTask(job, spuxmlfilename, menubgmpgfilename, menuoutputfilename)
 		
-def CreateAuthoringXML(job):
+def CreateAuthoringXML_singleset(job):
 	nr_titles = len(job.project.titles)
 	mode = job.project.settings.authormode.getValue()
 	authorxml = []
@@ -643,9 +641,7 @@ def CreateAuthoringXML(job):
 		authorxml.append('   </menus>\n')
 	authorxml.append('   <titles>\n')
 	for i in range( nr_titles ):
-		#for audiotrack in job.project.titles[i].audiotracks:
-			#authorxml.append('    <audio lang="'+audiotrack[0][:2]+'" format="'+audiotrack[1]+'" />\n')
-		chapters = ','.join(["%d:%02d:%02d.%03d" % (p / (90000 * 3600), p % (90000 * 3600) / (90000 * 60), p % (90000 * 60) / 90000, (p % 90000) / 90) for p in job.project.titles[i].chaptermarks])
+		chapters = ','.join(job.project.titles[i].getChapterMarks())
 		title_no = i+1
 		title_filename = job.workspace + "/dvd_title_%d.mpg" % (title_no)
 		if job.menupreview:
@@ -671,6 +667,84 @@ def CreateAuthoringXML(job):
 		f.write(x)
 	f.close()
 
+def CreateAuthoringXML_multiset(job):
+	nr_titles = len(job.project.titles)
+	mode = job.project.settings.authormode.getValue()
+	authorxml = []
+	authorxml.append('<?xml version="1.0" encoding="utf-8"?>\n')
+	authorxml.append(' <dvdauthor dest="' + (job.workspace+"/dvd") + '" jumppad="yes">\n')
+	authorxml.append('  <vmgm>\n')
+	authorxml.append('   <menus>\n')
+	authorxml.append('    <video aspect="4:3"/>\n')
+	if mode.startswith("menu"):
+		for menu_count in range(1 , job.nr_menus+1):
+			authorxml.append('    <pgc>\n')
+			menu_start_title = (menu_count-1)*job.titles_per_menu + 1
+			menu_end_title = (menu_count)*job.titles_per_menu + 1
+			if menu_end_title > nr_titles:
+				menu_end_title = nr_titles+1
+			for i in range( menu_start_title , menu_end_title ):
+				authorxml.append('     <button name="button' + (str(i).zfill(2)) + '"> jump titleset ' + str(i) +' title 1; </button>\n')
+			if menu_count > 1:
+				authorxml.append('     <button name="button_prev"> jump menu ' + str(menu_count-1) + '; </button>\n')
+			if menu_count < job.nr_menus:
+				authorxml.append('     <button name="button_next"> jump menu ' + str(menu_count+1) + '; </button>\n')
+			menuoutputfilename = job.workspace+"/dvdmenu"+str(menu_count)+".mpg"
+			authorxml.append('     <vob file="' + menuoutputfilename + '" pause="inf"/>\n')
+			authorxml.append('    </pgc>\n')
+	else:
+		authorxml.append('    <pgc>\n')
+		authorxml.append('     <vob file="' + job.project.settings.vmgm.getValue() + '" />\n' )
+		authorxml.append('     <post> jump titleset 1 title 1; </post>\n')
+		authorxml.append('    </pgc>\n')
+	authorxml.append('   </menus>\n')
+	authorxml.append('  </vmgm>\n')
+
+	for i in range( nr_titles ):
+		title = job.project.titles[i]
+		authorxml.append('  <titleset>\n')
+		authorxml.append('   <titles>\n')
+		for audiotrack in title.properties.audiotracks:
+			active = audiotrack.active.getValue()
+			if active:
+				format = audiotrack.format.getValue()
+				language = audiotrack.language.getValue()
+				audio_tag = '    <audio format="%s"' % format
+				if language != "nolang":
+					audio_tag += ' lang="%s"' % language
+				audio_tag += ' />\n'
+				authorxml.append(audio_tag)
+		aspect = title.properties.aspect.getValue()
+		video_tag = '    <video aspect="'+aspect+'"'
+		if title.properties.widescreen.getValue() == "4:3":
+			video_tag += ' widescreen="'+title.properties.widescreen.getValue()+'"'
+		video_tag += ' />\n'
+		authorxml.append(video_tag)
+		chapters = ','.join(title.getChapterMarks())
+		title_no = i+1
+		title_filename = job.workspace + "/dvd_title_%d.mpg" % (title_no)
+		if job.menupreview:
+			LinkTS(job, job.project.settings.vmgm.getValue(), title_filename)
+		else:
+			MakeFifoNode(job, title_no)
+		if mode.endswith("linked") and title_no < nr_titles:
+			post_tag = "jump titleset %d title 1;" % ( title_no+1 )
+		elif mode.startswith("menu"):
+			post_tag = "call vmgm menu 1;"
+		else:	post_tag = ""
+
+		authorxml.append('    <pgc>\n')
+		authorxml.append('     <vob file="' + title_filename + '" chapters="' + chapters + '" />\n')
+		authorxml.append('     <post> ' + post_tag + ' </post>\n')
+		authorxml.append('    </pgc>\n')
+		authorxml.append('   </titles>\n')
+		authorxml.append('  </titleset>\n')
+	authorxml.append(' </dvdauthor>\n')
+	f = open(job.workspace+"/dvdauthor.xml", "w")
+	for x in authorxml:
+		f.write(x)
+	f.close()
+
 def getISOfilename(isopath, volName):
 	from Tools.Directories import fileExists
 	i = 0
@@ -697,7 +771,10 @@ class DVDJob(Job):
 		CheckDiskspaceTask(self)
 		if self.project.settings.authormode.getValue().startswith("menu") or self.menupreview:
 			Menus(self)
-		CreateAuthoringXML(self)
+		if self.project.settings.titlesetmode.getValue() == "multi":
+			CreateAuthoringXML_multiset(self)
+		else:
+			CreateAuthoringXML_singleset(self)
 
 		DVDAuthorTask(self)
 		
@@ -707,13 +784,14 @@ class DVDJob(Job):
 			PreviewTask(self, self.workspace + "/dvd/VIDEO_TS/")
 		else:
 			for self.i in range(nr_titles):
-				title = self.project.titles[self.i]
+				self.title = self.project.titles[self.i]
 				link_name =  self.workspace + "/source_title_%d.ts" % (self.i+1)
 				title_filename = self.workspace + "/dvd_title_%d.mpg" % (self.i+1)
-				LinkTS(self, title.inputfile, link_name)
+				LinkTS(self, self.title.inputfile, link_name)
 				demux = DemuxTask(self, link_name)
-				MplexTask(self, outputfile=title_filename, demux_task=demux)
-				RemoveESFiles(self, demux)
+				self.mplextask = MplexTask(self, outputfile=title_filename, demux_task=demux)
+				self.mplextask.end = self.estimateddvdsize
+				#RemoveESFiles(self, demux)
 			WaitForResidentTasks(self)
 			PreviewTask(self, self.workspace + "/dvd/VIDEO_TS/")
 			output = self.project.settings.output.getValue()