simplify codes.

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

diff --git a/rec10/trunk/src/tv2mp4.py b/rec10/trunk/src/tv2mp4.py
index fddf923..ac30a9c 100644 (file)
--- a/rec10/trunk/src/tv2mp4.py
+++ b/rec10/trunk/src/tv2mp4.py
@@ -19,13 +19,6 @@ def ts2mp4(pin, pout, opt):
     dir=os.path.split(pout)[0]\r
     title=os.path.split(pout)[1]\r
     title=os.path.splitext(title)[0]\r
-    """tpavi=os.path.join(dir, title+".avi")\r
-    tv2avi.ts2avi(pin, tpavi, opt)\r
-    time.sleep(10)\r
-    if not os.path.exists(tpavi):\r
-        if os.path.exists(pin):\r
-            tpavi=pin\r
-    avi2mp4(tpavi,pout,opt)"""\r
     tpraw=os.path.join(dir, title+".264")\r
     tpmp4=os.path.join(dir, title+".mp4")\r
     tv2avi.ts2raw(pin, tpraw, opt)\r
@@ -36,6 +29,7 @@ def raw2mp4(pin,pout,opt):
     title=os.path.split(pout)[1]\r
     title=os.path.splitext(title)[0]\r
     duration="-fps 29.970030 "\r
+    ffmpeg=configreader.getpath("ffmpeg")\r
     isdualaac=0\r
     ispentaaudio=0\r
     if re.search("a",opt):\r
@@ -106,7 +100,7 @@ def raw2mp4(pin,pout,opt):
         pints=pin.replace(".264",".ts")\r
         pinaac=pin.replace(".264",".aac")\r
         e0=wineexe+u" "+cap2ass+u" -format srt \"Z:\\"+pints+"\" \"Z:\\"+pincap+"\""\r
-        e1="ffmpeg -i \""+pints+"\" -vn -f aac -acodec copy \""+pinaac+"\""\r
+        e1=ffmpeg+" -i \""+pints+"\" -vn -f aac -acodec copy \""+pinaac+"\""\r
         e2=exe +u" "+duration+" -add \""+pin+"\" -new \""+pout+"\""\r
         e2a=exe +u" -add \""+pinaac+"\" \""+pout+"\""\r
         e2s=exe +u" -add \""+pincap+"\" \""+pout+"\""\r
@@ -147,7 +141,7 @@ def avi2mp4(pin,pout,opt):
         pintimecode=os.path.join(dir,etitle+u".timecode.txt")\r
         pinaac=os.path.join(dir,etitle+u".aac")\r
         pincat=os.path.join(dir,etitle+u".srt")\r
-        evfr0="ffmpeg -i '"+pints+"' -vn -f aac -acodec copy '"+pinaac+"'"\r
+        evfr0=ffmpeg+u" -i '"+pints+"' -vn -f aac -acodec copy '"+pinaac+"'"\r
         evfr1=wineexe+u" "+cfr2tc+u" '"+"Z:\\"+pin+"' '"+"Z:\\"+pin120+u"' 'Z:\\"+pintimecode+u"' 2"\r
         evfr2=exe+u" -aviraw video \'"+pin120+u"\'"\r
         videotpath=os.path.join(dir,etitle+u".120_video.h264")\r