X-Git-Url: http://git.osdn.net/view?p=rec10%2Frec10-git.git;a=blobdiff_plain;f=rec10%2Ftrunk%2Fsrc%2Fauto_test.py;h=4c6db079cf3a4baadc3b4d969048d1a299de46a8;hp=75ff69e5d8188a1e23ef4ddf17b8cb2a5a21038b;hb=12414a3ba81d93316e351ab51aa49bb71cf42f60;hpb=7160b23094399ee7fdc186331aa3096c353447c3

diff --git a/rec10/trunk/src/auto_test.py b/rec10/trunk/src/auto_test.py
index 75ff69e..4c6db07 100644
--- a/rec10/trunk/src/auto_test.py
+++ b/rec10/trunk/src/auto_test.py
@@ -1,43 +1,43 @@
-#!/usr/bin/python
-# coding: UTF-8
-# Rec10 TS Recording Tools
-# Copyright (C) 2009-2010 Yukikaze
-import os
-import os.path
-import time
-import optparse
-import sys
-import datetime
-
-import configreader
-import chdb
-import tv2mp4
-import tv2ts
-def testAllCHEncode(option,stime):
-    chl=chdb.getAll()
-    print chl
-    path= configreader.getPathSetting("test")
-    tpath=os.path.join(path, "encode_test")
-    if not os.path.exists(tpath):
-        os.mkdir(tpath)
-    dnowt=datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S")+"_"+option+""
-    tpatht=os.path.join(tpath,dnowt)
-    if not os.path.exists(tpatht):
-        os.mkdir(tpatht)
-    if len(chl)>0:
-        for t in chl:
-            print t
-            pathname=os.path.join(tpatht,t['chtxt'])
-            print pathname
-            tv2ts.tv2ts(pathname+".ts",t['ch'],t['csch'], stime)
-            tv2mp4.ts2mp4(pathname+".ts", pathname+".mp4", option)
-            time.sleep(2)
-if __name__ == "__main__":
-    usage="usage: "
-    version="%prog 0.9.7"
-    parser=optparse.OptionParser(usage=usage,version=version)
-    parser.add_option("-e","--Encode",action="store",type="string",dest="encode_option",default="",metavar="TITLE",help="encode test(option)")
-    (opts,args)=parser.parse_args(sys.argv)
-    if opts.encode_option != "":##-sの場合
-        print "test_all_ch_encode"
-        testAllCHEncode(opts.encode_option, "10")
\ No newline at end of file
+#!/usr/bin/python
+# coding: UTF-8
+# Rec10 TS Recording Tools
+# Copyright (C) 2009-2011 Yukikaze
+import os
+import os.path
+import time
+import optparse
+import sys
+import datetime
+
+import configreader
+import chdb
+import tv2mp4
+import tv2ts
+def testAllCHEncode(option,stime):
+    chl=chdb.getAllCH()
+    print chl
+    path= configreader.getConfPath("test")
+    tpath=os.path.join(path, "encode_test")
+    if not os.path.exists(tpath):
+        os.mkdir(tpath)
+    dnowt=datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S")+"_"+option+""
+    tpatht=os.path.join(tpath,dnowt)
+    if not os.path.exists(tpatht):
+        os.mkdir(tpatht)
+    if len(chl)>0:
+        for t in chl:
+            print t
+            pathname=os.path.join(tpatht,t['chtxt'])
+            print pathname
+            tv2ts.tv2ts(pathname+".ts",t['ch'],t['csch'], stime,t['tsid'])
+            tv2mp4.ts2mp4(pathname+".ts", pathname+".mp4", option)
+            time.sleep(2)
+if __name__ == "__main__":
+    usage="usage: "
+    version="%prog 0.9.7"
+    parser=optparse.OptionParser(usage=usage,version=version)
+    parser.add_option("-e","--Encode",action="store",type="string",dest="encode_option",default="",metavar="TITLE",help="encode test(option)")
+    (opts,args)=parser.parse_args(sys.argv)
+    if opts.encode_option != "":##-sの場合
+        print "test_all_ch_encode"
+        testAllCHEncode(opts.encode_option, "10")