do_opt = partial(append_cmd, cmd)
if o.deinterlace:
- cmd += ["-vf-add", "yadif"]
- if o.detelecine:
- cmd += ["-vf-add", "pullup,softskip"]
+ cmd += ["-vf-pre", "yadif"]
if o.noskip:
cmd += ["-noskip"]
if o.skipkb:
do_opt("-chapter", o.chapter)
do_opt("-aid", o.audioid)
do_opt("-sid", o.subtitleid)
- do_opt("-vf-add", o.vfilters)
+ do_opt("-vf", o.vfilters)
do_opt("-af-add", o.afilters)
cmd += ["-vo", "yuv4mpeg:file=video.y4m"]
cmd += ["-ao", "pcm:waveheader:file=audio.wav"]
insert_mplayer_options(cmd, self.opts)
- cmd += self.profile.extra
+ cmd += self.profile.mplayeropts
self.do_exec(cmd, wait=False)
+class MencoderCopyAC3(Command):
+ def init(self):
+ self.check_command("mplayer")
+ self.check_no_file("audio.ac3")
+ self.profile.audio_tmp = "audio.ac3"
+
+ def run(self):
+ cmd = []
+ cmd += ["mencoder", self.opts.input]
+ cmd += ["-noconfig", "all"]
+ cmd += ["-ovc", "copy", "-oac", "copy"]
+ cmd += ["-of", "rawaudio", "-o", "audio.ac3"]
+ insert_mplayer_options(cmd, self.opts)
+ self.do_exec(cmd)
+
+
class X264(Command):
def init(self):
self.check_command("x264")
p.video_tmp = o.output + ".avi"
p.audio_tmp = o.output + ".avi"
- if o.deinterlace and o.detelecine:
- raise FatalException("Cannot use --detelecine with --deinterlace")
-
def run(self):
o = self.opts
p = self.profile
cmd = []
cmd += ["mencoder", o.input]
+ cmd += ["-noconfig", "all"]
insert_mplayer_options(cmd, o)
cmd += ["-vf-add", "harddup"]
cmd += ["-ovc", p.vcodec, self.codec2opts[p.vcodec], p.vopts]
cmd += ["-oac", p.acodec]
if p.aopts:
cmd += [self.codec2opts[p.acodec], p.aopts]
- cmd += self.profile.extra
+ cmd += self.profile.mplayeropts
cmd += ["-o", self.opts.output + ".avi"]
self.do_exec(cmd)
p = self.profile
cmd = ["mencoder", "-ovc", "copy", "-oac", "copy", o.output + ".avi"]
+ cmd += ["-noconfig", "all", "-noskip", "-mc", "0"]
self.do_exec(cmd + ["-of", "rawaudio", "-o", p.audio_tmp])
self.do_exec(cmd + ["-of", "rawvideo", "-o", p.video_tmp])
self.do_exec(["rm", "-f", o.output + ".avi"])
class Profile(object):
def __init__(self, commands, **kwargs):
- self.extra = []
self.commands = commands
self.__dict__.update(kwargs)
profiles = {
- "x264" :
+ "x264/lame" :
Profile(
commands=[MPlayer, X264, Lame, Wait, MKVMerge],
- x264opts=["--preset", "veryslow", "--crf", "19"],
- lameopts=["--preset", "extreme"],
+ mplayeropts=[],
+ x264opts=["--preset", "veryslow", "--crf", "20"],
+ lameopts=["--preset", "medium"],
),
- "xvid" :
+ "x264/copyac3" :
+ Profile(
+ commands=[MPlayer, X264, Wait, MencoderCopyAC3, MKVMerge],
+ mplayeropts=["-nosound"],
+ x264opts=["--preset", "veryslow", "--crf", "20"],
+ ),
+
+ "xvid/lame" :
Profile(
commands=[Mencoder],
+ mplayeropts=["-ffourcc", "DX50"],
vcodec="xvid",
vopts="fixed_quant=2:vhq=4:autoaspect",
acodec="mp3lame",
"apple-quicktime" :
Profile(
commands=[MPlayer, X264, Faac, Wait, MP4Box],
- x264opts=["--crf", "19", "--bframes", "1"],
+ mplayeropts=[],
+ x264opts=["--crf", "20", "--bframes", "1"],
faacopts=["-q", "100", "--mpeg-vers", "4"],
),
"nokia-n97" :
Profile(
commands=[Mencoder, MencoderDemux, MP4Box],
+ mplayeropts=["-vf-add", "scale=640:-10"],
vcodec="xvid",
- vopts="bitrate=256:vhq=4:autoaspect:max_bframes=0",
+ vopts="bitrate=384:vhq=4:autoaspect:max_bframes=0",
acodec="faac",
aopts="br=64:mpeg=4:object=2",
- extra=["-vf-add", "scale=640:-10"],
),
}
+mappings = {
+ "x264": "x264/lame",
+ "xvid": "xvid/lame",
+}
+for x, y in mappings.iteritems():
+ profiles[x] = profiles[y]
+
if sys.argv[0].find(profile_name) >= 0:
break
else:
- profile_name = "xvid"
+ profile_name = "xvid/lame"
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("--detelecine", action="store_true", dest="detelecine")
parser.add_option("--fixmux", action="store_true", dest="fixmux")
parser.add_option("--mc", action="store", dest="mc", type="int")
parser.add_option("--noskip", action="store_true", dest="noskip")