git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
servicemp3.cpp: more simple/flexible streaming detection
[enigma2.git]
/
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 b64541b650936e1960000f26c8cba3fc30001bb6..a928ae202191bde217ee1e0f4e2f06fe2564a823 100644
(file)
--- a/
lib/python/Plugins/Extensions/DVDBurn/Process.py
+++ b/
lib/python/Plugins/Extensions/DVDBurn/Process.py
@@
-85,7
+85,7
@@
class DemuxTask(Task):
title = job.project.titles[job.i]
self.global_preconditions.append(DiskspacePrecondition(title.estimatedDiskspace))
self.setTool("projectx")
title = job.project.titles[job.i]
self.global_preconditions.append(DiskspacePrecondition(title.estimatedDiskspace))
self.setTool("projectx")
- self.args += [inputfile, "-demux", "-out", self.job.workspace ]
+ self.args += [inputfile, "-demux", "-
set", "ExportPanel.Streamtype.Subpicture=0", "-set", "ExportPanel.Streamtype.Teletext=0", "-
out", self.job.workspace ]
self.end = 300
self.prog_state = 0
self.weighting = 1000
self.end = 300
self.prog_state = 0
self.weighting = 1000
@@
-95,6
+95,8
@@
class DemuxTask(Task):
self.relevantAudioPIDs = [ ]
self.getRelevantAudioPIDs(title)
self.generated_files = [ ]
self.relevantAudioPIDs = [ ]
self.getRelevantAudioPIDs(title)
self.generated_files = [ ]
+ self.mplex_audiofiles = { }
+ self.mplex_videofile = ""
self.mplex_streamfiles = [ ]
if len(self.cutlist) > 1:
self.args += [ "-cut", self.cutfile ]
self.mplex_streamfiles = [ ]
if len(self.cutlist) > 1:
self.args += [ "-cut", self.cutfile ]
@@
-132,8
+134,10
@@
class DemuxTask(Task):
def haveNewFile(self, file):
print "[DemuxTask] produced file:", file, self.currentPID
self.generated_files.append(file)
def haveNewFile(self, 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)
+ if self.currentPID in self.relevantAudioPIDs:
+ self.mplex_audiofiles[self.currentPID] = file
+ elif file.endswith("m2v"):
+ self.mplex_videofile = file
def haveProgress(self, progress):
#print "PROGRESS [%s]" % progress
def haveProgress(self, progress):
#print "PROGRESS [%s]" % progress
@@
-167,6
+171,13
@@
class DemuxTask(Task):
f.close()
def cleanup(self, failed):
f.close()
def cleanup(self, failed):
+ print "[DemuxTask::cleanup]"
+ self.mplex_streamfiles = [ self.mplex_videofile ]
+ for pid in self.relevantAudioPIDs:
+ if pid in self.mplex_audiofiles:
+ self.mplex_streamfiles.append(self.mplex_audiofiles[pid])
+ print self.mplex_streamfiles
+
if failed:
import os
for file in self.generated_files:
if failed:
import os
for file in self.generated_files: