change MP4Box option to make videos more familiar for iPad

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

diff --git a/rec10/trunk/src/tv2mp4.py b/rec10/trunk/src/tv2mp4.py
index 1facd36..e86136a 100644 (file)
--- a/rec10/trunk/src/tv2mp4.py
+++ b/rec10/trunk/src/tv2mp4.py
@@ -132,29 +132,33 @@ def addAudio(pts,pmp4,opts):#オプションに応じた音声の追加を行う
         paac1=pts.replace(".ts","_1.aac")\r
         paac2=pts.replace(".ts","_2.aac")\r
         recdblist.printutf8(paac1)\r
+        e1a1=exe +u" -add \""+paac1+"\":mpeg4 \""+pmp4+"\""\r
+        e1a2=exe +u" -add \""+paac2+"\":mpeg4 \""+pmp4+"\""\r
         if not os.path.exists(paac1):\r
             paac1=pts.replace(".ts","_1.mp3")\r
+            e1a1=exe +u" -add \""+paac1+"\" \""+pmp4+"\""\r
         if not os.path.exists(paac2):\r
             paac2=pts.replace(".ts","_2.mp3")\r
-        e1a1=exe +u" -add \""+paac1+"\" \""+pmp4+"\""\r
-        e1a2=exe +u" -add \""+paac2+"\" \""+pmp4+"\""\r
+            e1a1=exe +u" -add \""+paac2+"\" \""+pmp4+"\""\r
         if os.path.exists(paac1):\r
             addmp4(paac1, pmp4, e1a1)\r
         if os.path.exists(paac2):\r
             addmp4(paac2, pmp4, e1a2)\r
     elif re.search("b",opts):#BonTsDemuxを使って音声をスプリットした場合\r
         paac=pts.replace(".ts",".aac")\r
+        e1a=exe +u" -add \""+pinaac+"\":mpeg4 \""+pmp4+"\""\r
         if not os.path.exists(paac):\r
             paac=pts.replace(".ts",".mp3")\r
-        e1a1=exe +u" -add \""+paac+"\" \""+pmp4+"\""\r
+            e1a1=exe +u" -add \""+paac+"\" \""+pmp4+"\""\r
         if os.path.exists(paac):\r
             addmp4(paac, pmp4, e1a1)\r
     else:\r
         tv2audio.ts2single_audio(pts,opts)\r
         pinaac=pts.replace(".ts",".aac")\r
+        e1a=exe +u" -add \""+pinaac+"\":mpeg4 \""+pmp4+"\""\r
         if not os.path.exists(pinaac):\r
             pinaac=pinaac.replace(".aac",".mp3")\r
-        e1a=exe +u" -add \""+pinaac+"\" \""+pmp4+"\""\r
+            e1a=exe +u" -add \""+pinaac+"\" \""+pmp4+"\""\r
         if os.path.exists(pinaac):\r
             addmp4(pinaac, pmp4, e1a)\r
 def execmp4box(pin,pout,cmd):\r