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

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index 63ef8ff..8f77cc9 100644
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -360,28 +360,6 @@ def encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace=1,usebluray=0,
     zip.addFile2FileZip(log_x264, recdblist.getLogTitle(pin+".log.zip"))
     os.remove(log_ffmpeg)
     os.remove(log_x264)
-def getMovieBaseSize(pin):
-    ffmpeg=configreader.getConfPath("ffmpeg")
-    os.environ['LANG']="ja_JP.UTF-8"
-    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")
-    sizeMaxX=0
-    sizeMaxY=0
-    txtls=txts.split("\n")
-    for t in txtls:
-        rM=rT.match(t)
-        if rM:
-            sizetxt=rM.group(1)
-            partxt=rM.group(2)
-            tX=int(sizetxt.split("x")[0])
-            tY=int(sizetxt.split("x")[1])
-            tEX=int(partxt.split(":")[0])
-            tEY=int(partxt.split(":")[1])
-            if sizeMaxX<tX:
-                sizeMaxX=tX
-                sizeMaxY=tY
-    return [sizeMaxX,sizeMaxY]
 def getMovieBaseSize2(pin):##動画開始後すぐに解像度が変更されたときに対処
     ffmpeg=configreader.getConfPath("ffmpeg")
     os.environ['LANG']="ja_JP.UTF-8"
@@ -394,11 +372,13 @@ def getMovieBaseSize2(pin):##動画開始後すぐに解像度が変更された
         print traceback.print_exc(file=sys.stdout)
     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")
+    rT2=re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+SAR\D+(\d+:\d+)\D+.*DAR\D+(\d+:\d+)\D+.*\Z")
     sizeMaxX=0
     sizeMaxY=0
     txtls=txts.split("\n")
     for t in txtls:
         rM=rT.search(t)
+        rM2=rT2.search(t)
         if rM:
             sizetxt=rM.group(1)
             partxt=rM.group(2)
@@ -409,36 +389,15 @@ def getMovieBaseSize2(pin):##動画開始後すぐに解像度が変更された
             if sizeMaxX<tX:
                 sizeMaxX=tX
                 sizeMaxY=tY
-    os.remove(pin+".size.ts")
-    return [sizeMaxX,sizeMaxY]
-def getMoviePAR(pin):
-    ffmpeg=configreader.getConfPath("ffmpeg")
-    os.environ['LANG']="ja_JP.UTF-8"
-    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")
-    sizeMaxX=0
-    parx=0
-    pary=0
-    txtls=txts.split("\n")
-    for t in txtls:
-        rM=rT.match(t)
-        if rM:
-            sizetxt=rM.group(1)
-            dartxt=rM.group(2)
+        if rM2:
+            sizetxt=rM2.group(1)
             tX=int(sizetxt.split("x")[0])
             tY=int(sizetxt.split("x")[1])
-            tEX=int(dartxt.split(":")[0])
-            tEY=int(dartxt.split(":")[1])
             if sizeMaxX<tX:
                 sizeMaxX=tX
-                if tX==1920 and tY==1080:
-                    parx=1
-                    pary=1
-                else:
-                    parx=tEX
-                    pary=tEY
-    return [parx,pary]
+                sizeMaxY=tY
+    os.remove(pin+".size.ts")
+    return [sizeMaxX,sizeMaxY]
 def getMoviePAR2(pin):
     ffmpeg=configreader.getConfPath("ffmpeg")
     os.environ['LANG']="ja_JP.UTF-8"
@@ -449,88 +408,65 @@ def getMoviePAR2(pin):
         print type(inst)
         print str(inst)
         print traceback.print_exc(file=sys.stdout)
-    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
-    parx=0
-    pary=0
-    txtls=txts.split("\n")
+    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")
+    rT2 = re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+SAR\D+(\d+:\d+)\D+.*DAR\D+(\d+:\d+)\D+.*\Z")
+    sizeMaxX = 0
+    parx = 0
+    pary = 0
+    txtls = txts.split("\n")
     for t in txtls:
-        rM=rT.match(t)
+        rM = rT.match(t)
+        rM2 = rT2.match(t)
         if rM:
-            sizetxt=rM.group(1)
-            dartxt=rM.group(2)
-            tX=int(sizetxt.split("x")[0])
-            tY=int(sizetxt.split("x")[1])
-            tEX=int(dartxt.split(":")[0])
-            tEY=int(dartxt.split(":")[1])
-            if sizeMaxX<tX:
-                sizeMaxX=tX
-                if tX==1920 and tY==1080:
-                    parx=1
-                    pary=1
+            sizetxt = rM.group(1)
+            dartxt = rM.group(2)
+            tX = int(sizetxt.split("x")[0])
+            tY = int(sizetxt.split("x")[1])
+            tEX = int(dartxt.split(":")[0])
+            tEY = int(dartxt.split(":")[1])
+            if sizeMaxX < tX:
+                sizeMaxX = tX
+                if tX == 1920 and tY == 1080:
+                    parx = 1
+                    pary = 1
                 else:
-                    parx=tEX
-                    pary=tEY
-    os.remove(pin+".size.ts")
-    return [parx,pary]
-def getMovieDAR(pin):
-    ffmpeg=configreader.getConfPath("ffmpeg")
-    os.environ['LANG']="ja_JP.UTF-8"
-    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+.*DAR\D+(\d+:\d+)\D+.*\Z")
-    sizeMaxX=0
-    darx=0
-    dary=0
-    txtls=txts.split("\n")
-    for t in txtls:
-        rM=rT.match(t)
-        if rM:
-            sizetxt=rM.group(1)
-            dartxt=rM.group(2)
-            tX=int(sizetxt.split("x")[0])
-            tY=int(sizetxt.split("x")[1])
-            tEX=int(dartxt.split(":")[0])
-            tEY=int(dartxt.split(":")[1])
-            if sizeMaxX<tX:
-                sizeMaxX=tX
-                if tX==1920 and tY==1080:
-                    darx=16
-                    dary=9
+                    parx = tEX
+                    pary = tEY
+        rM = rT.match(t)
+        if rM2:
+            sizetxt = rM2.group(1)
+            sartxt = rM2.group(2)
+            dartxt = rM2.group(3)
+            tX = int(sizetxt.split("x")[0])
+            tY = int(sizetxt.split("x")[1])
+            tEX = int(dartxt.split(":")[0])
+            tEY = int(dartxt.split(":")[1])##dar=sarxpar
+            tSX = int(sartxt.split(":")[0])
+            tSY = int(sartxt.split(":")[1])##par=dar/sar= darx*pary*sary=dary*parx*sarx
+            if sizeMaxX < tX:
+                sizeMaxX = tX
+                if tX == 1920 and tY == 1080:
+                    parx = 1
+                    pary = 1
                 else:
-                    darx=tEX
-                    dary=tEY
-    return [darx,dary]
-def getMovieDAR2(pin):
-    ffmpeg=configreader.getConfPath("ffmpeg")
-    os.environ['LANG']="ja_JP.UTF-8"
-    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
-    darx=0
-    dary=0
-    txtls=txts.split("\n")
-    for t in txtls:
-        rM=rT.match(t)
-        if rM:
-            sizetxt=rM.group(1)
-            dartxt=rM.group(2)
-            tX=int(sizetxt.split("x")[0])
-            tY=int(sizetxt.split("x")[1])
-            tEX=int(dartxt.split(":")[0])
-            tEY=int(dartxt.split(":")[1])
-            if sizeMaxX<tX:
-                sizeMaxX=tX
-                if tX==1920 and tY==1080:
-                    darx=16
-                    dary=9
-                else:
-                    darx=tEX
-                    dary=tEY
+                    if tEX * tSY == tEY * tSX:
+                        parx = 1
+                        pary = 1
+                    elif tEX * tSY * 3 == tEY * tSX * 4:
+                        parx = 4
+                        pary = 3
+                    elif tEX * tSY * 4 == tEY * tSX * 3:
+                        parx = 3
+                        pary = 4
+                    elif tEX * tSY * 9 == tEY * tSX * 16:
+                        parx = 16
+                        pary = 9
+                    elif tEX * tSY * 16 == tEY * tSX * 9:
+                        parx = 9
+                        pary = 16
     os.remove(pin+".size.ts")
-    return [darx,dary]
+    return [parx,pary]
 def getParSize(pin,y):
     tSize=getMovieBaseSize2(pin)
     if tSize[1] != 0 :