Automated merge with http://delx.net.au/hg/transcoding

[transcoding] / encode.py

diff --git a/encode.py b/encode.py
index fc3b7c8944cbee01ed5c00aa874121a96422052c..2cc7d00006f1a189d2998fdeaf58f7fb90c53fe3 100755 (executable)
--- a/encode.py
+++ b/encode.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import commands, optparse, subprocess, sys, os
+import commands, optparse, subprocess, sys, os, tempfile, shutil
 
 class MencoderCommand(object):
        codec2opts = {
@@ -20,13 +20,15 @@ class MencoderCommand(object):
                        if var is not None:
                                cmd.append(opt)
                                cmd.append(var)
+               if self.opts.deinterlace:
+                       cmd += ["-vf-add", "pp=ci"]
                tryOpt("-ss", self.opts.startpos)
                tryOpt("-endpos", self.opts.endpos)
                tryOpt("-dvd-device", self.opts.dvd)
                tryOpt("-chapter", self.opts.chapter)
                tryOpt("-aid", self.opts.audioid)
                tryOpt("-sid", self.opts.subtitleid)
-               tryOpt("-vf", self.opts.vfilters)
+               tryOpt("-vf-add", self.opts.vfilters)
                tryOpt("-af", self.opts.afilters)
 
        def substValues(self, cmd):
@@ -121,6 +123,7 @@ def parse_args():
 
        parser = optparse.OptionParser(usage="%prog [options] input output")
        parser.add_option("--dvd", action="store", dest="dvd")
+       parser.add_option("--deinterlace", action="store_true", dest="deinterlace")
        parser.add_option("--vfilters", action="store", dest="vfilters")
        parser.add_option("--afilters", action="store", dest="afilters")
        parser.add_option("--vbitrate", action="store", dest="vbitrate", type="int", default=1000)
@@ -139,8 +142,14 @@ def parse_args():
                parser.print_usage()
                sys.exit(1)
        
-       opts.input = input
-       opts.output = output
+       if '://' not in input:
+               opts.input = os.path.join(os.getcwd(), input)
+       else:
+               if opts.dvd:
+                       opts.dvd = os.path.join(os.getcwd(), opts.dvd)
+               opts.input = input
+
+       opts.output = os.path.join(os.getcwd(), output)
        return opts
 
 def run(args, dump):
@@ -157,9 +166,15 @@ def main():
                print >>sys.stderr, "Profile '%s' not found!" % profile_name
                sys.exit(1)
 
-       cmd = profile.CommandClass(profile, opts)
-       if run(cmd.pass1(), opts.dump) == 0 or opts.dump:
-               run(cmd.pass2(), opts.dump)
+       tempdir = tempfile.mkdtemp()
+       try:
+               os.chdir(tempdir)
+               cmd = profile.CommandClass(profile, opts)
+               if run(cmd.pass1(), opts.dump) == 0 or opts.dump:
+                       run(cmd.pass2(), opts.dump)
+       finally:
+               os.chdir('/')
+               shutil.rmtree(tempdir)
 
 if __name__ == "__main__":
        main()