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 e6da110..08dfe00 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -1,9 +1,12 @@
+import tv2avi
 #!/usr/bin/python
 # coding: UTF-8
 # Rec10 TS Recording Tools
 # Copyright (C) 2009 Yukikaze
+import status
 import os
 import time
+from tv2avi import tv2avi
 import re
 
 def ts2x264(pin,pout,opts):#sizeは"HD"か"SD"
@@ -12,6 +15,8 @@ def ts2x264(pin,pout,opts):#sizeは"HD"か"SD"
     """
     pinで指定されたファイルをpoutにx264でエンコードして書き出す
     """
+    
+    status.setEncoding(status.getEncoding()+1)
     isAnime=0
     size="SD"
 
@@ -30,36 +35,31 @@ def ts2x264(pin,pout,opts):#sizeは"HD"か"SD"
         size="HD"
     if re.search("S",opts):
         size="SD"
-    if re.search("t",opts):
-        makemini=1
     if isAnime==1:
         encvf="-vf pullup,softskip,pp=l5,"
     else:
         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"
         pas2exe="mencoder \'"+pin+"\' -ovc x264 "+encvf+" -x264encopts "+bitrate+":threads=auto:pass=2 -passlogfile "+pin+".log "+"-oac mp3lame -lameopts cbr:br=128 -o \'"+pout+"\'"
         pas1exe="/usr/bin/nice -n 19 "+pas1exe
         pas2exe="/usr/bin/nice -n 19 "+pas2exe
-        #exe="mencoder \'"+pin+"\' -ovc x264 "+encvf+" -x264encopts "+bitrate+":threads=auto -oac mp3lame -lameopts cbr:br=128 -o \'"+pout+"\'"
-        #exe="/usr/bin/nice -n 19 "+exe
-        #print "Now. encoding..."+exe
         print pas2exe
         os.system(pas1exe)
         print "1pass終了"
@@ -68,38 +68,4 @@ def ts2x264(pin,pout,opts):#sizeは"HD"か"SD"
     else:
         pas1exe="mencoder \'"+pin+"\' -ovc x264 "+encvf+" -x264encopts "+bitrate+":threads=auto -oac mp3lame -lameopts cbr:br=128  -o \'"+pout+"\'"
         os.system(pas1exe)
-    if makemini==1:
-        extt = os.path.splitext(pout)
-        minipout=extt[0]+"mini"+".flv"
-        ts2minix264(pin,minipout)
-        #miniexe="mencoder 咲－Ｓａｋｉ－　第６話「開幕」[Ｓ].ts -ovc x264 -vf pullup,softskip,pp=l5,scale=1280:720,harddup -x264encopts bitrate=2000:crf=20:threads=auto -oac mp3lame -lameopts cbr:br=128 -o
-
-
-def ts2minix264(pin,pout):
-    miniexe="mencoder \'"+pin+"\' -ovc x264 -vf pullup,softskip,pp=l5,scale=512:384,harddup "
-    miniexe=miniexe+"-x264encopts bitrate=300:threads=auto -oac mp3lame -lameopts cbr:br=64 -o \'"+pout+"\'"
-    os.system(miniexe)
-
-def ts2minix264(pin):
-    extt = os.path.splitext(pin)
-    pout=extt[0]+"mini"+".flv"
-    miniexe="mencoder \'"+pin+"\' -ovc x264 -vf pullup,softskip,pp=l5,scale=512:384,harddup "
-    miniexe=miniexe+"-x264encopts bitrate=300:threads=auto -oac mp3lame -lameopts cbr:br=64 -o \'"+pout+"\'"
-    os.system(miniexe)
-"""    
-anime=0
-pin=""
-pout=""
-size=""
-for opt, args in optlist:
-       if opt in ("-i", "--input"):
-               pin=args
-       if opt in ("-o", "--output"):
-               pout=args
-       if opt in ("-s", "--size"):
-               size=args
-       if opt in ("-a", "--anime"):
-               anime=1
-
-#ts2x264(pin,pout,size,anime)
-"""
+    status.setEncoding(status.getEncoding()-1)
\ No newline at end of file