From: gn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Date: Fri, 11 Feb 2011 13:34:18 +0000 (+0000)
Subject: implement new demuxer encoding test.
X-Git-Url: http://git.osdn.net/view?p=rec10%2Frec10-git.git;a=commitdiff_plain;h=583ae8bffae5a6f9bccce03bc8742b799ef7a26a

implement new demuxer encoding test.

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

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index 59ff700..3038671 100644
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -75,11 +75,30 @@ def ts2x264(pin, pout, opts):#sizeは"HD"か"SD"
             encodeMencoderSar_lavf(pin, pout,size,is24fps,quality,crf,deinterlace)
         except Exception, inst:
             recdblist.addCommonlogEX("Error in X", "ts2x264(ts2x264.py)", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)
+    elif re.search("Y",opts):
+        try:
+            encodeMencoderSar_lavf(pin, pout,size,is24fps,quality,crf,deinterlace)
+            if os.path.exists(pout):
+                if not os.path.getsize(pout)>1*1000:
+                    recdblist.addCommonlogEX("Warning", "Old mencoder option used.", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)
+                    try:
+                        encodeMencoderSar(pin, pout,size,is24fps,quality,crf,deinterlace)
+                    except Exception, inst:
+                        recdblist.addCommonlogEX("Error", "ts2x264_mencoder_old(ts2x264.py)", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)
+            else:
+                recdblist.addCommonlogEX("Warning", "Old mencoder option used.", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)
+                try:
+                    encodeMencoderSar(pin, pout,size,is24fps,quality,crf,deinterlace)
+                except Exception, inst:
+                    recdblist.addCommonlogEX("Error", "ts2x264_mencoder_old(ts2x264.py)", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)
+        except Exception, inst:
+            recdblist.addCommonlogEX("Error", "ts2x264(ts2x264.py)", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)
     else:
         try:
             encodeMencoderSar(pin, pout,size,is24fps,quality,crf,deinterlace)
         except Exception, inst:
             recdblist.addCommonlogEX("Error", "ts2x264(ts2x264.py)", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)
+
 def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
     mencoder=configreader.getConfPath("mencoder")
     tee=configreader.getConfPath("tee")