implement movie size getting error recovery mode.

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

diff --git a/rec10/trunk/src/readme.txt b/rec10/trunk/src/readme.txt
index 7251547..0c5eae3 100644 (file)
--- a/rec10/trunk/src/readme.txt
+++ b/rec10/trunk/src/readme.txt
@@ -74,6 +74,8 @@ yukikaze.jp@gmail.com
 色空間を修正
 放送大学のマルチチャンネルに仮対応
 verboseモードの実装
+ログレベルの実装
+画面サイズが取得できなかったときの処理を追加
 
 10/07/10 0.9.7 release
 ヒストリーチャンネルのタイトルを修正

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index 345dbf7..9731e4e 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -139,8 +139,16 @@ def encode_sar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
         harddup=",harddup"
         encvf=encvf+harddup
         x264streamsize=str(tsize[0])+u"x"+str(tsize[1])
-    if tsize[0] <= 0 and tsize[1] <= 0:
+    if tsize[0] <= 0 or tsize[1] <= 0:
+        encvf="-sws 9 -vf yadif=0,pp=l5"
+        harddup=",hqdn3d=2:1:2,unsharp=l3x3:0.75:c3x3:0.75,harddup"
+        ofps="-ofps 30000/1001"
+        fps="-fps 30000/1001"
+        x264fps="30000/1001"
         tsize=[1280,720]
+        encvf = encvf + ",scale=-2:720::0:3,expand=1280:720"+harddup
+        x264streamsize=u"1280x720"
+        x264_bitrate="2500"
     if quality==1:
         x264preset=u"ultrafast"
     elif quality==2: