From: James Bunton <jamesbunton@fastmail.fm>
Date: Thu, 22 Jul 2010 05:07:46 +0000 (+1000)
Subject: Use -vf harddup on all profiles that are remuxed to a different container
X-Git-Url: https://code.delx.au/transcoding/commitdiff_plain/e3415e8b3f051b02f7258a7950a6191ea9fed657

Use -vf harddup on all profiles that are remuxed to a different container
---

diff --git a/encode.py b/encode.py
index 31b765f..bac7ce3 100755
--- a/encode.py
+++ b/encode.py
@@ -141,7 +141,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
 
@@ -154,7 +154,7 @@ class Mencoder(Command):
 		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 + self.profile.extra2
+		cmd += self.profile.extra2 + self.profile.extra
 		cmd = self.subst_values(cmd, vpass=2)
 		return cmd
 
@@ -192,6 +192,7 @@ profiles = {
 		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", "harddup"],
 	),
 
 	"x264" :
@@ -201,6 +202,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" :
@@ -220,7 +222,7 @@ profiles = {
 		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"],
+		extra=["-vf-add", "scale=480:-10,harddup"],
 	),
 
 	"ipodx264" :
@@ -230,7 +232,7 @@ profiles = {
 		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=480:-10"],
+		extra=["-vf-add", "scale=480:-10,harddup"],
 		extra2=["-channels", "2", "-srate", "48000"],
 	),
 
@@ -245,7 +247,7 @@ profiles = {
 		vopts="pass=%(vpass)d:bitrate=%(vbitrate)d:nocabac:me=umh:partitions=all:trellis=1:subq=7:bframes=0:direct_pred=auto",
 		acodec="faac",
 		aopts="br=%(abitrate)d:mpeg=4:object=2",
-		extra=["-vf-add", "scale=320:-10"],
+		extra=["-vf-add", "scale=320:-10,harddup"],
 	),
 
 	"n97xvid" :
@@ -259,7 +261,7 @@ profiles = {
 		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"],
+		extra=["-vf-add", "scale=640:-10,harddup"],
 	),
 
 	"n97x264" :
@@ -273,7 +275,7 @@ profiles = {
 		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"],
 	),
 }