change MP4Box option to make videos more familiar for iPad

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

diff --git a/rec10/trunk/src/tv2audio.py b/rec10/trunk/src/tv2audio.py
index 4bfd97a..e0b859a 100644 (file)
--- a/rec10/trunk/src/tv2audio.py
+++ b/rec10/trunk/src/tv2audio.py
@@ -121,10 +121,8 @@ def ts2singlewav(pts,opts):
     exe = 'wine ' + bontsdemux + " -i \"" + bonpin + "\" "+delayt+" -nd -sound 0 -o \"" + bonpout + "\""\r
     #recdblist.printutf8(exe)\r
     recdblist.printutf8(exe)\r
-    p=subprocess.Popen(exe.encode('utf-8'),shell=True)\r
-    os.waitpid(p.pid, 0)\r
-    logt=unicode(p.communicate()[0], "UTF-8")\r
-    recdblist.addCommandLog(ots, u"BonTsDemux 音声取り出し", exe, logt)\r
+    txt=commands.getoutput(exe.encode('utf-8'))\r
+    recdblist.addCommandLog(pts, u"BonTsDemux 音声取り出し", exe, txt)\r
 def ts2single_mp3_ffmpeg(pts):\r
     pmp3=pts.replace(".ts",".mp3")\r
     ffmpeg=configreader.getConfPath("ffmpeg")\r
@@ -137,6 +135,23 @@ def ts2single_mp3_ffmpeg(pts):
         recdblist.addLog(pts,logt, "FFmpeg_mp3音声取り出しログ-詳細")\r
     except:\r
         ""\r
+def ts2single_aac_ffmpeg(pts):\r
+    ts2singlewav(pts,opts)\r
+    aout=pts.replace(".ts",".aac")\r
+    ain=pts.replace(".ts",".wav")\r
+    wav2aac_ffmpeg(ain,aout)\r
+def wav2aac_ffmpeg(pin,pout):\r
+    paac=pts.replace(".ts",".aac")\r
+    ffmpeg=configreader.getConfPath("ffmpeg")\r
+    e0=ffmpeg+" -i \""+pin+"\" -y \""+pout+"\""\r
+    p0=subprocess.Popen(e0,shell=True)\r
+    os.waitpid(p0.pid, 0)\r
+    try:\r
+        logt=unicode(p0.communicate()[0], "UTF-8")\r
+        recdblist.addLog(pts,e0, "FFmpeg_wav2aac音声取り出しログ-コマンド")\r
+        recdblist.addLog(pts,logt, "FFmpeg_wav2aac音声取り出しログ-詳細")\r
+    except:\r
+        ""\r
 def ts2single_fp_BonTsDemux(pts,opts):\r
     useNero=0\r
     try:\r
@@ -147,6 +162,8 @@ def ts2single_fp_BonTsDemux(pts,opts):
     if useNero==1:\r
         ts2single_aac_BonTsDemux_Nero(pts,opts)\r
     else:\r
+        ts2single_aac_ffmpeg(pts)\r
+    if not os.path.exists(pts.replace(".ts",".aac")):\r
         ts2single_mp3_BonTsDemux(pts,opts)\r
 def ts2single_aac_BonTsDemux_Nero(pts,opts):\r
     ts2singlewav(pts,opts)\r