some fixes

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

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index d71059e..08dfe00 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -1,3 +1,4 @@
+import tv2avi
 #!/usr/bin/python
 # coding: UTF-8
 # Rec10 TS Recording Tools
@@ -5,6 +6,7 @@
 import status
 import os
 import time
+from tv2avi import tv2avi
 import re
 
 def ts2x264(pin,pout,opts):#sizeは"HD"か"SD"
@@ -39,19 +41,19 @@ def ts2x264(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 x264 "+encvf+" -x264encopts "+bitrate+":threads=auto:pass=1:turbo=2 -passlogfile "+pin+".log "+"-oac mp3lame -lameopts cbr:br=128 -o /dev/null"