X-Git-Url: http://git.osdn.net/view?p=rec10%2Frec10-git.git;a=blobdiff_plain;f=rec10%2Ftrunk%2Fsrc%2Fts2x264.py;h=63ef8ff46287c7693bb91c5e172ac598d45b387a;hp=bde0c803330932695f352a476b4f9dffd8b99afd;hb=50f90c1b522eb4445a25d03bc083cbdb5fa5970b;hpb=bdcd627011d8cfc6e210a477608423d8cd31f3b4

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index bde0c80..63ef8ff 100644
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -6,6 +6,7 @@ import commands
 import configreader
 import os
 import os.path
+import sys
 import re
 import random
 import time
@@ -384,7 +385,7 @@ def getMovieBaseSize(pin):
 def getMovieBaseSize2(pin):##動画開始後すぐに解像度が変更されたときに対処
     ffmpeg=configreader.getConfPath("ffmpeg")
     os.environ['LANG']="ja_JP.UTF-8"
-    exe=ffmpeg+u" -ss 5 -fs 1 -i \""+pin+"\" \""+pin+".size.ts\" 2>&1"
+    exe=ffmpeg+u" -ss 5 -fs 1 -t 10 -i \""+pin+"\" \""+pin+".size.ts\" 2>&1"
     try:
         recdblist.addCommandSelfLog(pin, exe)
     except Exception, inst:
@@ -441,7 +442,7 @@ def getMoviePAR(pin):
 def getMoviePAR2(pin):
     ffmpeg=configreader.getConfPath("ffmpeg")
     os.environ['LANG']="ja_JP.UTF-8"
-    exe=ffmpeg+u" -ss 5 -fs 1 -i \""+pin+"\" \""+pin+".size.ts\" 2>&1"
+    exe=ffmpeg+u" -ss 5 -fs 1 -t 10 -i \""+pin+"\" \""+pin+".size.ts\" 2>&1"
     try:
         recdblist.addCommandSelfLog(pin, exe)
     except Exception, inst:
@@ -504,7 +505,7 @@ def getMovieDAR(pin):
 def getMovieDAR2(pin):
     ffmpeg=configreader.getConfPath("ffmpeg")
     os.environ['LANG']="ja_JP.UTF-8"
-    exe=ffmpeg+u" -ss 5 -fs 1 -i \""+pin+"\" \""+pin+".size.ts\" 2>&1"
+    exe=ffmpeg+u" -ss 5 -fs 1 -t 10 -i \""+pin+"\" \""+pin+".size.ts\" 2>&1"
     txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8','ignore')
     rT=re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+.*DAR\D+(\d+:\d+)\D+.*\Z")
     sizeMaxX=0
@@ -587,7 +588,7 @@ def getX264Commandline(preset,sar,fps,x264profile,x264tune,pout,pin,x264streamsi
                     else:
                         x264bluray=u"--ref 4 "+x264bluray
         elif getX264CoreVersion()>=115:
-            x264bluray=" --slices 4 --bluray-compat --open-gop --nal-hrd vbr --bframes 3 --b-pyramid strict --aud --colorprim bt709 --transfer bt709 "
+            x264bluray=" --slices 4 --bluray-compat --nal-hrd vbr --bframes 3 --b-pyramid strict --aud --colorprim bt709 --transfer bt709 "
             x264_addline=""
             if fps=="24000/1001 --keyint 24" or fps =="24000/1001":
                 if x264streamsize=="1280x720":