simplify codes.

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

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index 1cf1722..9800367 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -63,6 +63,8 @@ def ts2x264(pin, pout, opts):#sizeは"HD"か"SD"
             print type(inst)
             print inst
 def encode(pin,pout,size,is24fps,quality,crf):
+    mencoder=configreader.getpath("mencoder")
+    x264=configreader.getpath("x264")
     encvf=""
     txt=""
     encvf="-vf yadif=0,pp=l5"
@@ -74,6 +76,7 @@ def encode(pin,pout,size,is24fps,quality,crf):
     x264preset=""
     x264tune=""
     x264_maxrate="10000"
+    x264_addline=configreader.getenv("x264_addline")
     if is24fps==1:
         ofps="-ofps 24000/1001"
         fps="-fps 30000/1001"
@@ -119,8 +122,8 @@ def encode(pin,pout,size,is24fps,quality,crf):
     random.jumpahead(10)
     streampath=os.path.join(os.path.dirname(pin),str(random.randint(10000, 999999)))
     os.system(u"mkfifo "+streampath)
-    encexe=u"mencoder \""+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+" --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=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" --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=u"nice -n 19 " +encexe
     recdblist.printutf8(encexe)
     txt=txt+"Cmd : "+encexe+"\n"
@@ -137,13 +140,15 @@ def encode_ffmpeg(pin,pout,size,is24fps,quality,crf):
     """
     
     """
-    ffmpeg="ffmpeg"
+    ffmpeg=configreader.getpath("ffmpeg")
+    x264=configreader.getpath("x264")
     fps=u"-r 29.970030 "
     x264fps="--fps 30000/1001"
     x264streamsize=""
     x264preset=""
     x264tune=""
     x264_maxrate="10000"
+    x264_addline=configreader.getenv("x264_addline")
     if size == "HD":
         s = "-s 1280x720 "
         x264streamsize=u"1280x720"
@@ -180,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+" --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" --vbv-bufsize "+str(int(x264_maxrate)*2)+u" --vbv-maxrate "+x264_maxrate+u" --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"