some fixes

[rec10/rec10-git.git] / rec10 / trunk / src / ts2xvid.py

diff --git a/rec10/trunk/src/ts2xvid.py b/rec10/trunk/src/ts2xvid.py
index c87c86a..3390ec0 100644 (file)
--- a/rec10/trunk/src/ts2xvid.py
+++ b/rec10/trunk/src/ts2xvid.py
@@ -5,7 +5,7 @@
 import os
 import time
 import re
-
+import status
 def ts2xvid(pin,pout,opts):#sizeは"HD"か"SD"
     """
     pinで指定されたファイルをpoutにx264でエンコードして書き出す
@@ -14,7 +14,7 @@ def ts2xvid(pin,pout,opts):#sizeは"HD"か"SD"
     pin = pin.encode('utf-8')
     isAnime=0
     size="SD"
-
+    status.setEncoding(status.getEncoding()+1)
     makemini=0
     if re.search("a",opts):
         isAnime=1
@@ -36,19 +36,19 @@ def ts2xvid(pin,pout,opts):#sizeは"HD"か"SD"
         encvf="-vf pp=l5,"
     if size=="SD":
         encvf=encvf+"scale=720:480,harddup"
-        bitrate="bitrate=1250"
+        bitrate="bitrate="+tv2avi.Bitrate_SD
     elif size=="HD":
         encvf=encvf+"scale=1280:720,harddup"
-        bitrate="bitrate=2000"
+        bitrate="bitrate="+tv2avi.Bitrate_HD
     elif size=="FHD":
         encvf=encvf+"scale=1920:1080,harddup"
-        bitrate="bitrate=2500"
+        bitrate="bitrate="+tv2avi.Bitrate_FHD
     elif size=="WQVGA":
         encvf=encvf+"scale=400:240,harddup"
-        bitrate="bitrate=200"
+        bitrate="bitrate="+tv2avi.Bitrate_WQVGA
     else:
         encvf=encvf+"scale=1280:720,harddup"
-        bitrate="bitrate=2000"
+        bitrate="bitrate="+tv2avi.Bitrate_HD
 
     if dualpass==1:
         pas1exe="mencoder \'"+pin+"\' -ovc xvid "+encvf+" -xvidencopts "+bitrate+":threads=2:pass=1:turbo -passlogfile "+pin+".log "+"-oac mp3lame -lameopts cbr:br=128 -o /dev/null"
@@ -61,5 +61,6 @@ def ts2xvid(pin,pout,opts):#sizeは"HD"か"SD"
         time.sleep(5)
         os.system(pas2exe)
     else:
-        pas1exe="mencoder \'"+pin+"\' -ovc xvid "+encvf+" -xvidencopts fixed_quant=4:threads=2 -oac mp3lame -lameopts cbr:br=128  -o \'"+pout+"\'"
+        pas1exe="mencoder \'"+pin+"\' -ovc xvid "+encvf+" -xvidencopts "+bitrate+":threads=2 -oac mp3lame -lameopts cbr:br=128  -o \'"+pout+"\'"
         os.system(pas1exe)
+    status.setEncoding(status.getEncoding()-1)
\ No newline at end of file