Turn off sar option when encode under mobile option.

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

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index 9f83b75..16b6faf 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -37,10 +37,12 @@ def ts2x264(pin, pout, opts):#sizeは"HD"か"SD"
         size = "WVGA"\r
     if re.search("MW1",opts):\r
         size = "QVGA_BASE"\r
-        crf=crf+4\r
+        crf=crf+4
+        sar=0\r
     if re.search("MW2", opts):\r
         size = "WVGA_BASE"\r
-        crf=crf+2\r
+        crf=crf+2
+        sar=0\r
     if re.search("v", opts):\r
         is24fps=1\r
         crf=int(configreader.getConfEnv("animation_crf"))\r
@@ -382,7 +384,13 @@ def getMovieBaseSize(pin):
 def getMovieBaseSize2(pin):##動画開始後すぐに解像度が変更されたときに対処\r
     ffmpeg=configreader.getConfPath("ffmpeg")\r
     os.environ['LANG']="ja_JP.UTF-8"\r
-    exe=ffmpeg+u" -ss 5 -fs 1 -i \""+pin+"\" \""+pin+".size.ts\" 2>&1"\r
+    exe=ffmpeg+u" -ss 5 -fs 1 -i \""+pin+"\" \""+pin+".size.ts\" 2>&1"
+    try:\r
+        recdblist.addCommandSelfLog(pin, exe)\r
+    except Exception, inst:\r
+        print type(inst)\r
+        print str(inst)\r
+        print traceback.print_exc(file=sys.stdout)\r
     txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8','ignore')\r
     rT=re.compile(u"Stream.*#.*:.*\D+([\d]+x[\d]+)\D+PAR\D+(\d+:\d+)\D+.*\Z")\r
     sizeMaxX=0\r
@@ -433,7 +441,13 @@ def getMoviePAR(pin):
 def getMoviePAR2(pin):\r
     ffmpeg=configreader.getConfPath("ffmpeg")\r
     os.environ['LANG']="ja_JP.UTF-8"\r
-    exe=ffmpeg+u" -ss 5 -fs 1 -i \""+pin+"\" \""+pin+".size.ts\" 2>&1"\r
+    exe=ffmpeg+u" -ss 5 -fs 1 -i \""+pin+"\" \""+pin+".size.ts\" 2>&1"
+    try:\r
+        recdblist.addCommandSelfLog(pin, exe)\r
+    except Exception, inst:\r
+        print type(inst)\r
+        print str(inst)\r
+        print traceback.print_exc(file=sys.stdout)\r
     txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8','ignore')\r
     rT=re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+PAR\D+(\d+:\d+)\D+.*\Z")\r
     sizeMaxX=0\r