From: Greg Darke Date: Wed, 26 Nov 2008 04:46:47 +0000 (+1100) Subject: Automated merge with http://delx.net.au/hg/transcoding X-Git-Url: https://code.delx.au/transcoding/commitdiff_plain/13b524fc4eb8ab1243a3fd6ba2b1625b4a2e37ed?hp=0573196acbaf26157aa22042000942bd9b54a7cd Automated merge with http://delx.net.au/hg/transcoding --- diff --git a/batchrun.py b/batchrun.py index ab64380..ae6eef0 100755 --- a/batchrun.py +++ b/batchrun.py @@ -1,14 +1,22 @@ #!/usr/bin/env python -import optparse, shlex, subprocess, sys, itertools +import optparse, shlex, subprocess, os, sys, itertools def parseArgs(): parser = optparse.OptionParser(usage="%prog batchfile1 [batchfile2] ...") + parser.add_option("-j", "--jobs", + action="store", dest="jobs", default=1, type="int", + help="The number of concurrent jobs to run") opts, args = parser.parse_args(sys.argv[1:]) - return args + opts.runningJobs = [] + return opts, args -def run(args): - subprocess.Popen(args).wait() +def run(batchOpts, args): + batchOpts.runningJobs.append(subprocess.Popen(args, stdin=file(os.devnull, 'r'))) + if len(batchOpts.runningJobs) >= batchOpts.jobs: + for job in batchOpts.runningJobs: + job.wait() + batchOpts.runningJobs = [] def getblocks(fd): def _countIndentationLevel(s): @@ -27,13 +35,13 @@ def getblocks(fd): line = line[level:] # Slice off the indentation yield level, line -def batchProcess(fd): +def batchProcess(batchOpts, fd): opts = [] for level, line in getblocks(fd): oldLevel = len(opts) - 1 if level <= oldLevel: - run(itertools.chain(*opts)) + run(batchOpts, itertools.chain(*opts)) opts = opts[:level] # Delete all options that belong to groups that are indented more than this one assert len(opts) == level, 'Seems we missed some options somewhere' @@ -41,13 +49,13 @@ def batchProcess(fd): opts.append(shlex.split(line)) if len(opts) > 0: - run(itertools.chain(*opts)) + run(batchOpts, itertools.chain(*opts)) def main(): - args = parseArgs() + opts, args = parseArgs() for name in args: - batchProcess(open(name)) + batchProcess(opts, open(name)) if __name__ == "__main__": main() diff --git a/encipxv.py b/encipxv.py new file mode 120000 index 0000000..482c483 --- /dev/null +++ b/encipxv.py @@ -0,0 +1 @@ +encode.py \ No newline at end of file diff --git a/encode.py b/encode.py index dbe8c7e..2cc7d00 100755 --- a/encode.py +++ b/encode.py @@ -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", } @@ -58,14 +58,20 @@ class MencoderCommand(object): 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 +100,15 @@ profiles = { 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'] + ), } @@ -119,6 +134,7 @@ def parse_args(): 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 +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): @@ -144,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() diff --git a/ipod_tomp4.sh b/ipod_tomp4.sh old mode 100644 new mode 100755 diff --git a/rotate_args.py b/rotate_args.py new file mode 100755 index 0000000..f229787 --- /dev/null +++ b/rotate_args.py @@ -0,0 +1,37 @@ +#!/usr/bin/env python + +import optparse, subprocess, sys, os + +def parse_args(): + parser = optparse.OptionParser(usage="%prog [options] -- args") + parser.add_option("--program_name", + action="store", dest="program_name", default=None, + help="The name of the executable to run") + parser.add_option("--dump", + action="store_true", dest="dump", + help="Print command that would be run on stdout") + parser.add_option("--count", + action="store", type="int", dest="count", + help="The number of arguments to rotate") + + opts, args = parser.parse_args(sys.argv[1:]) + + opts.args = args + return opts + +def run(args, dump): + if dump: + print "".join(map(commands.mkarg, args))[1:] + else: + return subprocess.Popen(args).wait() + +def main(): + opts = parse_args() + + newcmdline = [opts.program_name] + opts.args[-opts.count:] + opts.args[:-opts.count] + + run(newcmdline, opts.dump) + +if __name__ == "__main__": + main() + diff --git a/tomp4.sh b/tomp4.sh index 2a8e59b..15a2f26 100755 --- a/tomp4.sh +++ b/tomp4.sh @@ -7,6 +7,7 @@ if [ -z "$input" ]; then exit 1 fi +rm -f "$output" && mencoder "$input" -ovc copy -oac copy -of rawvideo -o tmp.h264 && mencoder "$input" -ovc copy -oac copy -of rawaudio -o tmp.aac && MP4Box -add tmp.h264 -add tmp.aac "$output"