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

diff --combined encode.py
index dbe8c7ee859a2a5db46d5131ab1447b1c3bc87d2,f56eb545e86aa3d3e2be0ca548e4c5b54ee5dd38..2cc7d00006f1a189d2998fdeaf58f7fb90c53fe3
--- 1/encode.py
--- 2/encode.py
+++ b/encode.py
@@@ -1,13 -1,13 +1,13 @@@
  #!/usr/bin/env python
  
- import commands, optparse, subprocess, sys, os
+ import commands, optparse, subprocess, sys, os, tempfile, shutil
  
  class MencoderCommand(object):
        codec2opts = {
                "lavc": "-lavcopts",
                "xvid": "-xvidencopts",
                "x264": "-x264encopts",
-               "faac": "-faaccopts",
+               "faac": "-faacopts",
                "mp3lame": "-lameopts",
        }
  
@@@ -20,15 -20,13 +20,15 @@@
                        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):
@@@ -58,14 -56,20 +58,20 @@@
                self.insertOptions(cmd)
                cmd += ["-ovc", p.vcodec, self.codec2opts[p.vcodec], "pass=2:"+p.vopts]
                cmd += ["-oac", p.acodec, self.codec2opts[p.acodec], p.aopts]
+               if self.opts.episode_name:
+                       cmd += ["-info", "name='%s'" % self.opts.episode_name]
                cmd += self.profile.extra
                cmd = self.substValues(cmd)
                return cmd
  
  class Profile(object):
        def __init__(self, CommandClass, **kwargs):
+               self.extra = []
+ 
                self.CommandClass = CommandClass
                self.__dict__.update(kwargs)
+       def __contains__(self, keyname):
+               return hasattr(self, keyname)
  
  profiles = {
        "qt7" :
@@@ -94,6 -98,15 +100,15 @@@
                acodec="faac",
                aopts="br=%(abitrate)d:mpeg=4:object=2",
        ),
+       "ipod264" :
+       Profile(
+               CommandClass=MencoderCommand,
+               vcodec="x264",
+               vopts="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",
+               acodec="faac",
+               aopts="br=%(abitrate)d:mpeg=4:object=2:raw",
+               extra=['-of', 'lavf', '-lavfopts', 'format=mp4', '-channels', '2', '-srate', '48000']
+       ),
  }
  
  
@@@ -108,7 -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)
@@@ -119,6 -131,7 +134,7 @@@
        parser.add_option("--audioid", action="store", dest="audioid")
        parser.add_option("--subtitleid", action="store", dest="subtitleid")
        parser.add_option("--profile", action="store", dest="profile_name", default=profile_name)
+       parser.add_option("--episode-name", action="store", dest="episode_name")
        parser.add_option("--dump", action="store_true", dest="dump")
        try:
                opts, (input, output) = parser.parse_args(sys.argv[1:])
@@@ -126,8 -139,14 +142,14 @@@
                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):
@@@ -144,9 -163,15 +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()