X-Git-Url: https://code.delx.au/transcoding/blobdiff_plain/2353339b5b909c9c273e470b0f860f242168b6c4..fbb2d992b825bdcecbfd0da160170f36be81a8b1:/encode.py diff --git a/encode.py b/encode.py index 31b765f..fceca41 100755 --- a/encode.py +++ b/encode.py @@ -67,15 +67,37 @@ class MP4Box(Command): def run(self): p = self.profile - video = "video.%s" % self.codec2exts[p.vcodec] - audio = "audio.%s" % self.codec2exts[p.acodec] input = self.opts.output + ".avi" # From Mencoder command output = self.opts.output + ".mp4" + + # Check FPS + fps = "???" + if not self.opts.dump: + process = subprocess.Popen( + ["mplayer", "-frames", "0", "-identify", input], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + ) + for line in process.stdout: + try: + key, value = line.split("=") + except ValueError: + continue + if key == "ID_VIDEO_FPS": + fps = value + + # Strip out video & audio + video = "video.%s" % self.codec2exts[p.vcodec] + audio = "audio.%s" % self.codec2exts[p.acodec] mencoder = ["mencoder", input, "-ovc", "copy", "-oac", "copy", "-of"] self.do_exec(["rm", "-f", output]) self.do_exec(mencoder + ["rawvideo", "-o", video]) self.do_exec(mencoder + ["rawaudio", "-o", audio]) - self.do_exec(["MP4Box", "-add", video, "-add", audio, output]) + + # Mux them back together + self.do_exec(["MP4Box", "-add", video, "-add", audio, "-fps", fps, output]) + + # Clean up temp files self.do_exec(["rm", "-f", video, audio, input]) @@ -95,7 +117,6 @@ class MKVMerge(Command): class Mencoder(Command): codec2opts = { - "lavc": "-lavcopts", "xvid": "-xvidencopts", "x264": "-x264encopts", "faac": "-faacopts", @@ -121,7 +142,7 @@ class Mencoder(Command): try_opt("-aid", self.opts.audioid) try_opt("-sid", self.opts.subtitleid) try_opt("-vf-add", self.opts.vfilters) - try_opt("-af", self.opts.afilters) + try_opt("-af-add", self.opts.afilters) def subst_values(self, cmd, vpass): subst = { @@ -141,7 +162,7 @@ class Mencoder(Command): self.insert_options(cmd) cmd += ["-ovc", p.vcodec, self.codec2opts[p.vcodec], p.vopts] cmd += ["-oac", "copy"] - cmd += self.profile.extra + self.profile.extra1 + cmd += self.profile.extra1 + self.profile.extra cmd = self.subst_values(cmd, vpass=1) return cmd @@ -151,10 +172,12 @@ class Mencoder(Command): cmd += ["mencoder", "%(input)s", "-o", "%(output)s"] self.insert_options(cmd) cmd += ["-ovc", p.vcodec, self.codec2opts[p.vcodec], p.vopts] - cmd += ["-oac", p.acodec, self.codec2opts[p.acodec], p.aopts] + cmd += ["-oac", p.acodec] + if "aopts" in p: + cmd += [self.codec2opts[p.acodec], p.aopts] if self.opts.episode_name: cmd += ["-info", "name='%s'" % self.opts.episode_name] - cmd += self.profile.extra + self.profile.extra2 + cmd += self.profile.extra2 + self.profile.extra cmd = self.subst_values(cmd, vpass=2) return cmd @@ -185,15 +208,6 @@ class Profile(object): profiles = { - "qt7" : - Profile( - commands=[Mencoder, MP4Box], - vcodec="x264", - vopts="pass=%(vpass)d: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", - ), - "x264" : Profile( commands=[Mencoder, MKVMerge], @@ -201,6 +215,7 @@ profiles = { vopts="pass=%(vpass)d:bitrate=%(vbitrate)d:subq=6:frameref=6:me=umh:partitions=all:bframes=4:b_adapt:qcomp=0.7:keyint=250", acodec="mp3lame", aopts="abr:br=%(abitrate)d", + extra=["-vf-add", "harddup"], ), "xvid" : @@ -213,67 +228,49 @@ profiles = { extra2=["-ffourcc", "DX50"], ), - "ipodxvid" : + "apple-quicktime" : Profile( commands=[Mencoder, MP4Box], - vcodec="xvid", - vopts="pass=%(vpass)d:bitrate=%(vbitrate)d:vhq=4:autoaspect:max_bframes=0", + vcodec="x264", + vopts="pass=%(vpass)d: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", - extra=["-vf-add", "scale=480:-10"], + extra=["-vf-add", "harddup"], ), - "ipodx264" : + "ipod-xvid" : Profile( commands=[Mencoder, MP4Box], - vcodec="x264", - vopts="pass=%(vpass)d: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:turbo", + vcodec="xvid", + vopts="pass=%(vpass)d:bitrate=%(vbitrate)d:vhq=4:autoaspect:max_bframes=0", acodec="faac", aopts="br=%(abitrate)d:mpeg=4:object=2", - extra=["-vf-add", "scale=480:-10"], - extra2=["-channels", "2", "-srate", "48000"], + extra=["-vf-add", "scale=480:-10,harddup"], ), - "nokiax264" : + "ipod-x264" : Profile( commands=[Mencoder, MP4Box], - default_opts={ - "vbitrate": 256, - "abitrate": 96, - }, vcodec="x264", - vopts="pass=%(vpass)d:bitrate=%(vbitrate)d:nocabac:me=umh:partitions=all:trellis=1:subq=7:bframes=0:direct_pred=auto", + vopts="pass=%(vpass)d: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:turbo", acodec="faac", aopts="br=%(abitrate)d:mpeg=4:object=2", - extra=["-vf-add", "scale=320:-10"], + extra=["-vf-add", "scale=480:-10,harddup"], + extra2=["-channels", "2", "-srate", "48000"], ), - "n97xvid" : + "nokia-n97" : Profile( commands=[Mencoder, MP4Box], default_opts={ - "vbitrate": 1000, + "vbitrate": 800, "abitrate": 96, }, vcodec="xvid", vopts="pass=%(vpass)d:bitrate=%(vbitrate)d:vhq=4:autoaspect:max_bframes=0", acodec="faac", aopts="br=%(abitrate)d:mpeg=4:object=2", - extra=["-vf-add", "scale=640:-10"], - ), - - "n97x264" : - Profile( - commands=[Mencoder, MP4Box], - default_opts={ - "vbitrate": 1000, - "abitrate": 96, - }, - vcodec="x264", - vopts="pass=%(vpass)d:bitrate=%(vbitrate)d:vbv_maxrate=2000:vbv_bufsize=2000:nocabac:me=umh:partitions=all:trellis=1:subq=7:bframes=0:direct_pred=auto:level_idc=20", - acodec="faac", - aopts="br=%(abitrate)d:mpeg=4:object=2", - extra=["-vf-add", "scale=640:-10"], + extra=["-vf-add", "scale=640:-10,harddup"], ), }