From: Greg Darke <greg+laptop@tsukasa.net.au>
Date: Mon, 8 Sep 2008 08:12:03 +0000 (+1000)
Subject: Merged in the changes from my branch.
X-Git-Url: https://code.delx.au/transcoding/commitdiff_plain/7d026624eacdda9469b061298189409c433bbd23

Merged in the changes from my branch.

  * We now support subtitles in the encoding process
  * You can set options to an empty value
  * You can now encode xvid in an iPod compatiable format
---

diff --git a/encode.py b/encode.py
index 7d24e10..a356fc7 100755
--- a/encode.py
+++ b/encode.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import commands, optparse, subprocess, sys
+import commands, optparse, subprocess, sys, os
 
 class MencoderCommand(object):
 	codec2opts = {
@@ -17,7 +17,7 @@ class MencoderCommand(object):
 
 	def insertOptions(self, cmd):
 		def tryOpt(opt, var):
-			if var:
+			if var is not None:
 				cmd.append(opt)
 				cmd.append(var)
 		tryOpt("-ss", self.opts.startpos)
@@ -25,6 +25,7 @@ class MencoderCommand(object):
 		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("-af", self.opts.afilters)
 
@@ -83,6 +84,14 @@ profiles = {
 		aopts="abr:br=%(abitrate)d",
 		extra=["-ffourcc", "DX50"],
 	),
+	"ipodxvid" :
+	Profile(
+		CommandClass=MencoderCommand,
+		vcodec="xvid",
+		vopts="bitrate=%(vbitrate)d:vhq=4:autoaspect:max_bframes=0",
+		acodec="faac",
+		aopts="br=%(abitrate)d:mpeg=4:object=2",
+	),
 }
 
 
@@ -105,6 +114,7 @@ def parse_args():
 	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("--subtitleid", action="store", dest="subtitleid")
 	parser.add_option("--profile", action="store", dest="profile_name", default=profile_name)
 	parser.add_option("--dump", action="store_true", dest="dump")
 	try: