From: gn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Date: Fri, 25 Jun 2010 23:19:05 +0000 (+0000)
Subject: correct 1920x1080 par/dar data(maybe ffmpeg was wrong)
X-Git-Url: http://git.osdn.net/view?p=rec10%2Frec10-git.git;a=commitdiff_plain;h=5fdcf17c453f5dec1c78b978f0b0527a6ed7973d

correct 1920x1080 par/dar data(maybe ffmpeg was wrong)

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

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index 35b6460..946f9ec 100644
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -536,6 +536,9 @@ def getMovieSize(pin):
             tY=int(sizetxt.split("x")[1])
             tEX=int(partxt.split(":")[0])
             tEY=int(partxt.split(":")[1])
+            if tX==1920 and tY==1080:
+                tEX=1
+                tEY=1
             tX2=tX*tEX*10/tEY
             if tX2>10*int(tX2/10):
                 tX2=tX2/10+1
@@ -589,8 +592,12 @@ def getMoviePAR(pin):
             tEY=int(dartxt.split(":")[1])
             if sizeMaxX<tX:
                 sizeMaxX=tX
-                parx=tEX
-                pary=tEY
+                if tX==1920 and tY==1080:
+                    parx=1
+                    pary=1
+                else:
+                    parx=tEX
+                    pary=tEY
     return [parx,pary]
 def getMovieDAR(pin):
     ffmpeg=configreader.getpath("ffmpeg")
@@ -613,8 +620,12 @@ def getMovieDAR(pin):
             tEY=int(dartxt.split(":")[1])
             if sizeMaxX<tX:
                 sizeMaxX=tX
-                darx=tEX
-                dary=tEY
+                if tX==1920 and tY==1080:
+                    darx=16
+                    dary=9
+                else:
+                    darx=tEX
+                    dary=tEY
     return [darx,dary]
 def get16_9ffmpeg_s(pin,x,y):
     try: