implement to work "a bit after start resolution changing movie".

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

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index 6f6e529..6fe05e7 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -257,7 +257,7 @@ def encode_ffmpeg_sar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
     if size == "WVGA_BASE" or size == "QVGA_BASE":
         x264profile=" --level 32 --profile baseline "
     else:
-        x264profile=" --level 42 --profile high "
+        x264profile=" --level 41 --profile high "
     x264crf=str(crf)
     txt=""
     os.environ['LANG']="ja_JP.UTF-8"
@@ -297,7 +297,7 @@ def getMovieBaseSize(pin):
 def getMovieBaseSize2(pin):##動画開始後すぐに解像度が変更されたときに対処
     ffmpeg=configreader.getpath("ffmpeg")
     os.environ['LANG']="ja_JP.UTF-8"
-    exe=ffmpeg+u" -ss 5 -fs 1 -i \""+pin+"\" 2>&1"
+    exe=ffmpeg+u" -ss 5 -fs 1 -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+PAR\D+(\d+:\d+)\D+.*\Z")
     sizeMaxX=0
@@ -315,6 +315,7 @@ def getMovieBaseSize2(pin):##動画開始後すぐに解像度が変更された
             if sizeMaxX<tX:
                 sizeMaxX=tX
                 sizeMaxY=tY
+    os.remove(pin+".size.ts")
     return [sizeMaxX,sizeMaxY]
 def getMoviePAR(pin):
     ffmpeg=configreader.getpath("ffmpeg")
@@ -322,7 +323,6 @@ def getMoviePAR(pin):
     exe=ffmpeg+u" -i \""+pin+"\" 2>&1"
     txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8','ignore')
     rT=re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+PAR\D+(\d+:\d+)\D+.*\Z")
-    #rT=re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+.*DAR\D+(\d+:\d+)\D+.*\Z")
     sizeMaxX=0
     parx=0
     pary=0
@@ -348,10 +348,9 @@ def getMoviePAR(pin):
 def getMoviePAR2(pin):
     ffmpeg=configreader.getpath("ffmpeg")
     os.environ['LANG']="ja_JP.UTF-8"
-    exe=ffmpeg+u" -ss 5 -fs 1 -i \""+pin+"\" 2>&1"
+    exe=ffmpeg+u" -ss 5 -fs 1 -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+PAR\D+(\d+:\d+)\D+.*\Z")
-    #rT=re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+.*DAR\D+(\d+:\d+)\D+.*\Z")
     sizeMaxX=0
     parx=0
     pary=0
@@ -373,6 +372,7 @@ def getMoviePAR2(pin):
                 else:
                     parx=tEX
                     pary=tEY
+    os.remove(pin+".size.ts")
     return [parx,pary]
 def getMovieDAR(pin):
     ffmpeg=configreader.getpath("ffmpeg")
@@ -405,7 +405,7 @@ def getMovieDAR(pin):
 def getMovieDAR2(pin):
     ffmpeg=configreader.getpath("ffmpeg")
     os.environ['LANG']="ja_JP.UTF-8"
-    exe=ffmpeg+u" -ss 5 -fs 1 -i \""+pin+"\" 2>&1"
+    exe=ffmpeg+u" -ss 5 -fs 1 -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
@@ -429,6 +429,7 @@ def getMovieDAR2(pin):
                 else:
                     darx=tEX
                     dary=tEY
+    os.remove(pin+".size.ts")
     return [darx,dary]
 def get_par_size(pin,y):
     tSize=getMovieBaseSize(pin)
@@ -443,7 +444,6 @@ def get_par_size(pin,y):
         tX=-1
         tY=-1
     return [tX,tY]
-
 def get_x264core_version():
     x264=configreader.getpath("x264")
     t1=commands.getoutput(x264+" --help|grep core")