fix encode option.

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

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index 218065a..c656112 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -75,7 +75,7 @@ def encode(pin,pout,size,is24fps,quality,crf):
     x264streamsize=""
     x264preset=""
     x264tune=""
-    x264_maxrate="10000"
+    x264_bitrate="5000"
     x264_addline=configreader.getenv("x264_addline")
     if is24fps==1:
         ofps="-ofps 24000/1001"
@@ -87,23 +87,23 @@ def encode(pin,pout,size,is24fps,quality,crf):
     if size == "HD":
         encvf = encvf + ",scale=1280:720::0:3"+harddup
         x264streamsize=u"1280x720"
-        x264_maxrate="7500"
+        x264_bitrate="2500"
     elif size == "WVGA":
         encvf = encvf + ",scale=854:480::0:3"+harddup
         x264streamsize=u"854x480"
-        x264_maxrate="2500"
+        x264_bitrate="1500"
     elif size == "FullHD":
         encvf = encvf + ",scale=1920:1080::0:3"+harddup
         x264streamsize=u"1920x1080"
-        x264_maxrate="10000"
+        x264_bitrate="5000"
     elif size == "SD":
         encvf = encvf + ",scale=720:480::0:3"+harddup
         x264streamsize=u"720x480"
-        x264_maxrate="2500"
+        x264_bitrate="1250"
     else:
         encvf = encvf + ",scale=1280:720::0:3"+harddup
         x264streamsize=u"1280x720"
-        x264_maxrate="7500"
+        x264_bitrate="2500"
     if quality==1:
         x264preset=u"--preset ultrafast"
     elif quality==2:
@@ -123,7 +123,7 @@ def encode(pin,pout,size,is24fps,quality,crf):
     streampath=os.path.join(os.path.dirname(pin),str(random.randint(10000, 999999)))
     os.system(u"mkfifo "+streampath)
     encexe=mencoder+u" \""+pin+u"\" -vfm ffmpeg -quiet -sws 9 "+encvf+u",format=i420 "+fps+" "+ofps+" -oac mp3lame -ovc raw -of rawvideo -o \""+streampath+"\" &"
-    encexe=encexe+u" nice -n 19 "+x264+" "+x264crf+u" "+x264_addline+u" "+u" --threads auto --vbv-bufsize "+str(int(x264_maxrate)*2)+u" --vbv-maxrate "+x264_maxrate+u" --level 41 --profile high "+x264preset+" "+x264tune+" "+x264fps+" -o \""+pout+"\" "+streampath+" "+x264streamsize
+    encexe=encexe+u" nice -n 19 "+x264+" "+x264crf+u" "+x264_addline+u"  --threads auto  --level 41 --profile high "+x264preset+" "+x264tune+" "+x264fps+" -o \""+pout+"\" "+streampath+" "+x264streamsize
     encexe=u"nice -n 19 " +encexe
     recdblist.printutf8(encexe)
     txt=txt+"Cmd : "+encexe+"\n"
@@ -147,28 +147,28 @@ def encode_ffmpeg(pin,pout,size,is24fps,quality,crf):
     x264streamsize=""
     x264preset=""
     x264tune=""
-    x264_maxrate="10000"
+    x264_bitrate="2500"
     x264_addline=configreader.getenv("x264_addline")
     if size == "HD":
         s = "-s 1280x720 "
         x264streamsize=u"1280x720"
-        x264_maxrate="7500"
+        x264_bitrate="2500"
     elif size == "WVGA":
         s = "-s 854x480 "
         x264streamsize=u"854x480"
-        x264_maxrate="2500"
+        x264_bitrate="1500"
     elif size == "FullHD":
         s = "-s 1920x1080 "
         x264streamsize=u"1920x1080"
-        x264_maxrate="10000"
+        x264_bitrate="5000"
     elif size == "SD":
         s = "-s 720x480 "
         x264streamsize=u"720x480"
-        x264_maxrate="2500"
+        x264_bitrate="1250"
     else:
         s = "-s 1280x720 "
         x264streamsize=u"1280x720"
-        x264_maxrate="7500"
+        x264_bitrate="2500"
     if quality==1:
         x264preset=u"--preset ultrafast"
     elif quality==2:
@@ -185,7 +185,7 @@ def encode_ffmpeg(pin,pout,size,is24fps,quality,crf):
     txt=""
     os.environ['LANG']="ja_JP.UTF-8"
     exe=ffmpeg+u" -y -i \""+pin+"\" -vsync 400 -vcodec rawvideo -pix_fmt yuv420p "+s+fps+"-deinterlace -an -f rawvideo - |"
-    exe=exe+u" nice -n 19 "+x264+" "+x264crf+u" "+x264_addline+u" --threads auto --vbv-bufsize "+str(int(x264_maxrate)*2)+u" --vbv-maxrate "+x264_maxrate+u" --level 41 --profile high "+x264preset+" "+x264tune+" "+x264fps+" -o \""+pout+"\" - "+x264streamsize
+    exe=exe+u" nice -n 19 "+x264+" "+x264crf+u" "+x264_addline+u" --threads auto --level 41 --profile high "+x264preset+" "+x264tune+" "+x264fps+" -o \""+pout+"\" - "+x264streamsize
     txt=txt+"Cmd : "+exe+"\n"
     exe = "nice -n 19 " + exe
     txt=txt+"Cmd : "+exe+"\n"