From: gn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Date: Sun, 28 Nov 2010 02:55:36 +0000 (+0000)
Subject: implement to work "a bit after start resolution changing movie".
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=db8b10d9191e102fbb453ad394b9b2e692c56008;p=rec10%2Frec10-git.git

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

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

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index 6fe05e7..0043e62 100644
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -85,7 +85,7 @@ def encode_sar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
     x264preset=""
     x264tune=""
     x264_bitrate="5000"
-    tsar=getMoviePAR(pin)
+    tsar=getMoviePAR2(pin)
     x264sar=str(tsar[0])+":"+str(tsar[1])
     if is24fps==1:
         ofps="-ofps 24000/1001"
@@ -125,7 +125,7 @@ def encode_sar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
         x264streamsize=str(tsize[0])+u"x720"
         x264_bitrate="2500"
     if deinterlace==0:
-        tsize=getMovieBaseSize(pin)
+        tsize=getMovieBaseSize2(pin)
         ofps="-ofps 30000/1001"
         #fps="-fps 30000/1001"
         fps=""
@@ -160,7 +160,7 @@ def encode_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)
     os.environ['LANG']="ja_JP.UTF-8"
     random.seed(pin)
@@ -182,8 +182,6 @@ def encode_sar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
         ""
     os.system("rm "+streampath)
     recdblist.addCommandLog(pin, u"Mencoder", encexe, txt)
-
-
 def encode_ffmpeg_sar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
     """
 
@@ -196,7 +194,7 @@ def encode_ffmpeg_sar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
     x264tune=""
     x264_bitrate="2500"
     x264_thread="auto"
-    tsar=getMoviePAR(pin)
+    tsar=getMoviePAR2(pin)
     filter="-deinterlace"
     x264sar=str(tsar[0])+":"+str(tsar[1])
     if size == "HD":
@@ -235,7 +233,7 @@ def encode_ffmpeg_sar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
         x264streamsize=str(tsize[0])+u"x720"
         x264_bitrate="2500"
     if deinterlace==0:
-        tsize=getMovieBaseSize(pin)
+        tsize=getMovieBaseSize2(pin)
         fps=""
         s = "-s "+str(tsize[0])+"x"+str(tsize[1])+" "
         x264fps="30000/1001"
@@ -271,7 +269,6 @@ def encode_ffmpeg_sar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
     except:
         ""
     recdblist.addCommandLog(pin, u"FFmpeg動画エンコード", exe, txt)
-
 def getMovieBaseSize(pin):
     ffmpeg=configreader.getpath("ffmpeg")
     os.environ['LANG']="ja_JP.UTF-8"
@@ -432,7 +429,7 @@ def getMovieDAR2(pin):
     os.remove(pin+".size.ts")
     return [darx,dary]
 def get_par_size(pin,y):
-    tSize=getMovieBaseSize(pin)
+    tSize=getMovieBaseSize2(pin)
     if tSize[1] != 0 :
         tX=tSize[0]*10*y/tSize[1]
         tY=y