]> code.delx.au - transcoding/commitdiff
Huge changes to encode.py
authorJames Bunton <jamesbunton@fastmail.fm>
Sat, 6 Sep 2008 06:46:34 +0000 (16:46 +1000)
committerJames Bunton <jamesbunton@fastmail.fm>
Sat, 6 Sep 2008 06:46:34 +0000 (16:46 +1000)
 * encx264.py -> encqt7.py
 * --filters -> --vfilters
 * --afilters for audio filters
 * Handles DVD chapters
 * Can select audio track to encode (only one at the moment)
 * xvid autoaspect option set
 * Higher default audio bitrate

encode.py
encqt7.py [moved from encx264.py with 100% similarity]

index 2dc94a647a61f61b762b6a8631f92ce156ca34b2..67c3f19b3415f02ebf9279feb4b291f3ee781cac 100755 (executable)
--- a/encode.py
+++ b/encode.py
 #!/usr/bin/env python
 
-import optparse, subprocess, sys
-
-codecs = {
-"x264":
-[
-       "mencoder", "%(input)s", "-o", "%(output)s",
-       "-vf", "%(filters)s",
-       "-ovc", "x264", "-x264encopts", "pass=%(pass)d:bitrate=%(vbitrate)d:me=umh:partitions=all:trellis=1:subq=7:bframes=1:direct_pred=auto",
-       "-oac", "faac", "-faacopts", "br=%(abitrate)d:mpeg=4:object=2", "-channels", "2", "-srate", "48000",
-],
-
-"xvid":
-[
-       "mencoder", "%(input)s", "-o", "%(output)s",
-       "-ffourcc", "DX50",
-       "-vf", "%(filters)s",
-       "-ovc", "xvid", "-xvidencopts", "pass=%(pass)d:bitrate=%(vbitrate)d:vhq=4",
-       "-oac", "mp3lame", "-lameopts", "abr:br=%(abitrate)d",
-],
+import commands, optparse, subprocess, sys
+
+
+codec2opts = {
+       "lavc": "-lavcopts",
+       "xvid": "-xvidencopts",
+       "x264": "-x264encopts",
+       "faac": "-faaccopts",
+       "mp3lame": "-lameopts",
+}
+
+class Command(object):
+       def __init__(self, profile, opts):
+               self.profile = profile
+               self.opts = opts
+
+       def insertOptions(self, cmd):
+               def tryOpt(opt, var):
+                       if var:
+                               cmd.append(opt)
+                               cmd.append(var)
+               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("-vf", self.opts.vfilters)
+               tryOpt("-af", self.opts.afilters)
+
+       def substValues(self, cmd):
+               subst = {
+                       "vbitrate": self.opts.vbitrate,
+                       "abitrate": self.opts.abitrate,
+                       "input": self.opts.input,
+                       "output": self.opts.output,
+               }
+
+               return [x % subst for x in cmd]
+       
+       def pass1(self):
+               p = self.profile
+               cmd = []
+               cmd += ["mencoder", "%(input)s", "-o", "/dev/null"]
+               self.insertOptions(cmd)
+               cmd += ["-ovc", p.vcodec, codec2opts[p.vcodec], "pass=1:%s" % p.vopts]
+               cmd += ["-oac", "copy"]
+               cmd = self.substValues(cmd)
+               return cmd
+
+       def pass2(self):
+               p = self.profile
+               cmd = []
+               cmd += ["mencoder", "%(input)s", "-o", "%(output)s"]
+               self.insertOptions(cmd)
+               cmd += ["-ovc", p.vcodec, codec2opts[p.vcodec], "pass=2:%s" % p.vopts]
+               cmd += ["-oac", p.acodec, codec2opts[p.acodec], p.aopts]
+               cmd += self.profile.extra
+               cmd = self.substValues(cmd)
+               return cmd
+
+class Profile(object):
+       def __init__(self, vcodec, vopts, acodec, aopts, extra=[]):
+               self.vcodec = vcodec
+               self.vopts = vopts
+               self.acodec = acodec
+               self.aopts = aopts
+               self.extra = extra
+
+
+profiles = {
+       "qt7" :
+       Profile(
+               vcodec="x264",
+               vopts="bitrate=%(vbitrate)d:me=umh:partitions=all:trellis=1:subq=7:bframes=1:direct_pred=auto",
+               acodec="faac",
+               aopts="br=%(abitrate)d:mpeg=4:object=2",
+       ),
+
+       "xvid" :
+       Profile(
+               vcodec="xvid",
+               vopts="bitrate=%(vbitrate)d:vhq=4:autoaspect",
+               acodec="mp3lame",
+               aopts="abr:br=%(abitrate)d",
+               extra=["-ffourcc", "DX50"],
+       ),
 }
 
 
-def parseArgs():
-       for codec in codecs.keys():
-               if sys.argv[0].find(codec) >= 0:
+def parse_args():
+       for profile_name in profiles.keys():
+               if sys.argv[0].find(profile_name) >= 0:
                        break
        else:
-               codec = "x264"
+               profile_name = "qt7"
 
        parser = optparse.OptionParser(usage="%prog [options] input output")
        parser.add_option("--dvd", action="store", dest="dvd")
-       parser.add_option("--filters", action="store", dest="filters", default="denoise3d")
-       parser.add_option("--vbitrate", action="store", dest="vbitrate", type="int", default=700)
-       parser.add_option("--abitrate", action="store", dest="abitrate", type="int", default=128)
+       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)
+       parser.add_option("--abitrate", action="store", dest="abitrate", type="int", default=192)
        parser.add_option("--chapter", action="store", dest="chapter")
        parser.add_option("--startpos", action="store", dest="startpos")
        parser.add_option("--endpos", action="store", dest="endpos")
        parser.add_option("--audioid", action="store", dest="audioid")
-       parser.add_option("--codec", action="store", dest="codec", default=codec)
+       parser.add_option("--profile", action="store", dest="profile_name", default=profile_name)
        parser.add_option("--dump", action="store_true", dest="dump")
        try:
                opts, (input, output) = parser.parse_args(sys.argv[1:])
@@ -46,49 +114,27 @@ def parseArgs():
                parser.print_usage()
                sys.exit(1)
        
-       return opts, codec, input, output
+       opts.input = input
+       opts.output = output
+       return opts
 
 def run(args, dump):
        if dump:
-               print " ".join(args)
+               print "".join(map(commands.mkarg, args))[1:]
        else:
-               subprocess.Popen(args).wait()
+               return subprocess.Popen(args).wait()
 
 def main():
-       opts, codec, input, output = parseArgs()
+       opts = parse_args()
        try:
-               cmd = codecs[codec]
+               profile = profiles[opts.profile_name]
        except:
-               print >>sys.stderr, "Codec '%s' not found!" % codec
+               print >>sys.stderr, "Profile '%s' not found!" % profile_name
                sys.exit(1)
 
-
-       def insertOpt(opt, var):
-               if var:
-                       cmd.insert(1, var)
-                       cmd.insert(1, opt)
-       insertOpt("-ss", opts.startpos)
-       insertOpt("-endpos", opts.endpos)
-       insertOpt("-dvd-device", opts.dvd)
-       insertOpt("-chapter", opts.chapter)
-       insertOpt("-aid", opts.audioid)
-
-       subst = {
-               "vbitrate": opts.vbitrate,
-               "abitrate": opts.abitrate,
-               "filters": opts.filters,
-               "input": input,
-       }
-
-       # Pass 1
-       subst["pass"] = 1
-       subst["output"] = "/dev/null"
-       run([x % subst for x in cmd], opts.dump)
-
-       # Pass 2
-       subst["pass"] = 2
-       subst["output"] = output
-       run([x % subst for x in cmd], opts.dump)
+       cmd = Command(profile, opts)
+       if run(cmd.pass1(), opts.dump) == 0 or opts.dump:
+               run(cmd.pass2(), opts.dump)
 
 if __name__ == "__main__":
        main()
similarity index 100%
rename from encx264.py
rename to encqt7.py