Fixed bug in x264/copyac3

[transcoding] / encode.py

diff --git a/encode.py b/encode.py
index a46a64226b5e1fb753cbce803871a7e556496df8..31cc0de0a72c23de21838e8a86ec8dd0c564b76c 100755 (executable)
--- a/encode.py
+++ b/encode.py
@@ -222,7 +222,7 @@ class MencoderCopyAC3(Command):
                cmd += ["-of", "rawaudio", "-o", "audio.ac3"]
                insert_mplayer_options(cmd, self.opts)
                cmd += self.profile.extra
-               self.do_exec(cmd, wait=False)
+               self.do_exec(cmd)
 
 
 class X264(Command):
@@ -366,15 +366,15 @@ profiles = {
        "x264/lame" :
        Profile(
                commands=[MPlayer, X264, Lame, Wait, MKVMerge],
-               x264opts=["--preset", "veryslow", "--crf", "19"],
-               lameopts=["--preset", "extreme"],
+               x264opts=["--preset", "veryslow", "--crf", "20"],
+               lameopts=["--preset", "medium"],
        ),
 
        "x264/copyac3" :
        Profile(
                commands=[MPlayer, X264, SwallowAudio, Wait, MencoderCopyAC3, MKVMerge],
-               x264opts=["--preset", "veryslow", "--crf", "19"],
-               lameopts=["--preset", "extreme"],
+               x264opts=["--preset", "veryslow", "--crf", "20"],
+               lameopts=["--preset", "medium"],
        ),
 
        "xvid/lame" :
@@ -389,7 +389,7 @@ profiles = {
        "apple-quicktime" :
        Profile(
                commands=[MPlayer, X264, Faac, Wait, MP4Box],
-               x264opts=["--crf", "19", "--bframes", "1"],
+               x264opts=["--crf", "20", "--bframes", "1"],
                faacopts=["-q", "100", "--mpeg-vers", "4"],
        ),
 
@@ -405,8 +405,8 @@ profiles = {
 }
 
 mappings = {
-       "x264", "x264/lame",
-       "xvid", "xvid/lame",
+       "x264": "x264/lame",
+       "xvid": "xvid/lame",
 }
 for x, y in mappings.iteritems():
        profiles[x] = profiles[y]