fix x264 option.

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

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index 003f2c7..f369e6b 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -54,8 +54,8 @@ def encode(pin,pout,size,isvfr,is2pass,is24fps):
         encvf="-vf pullup,softskip"
         harddup=",pp=ac,pp=l5,unsharp=l3x3:0.75:c3x3:0.75,hqdn3d=2:1:2,harddup"
         bm=1
-        x264enc1=":me=hex:bframes=3"
-        x264enc2=":frameref=3:subq=7:partitions=all:8x8dct:direct=auto:me=umh:bframes=3:weight_b"
+        x264enc1=":me=hex:bframes=3:cqm=jvt"
+        x264enc2=":frameref=3:subme=8:subq=7:mixed_refs:partitions=all:8x8dct:direct_pred=auto:me=umh:bframes=3:weight_b:cqm=jvt"
     if isvfr==1:
         ofps="-ofps 60000/1001"
         fps="-fps 60000/1001"
@@ -65,8 +65,8 @@ def encode(pin,pout,size,isvfr,is2pass,is24fps):
         #encvf="-vf pullup,softskip,pp=ac"
         #encvf="-vf filmdint=io=2997:119880,pp=md"
         bm=1
-        x264enc1=":me=hex:bframes=3"
-        x264enc2=":frameref=3:subq=7:8x8dct:direct=auto:me=umh:bframes=3:weight_b"
+        x264enc1=":me=hex:bframes=3:cqm=jvt"
+        x264enc2=":frameref=3:subme=8:subq=7:8x8dct:direct_pred=auto:me=umh:bframes=3:weight_b:cqm=jvt"
     if size == "HD":
         encvf = encvf + ",scale=1280:720::0:4"+harddup
         bitrate = "bitrate=" + str(tv2avi.Bitrate_HD*bm)
@@ -159,11 +159,32 @@ def encode_ffmpeg(pin,pout,size,is2pass):
         s = "-s 1280x720 "
         bitrate = str(tv2avi.Bitrate_LowHD)
         crf="crf=22"
+    txt=""
     if is2pass==1:
         exe1=ffmpeg+" -y -i \""+pin+"\" -pass 1 -vsync 400 -vcodec libx264 -b "+bitrate+"k "+vf1+s+"-deinterlace -an -passlogfile \'" + pin + ".log\' " + " /dev/null"
         exe2=ffmpeg+" -y -i \""+pin+"\" -pass 2 -vsync 400 -vcodec libx264 -b "+bitrate+"k "+vf2+s+"-deinterlace -an -passlogfile \'" + pin + ".log\' \"" +pout+"\"" #aviにすべきかどうか
+        txt=txt+exe1+"\n"+exe2+"\m"
+        recdblist.printutf8(exe1)
         os.system(exe1)
         os.system(exe2)
     else:
         exe=ffmpeg+" -y -i \""+pin+"\" -vsync 400 -vcodec libx264 -b "+bitrate+"k "+vf2+s+"-deinterlace -an \"" +pout+"\""
-        os.system(exe)
\ No newline at end of file
+        txt=txt+exe+"\n"
+        os.system(exe)
+    logo=pin
+    logo=logo.replace(".m2v",".ts")
+    logo=logo.replace(".ts",".log")
+    f=open(logo,'a')
+    s=len(txt)
+    stxt=""
+    if s>100:
+        stxt=txt[s-300:]
+    else:
+        stxt=txt
+    s=stxt.find("\n")
+    if s>0:
+        s=s+len("\n")
+        stxt=stxt[s:]
+    txt="\n####dualaudio ffmpeg-log_"+size+"####\n"+stxt
+    f.write(txt.encode('utf-8'))
+    f.close()
\ No newline at end of file