fix logging system.

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

diff --git a/rec10/trunk/src/rec10.conf b/rec10/trunk/src/rec10.conf
index 13bd37d..20106e0 100644 (file)
--- a/rec10/trunk/src/rec10.conf
+++ b/rec10/trunk/src/rec10.conf
@@ -57,6 +57,6 @@ make_mp4 = 1
 #エンコードの重さの設定　大きければ大きいほど(1-6)速度は遅くなるが同じ画質でもサイズが小さくなる。
 x264_preset=4
 crf=24
-animation_crf=20
+animation_crf=18
 x264_addline =
 remove_ts = 0

diff --git a/rec10/trunk/src/recdblist.py b/rec10/trunk/src/recdblist.py
index fc17c4a..b8aeb3d 100644 (file)
--- a/rec10/trunk/src/recdblist.py
+++ b/rec10/trunk/src/recdblist.py
@@ -94,11 +94,11 @@ def addlog(tspath,txt,log_title):
     f=open(logo,'a')
     s=len(txt)
     stxt=""
-    if s>1400:
-        stxt=txt[0:700]+"\n\n(ry..)\n"
-        st=txt[s-700:].find("\n")
+    if s>1600:
+        stxt=txt[0:800]+"\n\n(ry..)\n"
+        st=txt[s-800:].find("\n")
         if st>0:
-            stxt=stxt+txt[s-700+st:]
+            stxt=stxt+txt[s-800+st:]
     else:
         stxt=txt
     txtw="\n####"+log_title+"####\n"+stxt

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index c656112..baac913 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -68,7 +68,7 @@ def encode(pin,pout,size,is24fps,quality,crf):
     encvf=""
     txt=""
     encvf="-vf yadif=0,pp=l5"
-    harddup=",hqdn3d=2:1:2,harddup"
+    harddup=",hqdn3d=2:1:2,unsharp=l3x3:0.75:c3x3:0.75,harddup"
     ofps="-ofps 30000/1001"
     fps="-fps 30000/1001"
     x264fps="--fps 30000/1001"
@@ -82,8 +82,8 @@ def encode(pin,pout,size,is24fps,quality,crf):
         fps="-fps 30000/1001"
         x264fps="--fps 24000/1001"
         x264tune="--tune animation"
-        encvf="-vf pullup,softskip,pp=l5"
-        harddup=",hqdn3d=2:1:2,harddup"
+        encvf="-vf pullup,softskip"
+        harddup=",pp=l5,unsharp=l3x3:0.75:c3x3:0.75,hqdn3d=2:1:2,harddup"
     if size == "HD":
         encvf = encvf + ",scale=1280:720::0:3"+harddup
         x264streamsize=u"1280x720"

diff --git a/rec10/trunk/src/tv2mkv.py b/rec10/trunk/src/tv2mkv.py
index 8b72c28..4ec2880 100644 (file)
--- a/rec10/trunk/src/tv2mkv.py
+++ b/rec10/trunk/src/tv2mkv.py
@@ -120,6 +120,7 @@ def avi2mkv(pin,pout,opt):
         ispentaaudio=1
     exe = configreader.getpath("mkvmerge")
     txt=""
+    txt2=""
     os.environ['LANG']="ja_JP.UTF-8"
     if isdualaac==1:
         wineexe=configreader.getpath("wine")
@@ -139,9 +140,9 @@ def avi2mkv(pin,pout,opt):
         if os.path.isfile(cap2ass):
             txt=txt+execcomd(e0)
         if os.path.exists(pincap) and (os.path.getsize(pincap)>1000):
-            txt=txt+execcomd(e1s)
+            txt2=txt2+execcomd(e1s)
         else:
-            txt=txt+execcomd(e1)
+            txt2=txt2+execcomd(e1)
     elif ispentaaudio==1:
         wineexe=configreader.getpath("wine")
         pincap=pin.replace(".avi",".srt")
@@ -160,9 +161,9 @@ def avi2mkv(pin,pout,opt):
         if os.path.isfile(cap2ass):
             txt=txt+execcomd(e0)
         if os.path.exists(pincap) and (os.path.getsize(pincap)>1000):
-            txt=txt+execcomd(e1s)
+            txt2=txt2+execcomd(e1s)
         else:
-            txt=txt+execcomd(e1)
+            txt2=txt2+execcomd(e1)
     else:
         wineexe=configreader.getpath("wine")
         pincap=pin.replace(".avi",".srt")
@@ -177,10 +178,11 @@ def avi2mkv(pin,pout,opt):
             txt=txt+execcomd(e0)
         txt=txt+execcomd(e1)
         if os.path.exists(pincap) and (os.path.getsize(pincap)>1000):
-            txt=txt+execcomd(e2s)
+            txt2=txt2+execcomd(e2s)
         else:
-            txt=txt+execcomd(e2)
-    recdblist.addlog(pout, txt, "mkvmerge-log")
+            txt2=txt2+execcomd(e2)
+    recdblist.addlog(pout, txt, "mkvmerge-log-01")
+    recdblist.addlog(pout, txt2, "mkvmerge-log-02")
     logo=pout.replace(".mkv",".log")
     if status.getSettings_auto_del_tmp()==1:
         if os.path.exists(pout):