add verbose level.

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

diff --git a/rec10/trunk/src/configreader.py b/rec10/trunk/src/configreader.py
index e2749cd..f4a8b93 100644 (file)
--- a/rec10/trunk/src/configreader.py
+++ b/rec10/trunk/src/configreader.py
@@ -25,3 +25,6 @@ def getdbpath(string):
 def getenv(string):
     global confp
     return confp.get('env', string)
+def getlog(string):
+    global confp
+    return confp.get('log', string)

diff --git a/rec10/trunk/src/rec10.conf b/rec10/trunk/src/rec10.conf
index 099025d..4fefb30 100644 (file)
--- a/rec10/trunk/src/rec10.conf
+++ b/rec10/trunk/src/rec10.conf
@@ -62,3 +62,7 @@ animation_crf=18
 x264_thread = 0
 x264_addline =
 remove_ts = 0
+
+[log]
+verbose = 400#デーモンとして使う場合は変更する必要はありません。
+log_level = 400#
\ No newline at end of file

diff --git a/rec10/trunk/src/recdblist.py b/rec10/trunk/src/recdblist.py
index 7264964..258bc57 100644 (file)
--- a/rec10/trunk/src/recdblist.py
+++ b/rec10/trunk/src/recdblist.py
@@ -79,17 +79,18 @@ def printutf8(unicode,verbose_level=500):
     str=unicode.encode('utf-8')
     if verbose_level_now > verbose_level:
         print str
-def printuft8ex(unicode,verbose_level=500):
+def printuft8ex(unicode,verbose_level=500,log_level=500):
     str=unicode.encode('utf-8')
     if verbose_level_now > verbose_level:
         print str
     logfname="/var/log/rec10"
     mode="a"
-    if os.path.exists(logfname):
-        f=open(logfname,mode)
-        f.write(str+"\n")
-        f.close()
-def Commonlogex(type,place,inst,txt,verbose_level=500):
+    if log_level_now > log_level:
+        if os.path.exists(logfname):
+            f=open(logfname,mode)
+            f.write(str+"\n")
+            f.close()
+def Commonlogex(type,place,inst,txt,verbose_level=500,log_level=500):
     lt=datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")+u":"
     if txt=="":
         lt=lt+u"["+type+u"] "+place+u" "+inst
@@ -100,10 +101,11 @@ def Commonlogex(type,place,inst,txt,verbose_level=500):
     mode="a"
     if verbose_level_now > verbose_level:
         print lt
-    if os.path.exists(logfname):
-        f=open(logfname,mode)
-        f.write(lt+"\n")
-        f.close()
+    if log_level_now > log_level:
+        if os.path.exists(logfname):
+            f=open(logfname,mode)
+            f.write(lt+"\n")
+            f.close()
 def addCommandLog(tspath,log_title,cmd,cmd_log=""):
     addlog(tspath,cmd,log_title+u"ログ-コマンド")
     addlog(tspath,cmd_log,log_title+u"ログ-詳細")

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index 508e284..fb2e03b 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -139,6 +139,8 @@ 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:
+        tsize=[1280,720]
     if quality==1:
         x264preset=u"ultrafast"
     elif quality==2:
@@ -347,12 +349,16 @@ def getMovieDAR(pin):
     return [darx,dary]
 def get_par_size(pin,y):
     tSize=getMovieBaseSize(pin)
-    tX=tSize[0]*10*y/tSize[1]
-    tY=y
-    if tX>int(tX/10)*10:
-        tX=tX/10+1
+    if tSize[1] != 0 :
+        tX=tSize[0]*10*y/tSize[1]
+        tY=y
+        if tX>int(tX/10)*10:
+            tX=tX/10+1
+        else:
+            tX=tX/10
     else:
-        tX=tX/10
+        tX=-1
+        tY=-1
     return [tX,tY]
 
 def get_x264core_version():