fix mp4box IO Error.

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

diff --git a/rec10/trunk/src/tv2avi.py b/rec10/trunk/src/tv2avi.py
index 9af76d2..ae5cfbc 100644 (file)
--- a/rec10/trunk/src/tv2avi.py
+++ b/rec10/trunk/src/tv2avi.py
@@ -61,8 +61,8 @@ def b252ts(pout, chtxt, btime, etime, opt):
             csch=chs['csch']\r
             #print [ch,csch,chtxt]\r
         except:\r
             csch=chs['csch']\r
             #print [ch,csch,chtxt]\r
         except:\r

-            ch=0\r
-            csch=0\r
+            ch="0"\r
+            csch="0"\r

         tv2ts.b252ts(pout + ".ts", ch, csch)\r
         tsout = pout\r
         aviin = pout + ".ts"\r
         tv2ts.b252ts(pout + ".ts", ch, csch)\r
         tsout = pout\r
         aviin = pout + ".ts"\r

diff --git a/rec10/trunk/src/tv2mp4.py b/rec10/trunk/src/tv2mp4.py
index 40e7115..1facd36 100644 (file)
--- a/rec10/trunk/src/tv2mp4.py
+++ b/rec10/trunk/src/tv2mp4.py
@@ -20,7 +20,12 @@ import recdblist
 import configreader\r
 import status\r
 import tv2audio\r
 import configreader\r
 import status\r
 import tv2audio\r

-\r
+path = str(os.path.dirname(os.path.abspath(__file__))) + "/"\r
+tmppath = configreader.getConfPath("tmp")+"/"\r
+if tmppath=="/":\r
+    tmppath=path\r
+if not os.path.exists(tmppath):\r
+    os.mkdir(tmppath)\r

 def ts2mp4(pin, pout, opt):\r
     dir=os.path.split(pout)[0]\r
     title=os.path.split(pout)[1]\r
 def ts2mp4(pin, pout, opt):\r
     dir=os.path.split(pout)[0]\r
     title=os.path.split(pout)[1]\r


@@ -47,7 +52,7 @@ def raw2mp4(pin,pout,opt):
         duration="-fps 23.976023 "\r
     if re.search("I",opt):\r
         duration="-fps 29.970030 "\r
         duration="-fps 23.976023 "\r
     if re.search("I",opt):\r
         duration="-fps 29.970030 "\r

-    exe = configreader.getConfPath("mp4box")\r
+    exe = configreader.getConfPath("mp4box")+u" -tmp "+tmppath\r

     txt=""\r
     os.environ['LANG']="ja_JP.UTF-8"\r
     pints=pin.replace(".264",".ts")\r
     txt=""\r
     os.environ['LANG']="ja_JP.UTF-8"\r
     pints=pin.replace(".264",".ts")\r


@@ -118,11 +123,11 @@ def addCaption(pts,pmp4):##字幕の追加を試みる。
             recdblist.addCommandLogZip(pts, "mp4box_caption", "mp4box_caption", e0, logt)\r
         if os.path.exists(pincap):\r
             if os.path.getsize(pincap)>1000:\r
             recdblist.addCommandLogZip(pts, "mp4box_caption", "mp4box_caption", e0, logt)\r
         if os.path.exists(pincap):\r
             if os.path.getsize(pincap)>1000:\r

-                exe = configreader.getConfPath("mp4box")\r
+                exe = configreader.getConfPath("mp4box")+u" -tmp "+tmppath\r

                 e1s=exe +u" -add \""+pincap+"\" \""+pmp4+"\""\r
                 addmp4(pincap,pmp4,e1s)\r
 def addAudio(pts,pmp4,opts):#オプションに応じた音声の追加を行う\r
                 e1s=exe +u" -add \""+pincap+"\" \""+pmp4+"\""\r
                 addmp4(pincap,pmp4,e1s)\r
 def addAudio(pts,pmp4,opts):#オプションに応じた音声の追加を行う\r

-    exe = configreader.getConfPath("mp4box")\r
+    exe = configreader.getConfPath("mp4box")+u" -tmp "+tmppath\r

     if re.search("d",opts) or re.search("5",opts):#二カ国語放送/5.1ch放送の場合\r
         paac1=pts.replace(".ts","_1.aac")\r
         paac2=pts.replace(".ts","_2.aac")\r
     if re.search("d",opts) or re.search("5",opts):#二カ国語放送/5.1ch放送の場合\r
         paac1=pts.replace(".ts","_1.aac")\r
         paac2=pts.replace(".ts","_2.aac")\r