X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=rec10%2Ftrunk%2Fsrc%2Ftv2mp4.py;h=e86136aa506f410c13c5176f4d797cf2e6faf8de;hb=1fe0970a03674f7377fb6ac9a3c0f7438424b933;hp=4692e4fd82b4d9e818a221ef40168755d84b48f0;hpb=43c276a8a8e46246ca1c638e2b929d4cbe0afb7c;p=rec10%2Frec10-git.git

diff --git a/rec10/trunk/src/tv2mp4.py b/rec10/trunk/src/tv2mp4.py
index 4692e4f..e86136a 100644
--- a/rec10/trunk/src/tv2mp4.py
+++ b/rec10/trunk/src/tv2mp4.py
@@ -1,127 +1,78 @@
 #!/usr/bin/python
 # coding: UTF-8
 # Rec10 TS Recording Tools
-# Copyright (C) 2009-2010 Yukikaze
+# Copyright (C) 2009-2011 Yukikaze
 import commands
 import shutil
-import tv2avi
+import auto_process
 import os
 import re
 import os.path
 import string
 import base64
 import time
+import subprocess
+import traceback
+import zip
+
+import tv2avi
 import recdblist
 import configreader
 import status
-
+import tv2audio
+path = str(os.path.dirname(os.path.abspath(__file__))) + "/"
+tmppath = configreader.getConfPath("tmp")+"/"
+if tmppath=="/":
+    tmppath=path
+if not os.path.exists(tmppath):
+    os.mkdir(tmppath)
 def ts2mp4(pin, pout, opt):
     dir=os.path.split(pout)[0]
     title=os.path.split(pout)[1]
     title=os.path.splitext(title)[0]
     tpraw=os.path.join(dir, title+".264")
     tpmp4=os.path.join(dir, title+".mp4")
-    tv2avi.ts2raw(pin, tpraw, opt)
-    time.sleep(10)
-    if os.path.isfile(tpraw) and os.path.getsize(tpraw)>10*1000:
-        raw2mp4(tpraw, tpmp4, opt)
+    if os.path.isfile(pin) and os.path.getsize(pin)>10*1000:
+        tv2avi.ts2raw(pin, tpraw, opt)
+        time.sleep(10)
+        if os.path.isfile(tpraw) and os.path.getsize(tpraw)>10*1000:
+            raw2mp4(tpraw, tpmp4, opt)
+        time.sleep(10)
+        if os.path.exists(tpraw) and not re.search("B",opt):
+            os.remove(tpraw)
+    zip.addFile2FileZip(recdblist.getLogTitle(pin)+".command.log", recdblist.getLogTitle(pin)+".log.zip")
+    if os.path.exists(recdblist.getLogTitle(pin)+".command.log"):
+        os.remove(recdblist.getLogTitle(pin)+".command.log")
 def raw2mp4(pin,pout,opt):
     dir=os.path.split(pout)[0]
     title=os.path.split(pout)[1]
     title=os.path.splitext(title)[0]
     duration="-fps 29.970030 "
-    ffmpeg=configreader.getpath("ffmpeg")
-    isdualaac=0
-    ispentaaudio=0
     if re.search("a",opt):
         duration="-fps 23.976023 "
-    elif re.search("v",opt):
-        duration="-fps 23.976023 "
-    if re.search("d",opt):
-        isdualaac=1
-        duration="-fps 29.970030 "##ffmpegが24fpsに対応していないための措置
-    elif re.search("5",opt):
-        ispentaaudio=1
-        duration="-fps 29.970030 "##ffmpegが24fpsに対応していないための措置
-    exe = configreader.getpath("mp4box")
+    if re.search("I",opt):
+        duration="-fps 29.970030 "
+    exe = configreader.getConfPath("mp4box")+u" -tmp "+tmppath
     txt=""
     os.environ['LANG']="ja_JP.UTF-8"
-    if isdualaac==1:
-        wineexe=configreader.getpath("wine")
-        pincap=pin.replace(".264",".srt")
-        cap2ass=configreader.getpath("Caption2Ass")
-        pints=pin.replace(".264",".ts")
-        paac1=pin.replace(".264","_1.aac")
-        paac2=pin.replace(".264","_2.aac")
-        recdblist.printutf8(paac1)
-        if not os.path.exists(paac1):
-            paac1=pin.replace(".264","_1.mp3")
-        if not os.path.exists(paac2):
-            paac2=pin.replace(".264","_2.mp3")
-        e0=wineexe+u" "+cap2ass+u" -format srt \"Z:\\"+pints+"\" \"Z:\\"+pincap+"\""
-        e1=exe +u" "+duration+" -add \""+pin+"\" -new \""+pout+"\""
-        e1a1=exe +u" -add \""+paac1+"\" \""+pout+"\""
-        e1a2=exe +u" -add \""+paac2+"\" \""+pout+"\""
-        e1s=exe +u" -add \""+pincap+"\" \""+pout+"\""
-        if os.path.isfile(cap2ass):
-            txt=txt+execcomd(e0)
-        execmp4box(pin, pout, e1)
-        addmp4(paac1, pout, e1a1)
-        addmp4(paac2, pout, e1a2)
-        if os.path.exists(pincap) and (os.path.getsize(pincap)>1000):
-            addmp4(pincap, pout, e1s)
-    elif ispentaaudio==1:
-        wineexe=configreader.getpath("wine")
-        pincap=pin.replace(".264",".srt")
-        cap2ass=configreader.getpath("Caption2Ass")
-        pints=pin.replace(".264",".ts")
-        paac1=pin.replace(".264","_1.aac")
-        paac2=pin.replace(".264","_2.aac")
-        recdblist.printutf8(paac1)
-        if not os.path.exists(paac1):
-            paac1=pin.replace(".264","_1.mp3")
-        if not os.path.exists(paac2):
-            paac2=pin.replace(".264","_2.mp3")
-        e0=wineexe+u" "+cap2ass+u" -format srt \"Z:\\"+pints+"\" \"Z:\\"+pincap+"\""
-        e1=exe +u" "+duration+" -add \""+pin+"\" -new \""+pout+"\""
-        e1a1=exe +u" -add \""+paac1+"\" \""+pout+"\""
-        e1a2=exe +u" -add \""+paac2+"\" \""+pout+"\""
-        e1s=exe +u" -add \""+pincap+"\" \""+pout+"\""
-        if os.path.isfile(cap2ass):
-            txt=txt+execcomd(e0)
-        execmp4box(pin, pout, e1)
-        addmp4(paac1, pout, e1a1)
-        addmp4(paac2, pout, e1a2)
-        if os.path.exists(pincap) and (os.path.getsize(pincap)>1000):
-            addmp4(pincap, pout, e1s)
-    else:
-        wineexe=configreader.getpath("wine")
-        pincap=pin.replace(".264",".srt")
-        cap2ass=configreader.getpath("Caption2Ass")
-        pints=pin.replace(".264",".ts")
-        pinaac=pin.replace(".264",".aac")
-        e0=wineexe+u" "+cap2ass+u" -format srt \"Z:\\"+pints+"\" \"Z:\\"+pincap+"\""
-        e1=ffmpeg+" -i \""+pints+"\" -vn -f aac -acodec copy \""+pinaac+"\""
-        e2=exe +u" "+duration+" -add \""+pin+"\" -new \""+pout+"\""
-        e2a=exe +u" -add \""+pinaac+"\" \""+pout+"\""
-        e2s=exe +u" -add \""+pincap+"\" \""+pout+"\""
-        if os.path.isfile(cap2ass):
-            txt=txt+execcomd(e0)
-        txt=txt+execcomd(e1)
-        execmp4box(pin, pout, e2)
-        addmp4(pinaac, pout, e2a)
-        if os.path.exists(pincap) and (os.path.getsize(pincap)>1000):
-            addmp4(pincap, pout, e2s)
-    recdblist.addlog(pout, txt, "mp4box-log")
+    pints=pin.replace(".264",".ts")
+    e1=exe +u" "+duration+" -add \""+pin+"\" -new \""+pout+"\""
+    execmp4box(pin, pout, e1)
+    addAudio(pints, pout, opt)
+    addCaption(pints, pout)
     if status.getSettings_auto_del_tmp()==1:
         if os.path.exists(pout):
-            if os.path.getsize(pout)>100*1000*1000:
-                deltitle(dir,title)
+            if re.search("t",opt):
+                auto_process.deleteTmpFile(dir, title, ".264")
+            elif re.search("k",opt):
+                ""#削除しない
+            else:
+                auto_process.deleteTmpFile(dir, title, ".mp4")
 def mkv2mp4(pin,pout):
-    exeb = configreader.getpath(u"mkvextract")
-    exe = configreader.getpath(u"MP4Box")
-    dtsedit=configreader.getpath("DtsEdit")
-    wineexe=configreader.getpath("wine")
+    exeb = configreader.getConfPath(u"mkvextract")
+    exe = configreader.getConfPath(u"mp4Box")
+    #dtsedit=configreader.getConfPath("DtsEdit")
+    wineexe=configreader.getConfPath("wine")
     dir=os.path.split(pin)[0]
     title=os.path.split(pin)[1]
     title=os.path.splitext(title)[0]
@@ -143,28 +94,87 @@ def mkv2mp4(pin,pout):
         txt=txt+execcomd(exe3)+"\n"
     except:
         ""
-    recdblist.addlog(pin, txt, "MKV2MP4-log")
+    recdblist.addLog(pin, txt, u"MKV2MP4-log")
     txt = "\n####MKV2MP4-log####\n"+txt
     time.sleep(10)
-    if os.path.exists(pout):
-        if os.path.exists(audiopath):
-            os.remove(audiopath)
-        if os.path.exists(videopath):
-            os.remove(videopath)
-        if os.path.exists(timecodepath):
-            os.remove(timecodepath)
-        if os.path.exists(tmpmp4):
-            os.remove(tmpmp4)
+    if status.getSettings_auto_del_tmp()==1:
+        if os.path.exists(pout):
+            auto_process.deleteTmpFile(dir, title, ".mp4")
+def addCaption(pts,pmp4):##字幕の追加を試みる。
+    wineexe=configreader.getConfPath("wine")
+    pincap=pts.replace(".ts",".srt")
+    try:
+        cap2ass=configreader.getConfPath("caption2ass")
+    except:
+        cap2ass=""
+    if os.path.isfile(cap2ass):
+        e0=wineexe+u" "+cap2ass+u" -format srt \"Z:\\"+pts+"\" \"Z:\\"+pincap+"\""
+        recdblist.printutf8(e0)
+        p0=subprocess.Popen(e0,shell=True,stdout=subprocess.PIPE)
+        time.sleep(100)
+        if p0.poll==None:#実行中
+            #if os.path.getsize(pincap)<1000:#2mで1kb以下の場合自動で終了
+             #   os.kill(p0.pid,signal.SIGKILL)
+            #else:
+            os.waitpid(p0.pid, 0)
+            logt=unicode(p0.communicate()[0], "UTF-8")
+            recdblist.addLog(pts,e0, u"Captionログ-コマンド")
+            recdblist.addLog(pts,logt, u"Captionログ-詳細")
+            recdblist.addCommandLogZip(pts, "mp4box_caption", "mp4box_caption", e0, logt)
+        if os.path.exists(pincap):
+            if os.path.getsize(pincap)>1000:
+                exe = configreader.getConfPath("mp4box")+u" -tmp "+tmppath
+                e1s=exe +u" -add \""+pincap+"\" \""+pmp4+"\""
+                addmp4(pincap,pmp4,e1s)
+def addAudio(pts,pmp4,opts):#オプションに応じた音声の追加を行う
+    exe = configreader.getConfPath("mp4box")+u" -tmp "+tmppath
+    if re.search("d",opts) or re.search("5",opts):#二カ国語放送/5.1ch放送の場合
+        paac1=pts.replace(".ts","_1.aac")
+        paac2=pts.replace(".ts","_2.aac")
+        recdblist.printutf8(paac1)
+        e1a1=exe +u" -add \""+paac1+"\":mpeg4 \""+pmp4+"\""
+        e1a2=exe +u" -add \""+paac2+"\":mpeg4 \""+pmp4+"\""
+        if not os.path.exists(paac1):
+            paac1=pts.replace(".ts","_1.mp3")
+            e1a1=exe +u" -add \""+paac1+"\" \""+pmp4+"\""
+        if not os.path.exists(paac2):
+            paac2=pts.replace(".ts","_2.mp3")
+            e1a1=exe +u" -add \""+paac2+"\" \""+pmp4+"\""
+        if os.path.exists(paac1):
+            addmp4(paac1, pmp4, e1a1)
+        if os.path.exists(paac2):
+            addmp4(paac2, pmp4, e1a2)
+    elif re.search("b",opts):#BonTsDemuxを使って音声をスプリットした場合
+        paac=pts.replace(".ts",".aac")
+        e1a=exe +u" -add \""+pinaac+"\":mpeg4 \""+pmp4+"\""
+        if not os.path.exists(paac):
+            paac=pts.replace(".ts",".mp3")
+            e1a1=exe +u" -add \""+paac+"\" \""+pmp4+"\""
+        if os.path.exists(paac):
+            addmp4(paac, pmp4, e1a1)
+    else:
+        tv2audio.ts2single_audio(pts,opts)
+        pinaac=pts.replace(".ts",".aac")
+        e1a=exe +u" -add \""+pinaac+"\":mpeg4 \""+pmp4+"\""
+        if not os.path.exists(pinaac):
+            pinaac=pinaac.replace(".aac",".mp3")
+            e1a=exe +u" -add \""+pinaac+"\" \""+pmp4+"\""
+        if os.path.exists(pinaac):
+            addmp4(pinaac, pmp4, e1a)
 def execmp4box(pin,pout,cmd):
     title=os.path.splitext(os.path.split(pin)[1])[0]
-    ptin=os.path.join(os.path.dirname(pin),base64.b16encode(title.encode('utf-8'))+".264")
+    nt=base64.b16encode(title.encode('utf-8'))
+    if len(nt)>200:
+        nt=nt[:180]
+    ptin=os.path.join(os.path.dirname(pin),nt+".264")
     recdblist.printutf8(ptin)
     shutil.move(pin,ptin)
     time.sleep(10)
-    ptout=os.path.join(os.path.dirname(pout),base64.b16encode(title.encode('utf-8'))+".mp4")
+    ptout=os.path.join(os.path.dirname(pout),nt+".mp4")
     cmdn=string.replace(cmd,pin,ptin)
     cmdn=string.replace(cmdn,pout,ptout)
     recdblist.printutf8(cmdn)
+    recdblist.addCommandSelfLog(pin, cmdn)
     txt=""
     try:
         txt=execcomd(cmdn)
@@ -172,7 +182,10 @@ def execmp4box(pin,pout,cmd):
         txt= "error occures in execmp4box\n"
         txt=txt+ str(type(inst))+"\n"
         txt=txt+str(inst)
-    recdblist.addlog(pin, txt, "MP4Box-log")
+        recdblist.addCommonlogEX("Error", "excecmp4box(tv2mp4.py)", str(type(inst)), str(inst)+traceback.format_exc(),verbose_level=200,log_level=200)
+    recdblist.addLog(pin, cmdn, u"MP4Boxログ-コマンド")
+    recdblist.addLog(pin, txt, u"MP4Boxログ-詳細")
+    recdblist.addCommandLogZip(pin, "MP4Box", "mp4box", cmdn,txt)
     time.sleep(5)
     shutil.move(ptin,pin)
     shutil.move(ptout,pout)
@@ -180,9 +193,12 @@ def execmp4box(pin,pout,cmd):
 def addmp4(padd,pout,cmd):#without video
     title=os.path.splitext(os.path.split(padd)[1])[0]
     ext=os.path.splitext(os.path.split(padd)[1])[1]
-    ptadd=os.path.join(os.path.dirname(padd),base64.b16encode(title.encode('utf-8'))+ext)
-    ptoutb=os.path.join(os.path.dirname(pout),base64.b16encode(title.encode('utf-8'))+"_b.mp4")
-    ptout=os.path.join(os.path.dirname(pout),base64.b16encode(title.encode('utf-8'))+".mp4")
+    nt=base64.b16encode(title.encode('utf-8'))
+    if len(nt)>200:
+        nt=nt[:180]
+    ptadd=os.path.join(os.path.dirname(padd),nt+ext)
+    ptoutb=os.path.join(os.path.dirname(pout),nt+"_b.mp4")
+    ptout=os.path.join(os.path.dirname(pout),nt+".mp4")
     shutil.move(padd,ptadd)
     if os.path.isfile(pout):
         shutil.move(pout,ptoutb)
@@ -199,11 +215,18 @@ def addmp4(padd,pout,cmd):#without video
         txt= "error occures in addmp4\n"
         txt=txt+ str(type(inst))+"\n"
         txt=txt+str(inst)
-    recdblist.addlog(pout, txt, "MP4Box-log-add")
+    recdblist.addLog(pout, cmdn, u"MP4Box追加ログ-コマンド")
+    recdblist.addLog(pout, txt, u"MP4Box追加ログ-詳細")
+    recdblist.addCommandLogZip(pout, "MP4Box_add", "mp4box_add", cmdn, txt)
     time.sleep(5)
-    os.remove(ptoutb)
     shutil.move(ptadd,padd)
-    shutil.move(ptout,pout)
+    if os.path.exists(ptout):
+        shutil.move(ptout,pout)
+        os.remove(ptoutb)
+    else:
+        txtt=padd+u"のインポートエラー"
+        recdblist.addLog(pout, txtt, u"MP4Box追加ログ-コマンド")
+        shutil.move(ptoutb,pout)
     time.sleep(5)
 def execcomd(cmd):
     txt=""
@@ -214,30 +237,3 @@ def execcomd(cmd):
     except:
         ""
     return txt
-
-def deltitle(path,title):
-    dp=[]
-    dp.append(os.path.join(path,title+".avi"))
-    dp.append(os.path.join(path,title+".264"))
-    dp.append(os.path.join(path,title+".120.avi"))
-    dp.append(os.path.join(path,title+".noodml.avi"))
-    dp.append(os.path.join(path,title+".aac"))
-    dp.append(os.path.join(path,title+".m2v"))
-    dp.append(os.path.join(path,title+"_1.aac"))
-    dp.append(os.path.join(path,title+"_2.aac"))
-    dp.append(os.path.join(path,title+"_1.mp3"))
-    dp.append(os.path.join(path,title+"_2.mp3"))
-    dp.append(os.path.join(path,title+".srt"))
-    if configreader.getenv("remove_ts")=="1":
-        dp.append(os.path.join(path,title+".ts"))
-    if os.path.exists(os.path.join(path,title+".ts"))and os.path.exists(os.path.join(path,title+".ts.b25")):
-        if os.path.getsize(os.path.join(path,title+".ts"))*10>os.path.getsize(os.path.join(path,title+".ts.b25")):
-            if os.path.getsize(os.path.join(path,title+".ts"))>1000*1000*100:
-                dp.append(os.path.join(path,title+".ts.b25"))
-    if os.path.exists(os.path.join(path,title+".mp4")):
-        if os.path.getsize(os.path.join(path,title+".mp4"))>1000*1000*10:
-            for ip in dp:
-                try:
-                    os.remove(ip)
-                except:
-                    ""