change x264encoding plan.

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

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index 223f277..98b5d24 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -22,19 +22,16 @@ def ts2x264(pin, pout, opts):#sizeは"HD"か"SD"
         dualpass = 1
     if re.search("H", opts):
         size = "HD"
-        quality=7
     if re.search("S", opts):
         size = "SD"
-        quality=3
+        quality=quality-2
     if re.search("F", opts):
         size = "FHD"
-        quality=5
     if re.search("L", opts):
         size = "Short"
-        quality=3
+        quality=quality-2
     if re.search("G", opts):
         size = "LowHD"
-        quality=5
     if re.search("v", opts):
         is24fps=1
     if re.search("a", opts):
@@ -95,23 +92,23 @@ def encode(pin,pout,size,is2pass,is24fps,quality):
     x264enc2=""
 
     if quality<3:
-        x264enc=":me=dia:partitions=none:frameref=1:subme=0:scenecut=0:trellis=0"
+        x264enc=":me=dia:partitions=none:frameref=1:subq=2:scenecut=0:trellis=0"
         x264enc1=x264enc
         x264enc2=x264enc1
     elif quality<5:
-        x264enc=":me=dia:partitions=i8x8,i4x4:frameref=1:subme=1:trellis=0"
+        x264enc=":me=dia:partitions=i8x8,i4x4:frameref=1:subq=4:trellis=0"
         x264enc1=x264enc
         x264enc2=x264enc1
     elif quality<7:
-        x264enc=":8x8dct"
+        x264enc=":8x8dct:bframes=1"
         x264enc1=x264enc
         x264enc2=x264enc1
     elif quality<9:
-        x264enc=":direct_pred=auto:frameref=5:subme=8:8x8dct:bframes=1:trellis=1"
+        x264enc=":direct_pred=auto:frameref=5:subq=6:8x8dct:bframes=3:trellis=1"
         x264enc1=x264enc
         x264enc2=x264enc1
     elif quality<11:
-        x264enc=":frameref=5:subme=8:subq=7:trellis=2:partitions=all:8x8dct:direct_pred=auto:me=umh:bframes=3"
+        x264enc=":frameref=5:subq=7:trellis=2:partitions=all:8x8dct:direct_pred=auto:me=umh:bframes=3"
         x264enc1=x264enc
         x264enc2=x264enc1
     crf=""
@@ -123,22 +120,22 @@ def encode(pin,pout,size,is2pass,is24fps,quality):
         bm=1
         if quality<3:
             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"
+            x264enc=":me=dia:aq-strength=0.6:deblock=1,1:psy-rd=0.4:partitions=none:frameref=1:subq=2:scenecut=0:trellis=0"
             x264enc1=x264enc+vbv
             x264enc2=x264enc1
         elif quality<5:
             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"
+            x264enc=":me=dia:aq-strength=0.6:deblock=1,1:psy-rd=0.4:partitions=i8x8,i4x4:frameref=1:subq=4:trellis=0"
             x264enc1=x264enc+vbv
             x264enc2=x264enc1
         elif quality<7:
             vbv=":vbv_maxrate="+str(bnum*2)+":vbv_bufsize="+str(bnum*4)
-            x264enc=":aq-strength=0.6:8x8dct:deblock=1,1:psy-rd=0.4"
+            x264enc=":aq-strength=0.6:8x8dct:deblock=1,1:psy-rd=0.4:bframes=1"
             x264enc1=x264enc+vbv
             x264enc2=x264enc1
         elif quality<9:
             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"
+            x264enc=":direct_pred=auto:aq-strength=0.6:deblock=1,1:psy-rd=0.4:8x8dct:frameref=5:subq=6:bframes=3:trellis=1"
             x264enc1=x264enc+vbv
             x264enc2=x264enc1
         elif quality<11: