implement vfr mp4 making function.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@324 4e526526-5e11-4fc0-8910-f8fd03428081

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index 3c3fdc8..09a9421 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -486,7 +486,7 @@ def type_encode_que(typetxt,chtxt,title,bt,et,opt):
             if re.search("5", opt):
                 pin = recpath + "/" + title + ".sa.avi"
             #pout = recpath + "/" + title + ".avi"
-            pout = recpath + "/" + title + ".mkv"
+            pout = recpath + "/" + title + ".mp4"
             recdblist.printutf8(pin)
             #recdblist.printutf8(pin+":"+pout+":"+opt)
             recdb.del_reckey(typetxtnow, title, chtxt, btime)

diff --git a/rec10/trunk/src/tv2mp4.py b/rec10/trunk/src/tv2mp4.py
index 4ab6be2..6076742 100644 (file)
--- a/rec10/trunk/src/tv2mp4.py
+++ b/rec10/trunk/src/tv2mp4.py
@@ -2,7 +2,6 @@
 # coding: UTF-8
 # Rec10 TS Recording Tools
 # Copyright (C) 2009 Yukikaze
-import sys
 import commands
 import tv2avi
 import os
@@ -24,6 +23,7 @@ def ts2mp4(pin, pout, opt):
             tpavi=pin
     avi2mp4(tpavi,pout,opt)
 def avi2mp4(pin,pout,opt):
+    isvfr=0
     if re.search(u"v", opt):
         isvfr=1
     exe = configreader.getpath(u"MP4Box")
@@ -49,7 +49,7 @@ def avi2mp4(pin,pout,opt):
         evfr.append(wineexe+u" "+cfr2tc+u" '"+"Z:\\"+pin+"' '"+"Z:\\"+pin120+u"' 'Z:\\"+pintimecode+u"' 2")
         evfr.append(exe+u" -aviraw video \'"+pin120+u"\'")
         videotpath=os.path.join(dir,title+u".120_video.h264")
-        evfr.append(exe+u" -fps 29.97 -add \'"+videotpath+"\' -add \'"+pinaac+"\' -new \'"+pmp4+"\'")
+        evfr.append(exe+u" -fps 29.970030 -add \'"+videotpath+"\' -add \'"+pinaac+"\' -new \'"+pmp4+"\'")
         #evfr.append(exe+u" -add \'"+pinaac+"\' \'"+pmp4+"\'")
         evfr.append(wineexe+u" "+dtsedit+u" -tc \'Z:\\"+pintimecode+u"\' \'Z:\\"+pmp4+"\' -o \'Z:\\"+pout+"\'")
         exes=evfr
@@ -88,7 +88,7 @@ def avi2mp4(pin,pout,opt):
     else:
         exes.append(exe+u" -aviraw audio \'"+pin+u"\'")
         exes.append(exe+u" -aviraw video \'"+pin+u"\'")
-        exes.append(exe+u" -new -fps 29.97 -add \'"+videopath+u"\'#video -add \'"+audiopath+u"\'#audio \'"+pout+u"\'")
+        exes.append(exe+u" -new -fps 29.970030 -add \'"+videopath+u"\'#video -add \'"+audiopath+u"\'#audio \'"+pout+u"\'")
         for e in exes:
             recdblist.printutf8(e)
             txt=txt+e+"\n"
@@ -108,7 +108,7 @@ def avi2mp4(pin,pout,opt):
     delpath.append(pin.replace(u".avi",u".ts"))
     delpath.append(pin.replace(u".avi",u".aac"))
     delpath.append(pin.replace(u".avi",u".m2v"))
-    delpath.append(pin.replace(u".avi",u".120_video.264"))
+    delpath.append(pin.replace(u".avi",u".120_video.h264"))
     delpath.append(pin.replace(u".avi",u".ts.b25"))
     if os.path.exists(pout):
         if os.path.exists(audiopath):
@@ -137,8 +137,7 @@ def mkv2mp4(pin,pout):
     videopath=os.path.join(dir,title+u"_video.h264")
     #doexe = exe.encode('utf-8') + u' \"' + pin.encode('utf-8') + u'\" \"' + pout.encode('utf-8') + u'\"'
     exe0=exeb+u" tracks \'"+pin+u"\' 1:\'"+videopath+u"\' 2:\'"+audiopath+u"\'"
-    exe1=exe+u" -aviraw audio \'"+pin+u"\'"
-    exe2=exe+u" -aviraw video \'"+pin+u"\'"
+
     exefin=exe+u" -new -fps 29.970030 -add \'"+videopath+u"\'#video -add \'"+audiopath+u"\'#audio \'"+pout+u"\'"
     logo=pin.replace(".avi",".log")
     os.environ['LANG']="ja_JP.UTF-8"