fix encode setting.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@434 4e526526-5e11-4fc0-8910-f8fd03428081

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index b68475f..223f277 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -103,11 +103,11 @@ def encode(pin,pout,size,is2pass,is24fps,quality):
         x264enc1=x264enc
         x264enc2=x264enc1
     elif quality<7:
-        x264enc=""
+        x264enc=":8x8dct"
         x264enc1=x264enc
         x264enc2=x264enc1
     elif quality<9:
-        x264enc=":direct_pred=auto:frameref=5:subme=8:bframes=1:trellis=1"
+        x264enc=":direct_pred=auto:frameref=5:subme=8:8x8dct:bframes=1:trellis=1"
         x264enc1=x264enc
         x264enc2=x264enc1
     elif quality<11:
@@ -122,27 +122,27 @@ def encode(pin,pout,size,is2pass,is24fps,quality):
         harddup=",pp=l5,unsharp=l3x3:0.75:c3x3:0.75,hqdn3d=2:1:2,harddup"
         bm=1
         if quality<3:
-            vbv=":vbv_maxrate="+str(bnum*2)
+            vbv=":vbv_maxrate="+str(bnum*2)+":vbv_bufsize="+str(bnum*4)
             x264enc=":me=dia:aq-strength=0.6:deblock=1,1:psy-rd=0.4:partitions=none:frameref=1:subme=0:scenecut=0:trellis=0"
             x264enc1=x264enc+vbv
             x264enc2=x264enc1
         elif quality<5:
-            vbv=":vbv_maxrate="+str(bnum*2)
+            vbv=":vbv_maxrate="+str(bnum*2)+":vbv_bufsize="+str(bnum*4)
             x264enc=":me=dia:aq-strength=0.6:deblock=1,1:psy-rd=0.4:partitions=i8x8,i4x4:frameref=1:subme=1:trellis=0"
             x264enc1=x264enc+vbv
             x264enc2=x264enc1
         elif quality<7:
-            vbv=":vbv_maxrate="+str(bnum*2)
-            x264enc=":aq-strength=0.6:deblock=1,1:psy-rd=0.4"
+            vbv=":vbv_maxrate="+str(bnum*2)+":vbv_bufsize="+str(bnum*4)
+            x264enc=":aq-strength=0.6:8x8dct:deblock=1,1:psy-rd=0.4"
             x264enc1=x264enc+vbv
             x264enc2=x264enc1
         elif quality<9:
-            vbv=":vbv_maxrate="+str(bnum*2)
-            x264enc=":direct_pred=auto:aq-strength=0.6:deblock=1,1:psy-rd=0.4:frameref=5:subme=8:bframes=1:trellis=1"
+            vbv=":vbv_maxrate="+str(bnum*2)+":vbv_bufsize="+str(bnum*4)
+            x264enc=":direct_pred=auto:aq-strength=0.6:deblock=1,1:psy-rd=0.4:8x8dct:frameref=5:subme=8:bframes=1:trellis=1"
             x264enc1=x264enc+vbv
             x264enc2=x264enc1
         elif quality<11:
-            vbv=":vbv_maxrate="+str(bnum*2)
+            vbv=":vbv_maxrate="+str(bnum*2)+":vbv_bufsize="+str(bnum*4)
             x264enc=":frameref=5:subme=8:subq=7:trellis=2:aq-strength=0.6:deblock=1,1:psy-rd=0.4:partitions=all:8x8dct:direct_pred=auto:me=umh:bframes=3"
             x264enc1=x264enc+vbv
             x264enc2=x264enc1