From: gn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Date: Tue, 29 May 2012 10:16:02 +0000 (+0000)
Subject: change MP4Box option to make videos more familiar for iPad
X-Git-Url: http://git.osdn.net/view?p=rec10%2Frec10-git.git;a=commitdiff_plain;h=1fe0970a03674f7377fb6ac9a3c0f7438424b933

change MP4Box option to make videos more familiar for iPad

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

diff --git a/rec10/trunk/src/tv2audio.py b/rec10/trunk/src/tv2audio.py
index cc837e8..e0b859a 100644
--- a/rec10/trunk/src/tv2audio.py
+++ b/rec10/trunk/src/tv2audio.py
@@ -135,6 +135,23 @@ def ts2single_mp3_ffmpeg(pts):
         recdblist.addLog(pts,logt, "FFmpeg_mp3音声取り出しログ-詳細")
     except:
         ""
+def ts2single_aac_ffmpeg(pts):
+    ts2singlewav(pts,opts)
+    aout=pts.replace(".ts",".aac")
+    ain=pts.replace(".ts",".wav")
+    wav2aac_ffmpeg(ain,aout)
+def wav2aac_ffmpeg(pin,pout):
+    paac=pts.replace(".ts",".aac")
+    ffmpeg=configreader.getConfPath("ffmpeg")
+    e0=ffmpeg+" -i \""+pin+"\" -y \""+pout+"\""
+    p0=subprocess.Popen(e0,shell=True)
+    os.waitpid(p0.pid, 0)
+    try:
+        logt=unicode(p0.communicate()[0], "UTF-8")
+        recdblist.addLog(pts,e0, "FFmpeg_wav2aac音声取り出しログ-コマンド")
+        recdblist.addLog(pts,logt, "FFmpeg_wav2aac音声取り出しログ-詳細")
+    except:
+        ""
 def ts2single_fp_BonTsDemux(pts,opts):
     useNero=0
     try:
@@ -145,6 +162,8 @@ def ts2single_fp_BonTsDemux(pts,opts):
     if useNero==1:
         ts2single_aac_BonTsDemux_Nero(pts,opts)
     else:
+        ts2single_aac_ffmpeg(pts)
+    if not os.path.exists(pts.replace(".ts",".aac")):
         ts2single_mp3_BonTsDemux(pts,opts)
 def ts2single_aac_BonTsDemux_Nero(pts,opts):
     ts2singlewav(pts,opts)
diff --git a/rec10/trunk/src/tv2mp4.py b/rec10/trunk/src/tv2mp4.py
index 1facd36..e86136a 100644
--- 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")
         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 \""+paac1+"\" \""+pmp4+"\""
-        e1a2=exe +u" -add \""+paac2+"\" \""+pmp4+"\""
+            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+"\""
+            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+"\""
+            e1a=exe +u" -add \""+pinaac+"\" \""+pmp4+"\""
         if os.path.exists(pinaac):
             addmp4(pinaac, pmp4, e1a)
 def execmp4box(pin,pout,cmd):