Ensure output files do not exist before starting

[transcoding] / encode.py

diff --git a/encode.py b/encode.py
index 57acdfc4c641ae5d8794c01be305fafc5378a5c5..cdc733cf8bc989a6d8bfaf82cd4dda79b3445a32 100755 (executable)
--- a/encode.py
+++ b/encode.py
@@ -26,6 +26,10 @@ class Command(object):
                        return
                if subprocess.Popen(["which", cmd], stdout=open("/dev/null", "w")).wait() != 0:
                        raise FatalException("Command '%s' is required" % cmd)
+       
+       def check_no_file(self, path):
+               if os.path.exists(path):
+                       raise FatalException("Output file '%s' exists." % path)
 
        def do_exec(self, args):
                if self.opts.dump:
@@ -45,6 +49,7 @@ class MP4Box(Command):
        def check(self):
                self.check_command("mencoder")
                self.check_command("MP4Box")
+               self.check_no_file(self.opts.output + ".mp4")
 
        def run(self):
                p = self.profile
@@ -122,6 +127,7 @@ class Mencoder(Command):
 
        def check(self):
                self.check_command("mencoder")
+               self.check_no_file(self.opts.output + ".avi")
 
        def run(self):
                self.do_exec(self.pass1())
@@ -179,10 +185,11 @@ profiles = {
        Profile(
                commands=[Mencoder, MP4Box],
                vcodec="x264",
-               vopts="pass=%(vpass)d:bitrate=%(vbitrate)d:vbv_maxrate=1500:vbv_bufsize=2000:nocabac:me=umh:partitions=all:trellis=1:subq=7:bframes=0:direct_pred=auto:level_idc=30:global_header:turbo",
+               vopts="pass=%(vpass)d:bitrate=%(vbitrate)d:vbv_maxrate=1500:vbv_bufsize=2000:nocabac:me=umh:partitions=all:trellis=1:subq=7:bframes=0:direct_pred=auto:level_idc=30:turbo",
                acodec="faac",
-               aopts="br=%(abitrate)d:mpeg=4:object=2:raw",
-               extra2=["-channels", "2", "-srate", "48000"]
+               aopts="br=%(abitrate)d:mpeg=4:object=2",
+               extra=["-vf-add", "scale=480:-10"],
+               extra2=["-channels", "2", "-srate", "48000"],
        ),
 
        "nokiax264" :
@@ -193,9 +200,9 @@ profiles = {
                        "abitrate": 96,
                },
                vcodec="x264",
-               vopts="pass=%(vpass)d:bitrate=%(vbitrate)d:nocabac:me=umh:partitions=all:trellis=1:subq=7:bframes=0:direct_pred=auto:global_header",
+               vopts="pass=%(vpass)d:bitrate=%(vbitrate)d:nocabac:me=umh:partitions=all:trellis=1:subq=7:bframes=0:direct_pred=auto",
                acodec="faac",
-               aopts="br=%(abitrate)d:mpeg=4:object=2:raw",
+               aopts="br=%(abitrate)d:mpeg=4:object=2",
                extra=["-vf-add", "scale=320:-10"],
        ),
 }