new de-interlacer implemented.(use yadif)

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

diff --git a/rec10/trunk/src/tester.py b/rec10/trunk/src/tester.py
index 3a5cee5..403e0f9 100644 (file)
--- a/rec10/trunk/src/tester.py
+++ b/rec10/trunk/src/tester.py
@@ -66,5 +66,5 @@ if __name__ == "__main__":
     #print doexe
     #print zenhan.check_Character_Type()
     #auto_process.Update_to_MP4("")
-    #rec10d.rec10db.add_recjbk("")
+    #rec10d.rec10db.add_recjbk("畑健二郎")
     ""
\ No newline at end of file

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index e9ca6e0..55604c4 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -385,7 +385,7 @@ def search_keyword(key):
                 btimet = btt.strftime("%Y-%m-%d %H:%M:%S")
                 etimet = ett.strftime("%Y-%m-%d %H:%M:%S")
                 try:
-                    recdb.rec_reckey(recdb.REC_AUTO_SUGGEST, titlet, chtxtt, btimet, etimet, opt)
+                    recdb.rec_reckey(recdb.REC_AUTO_SUGGEST, titlet, chtxtt, btimet, etimet,"")
                 except Exception, inst:
                     print type(inst)
                     print inst
\ No newline at end of file

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index 9637953..6af759c 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -37,9 +37,9 @@ def encode(pin,pout,size,isAnime,is2pass):
     encvf=""
     txt=""
     if isAnime == 1:
-        encvf = "-vf pullup,softskip,pp=l5,"
+        encvf = "-vf yadif=3,pp=l5,framestep=2,"
     else:
-        encvf = "-vf pp=l5,"
+        encvf = "-vf yadif=3,pp=l5,framestep=2,"
     if size == "HD":
         encvf = encvf + "scale=1280:720,harddup"
         bitrate = "bitrate=" + tv2avi.Bitrate_HD
@@ -59,8 +59,8 @@ def encode(pin,pout,size,isAnime,is2pass):
         encvf = encvf + "scale=1280:720,harddup"
         bitrate = "bitrate=" + tv2avi.Bitrate_HD
     if is2pass == 1:
-        pas1exe = "mencoder \'" + pin + "\' -quiet -ovc x264 " + encvf + " -x264encopts " + bitrate + ":threads=auto:pass=1:turbo=2 -passlogfile \'" + pin + ".log\' " + "-oac mp3lame -lameopts cbr:br=128 -o /dev/null"
-        pas2exe = "mencoder \'" + pin + "\' -quiet -ovc x264 " + encvf + " -x264encopts " + bitrate + ":threads=auto:pass=2 -passlogfile \'" + pin + ".log\' " + "-oac mp3lame -lameopts cbr:br=128 -o \'" + pout + "\'"
+        pas1exe = "mencoder \'" + pin + "\' -quiet -ovc x264 " + encvf + " -ofps 30000/1001 -x264encopts " + bitrate + ":threads=auto:pass=1:turbo=2 -passlogfile \'" + pin + ".log\' " + "-oac mp3lame -lameopts cbr:br=128 -o /dev/null"
+        pas2exe = "mencoder \'" + pin + "\' -quiet -ovc x264 " + encvf + " -ofps 30000/1001 -x264encopts " + bitrate + ":threads=auto:pass=2 -passlogfile \'" + pin + ".log\' " + "-oac mp3lame -lameopts cbr:br=128 -o \'" + pout + "\'"
         pas1exe = "nice -n 19 " + pas1exe
         pas2exe = "nice -n 19 " + pas2exe
         print pas1exe
@@ -69,7 +69,7 @@ def encode(pin,pout,size,isAnime,is2pass):
         time.sleep(5)
         txt=txt+commands.getoutput(pas2exe)
     else:
-        pas1exe = "mencoder \'" + pin + "\' -quiet -ovc x264 " + encvf + " -x264encopts " + bitrate + ":threads=auto -oac mp3lame -lameopts cbr:br=128  -o \'" + pout + "\'"
+        pas1exe = "mencoder \'" + pin + "\' -quiet -ovc x264 " + encvf + " -ofps 30000/1001 -x264encopts " + bitrate + ":threads=auto -oac mp3lame -lameopts cbr:br=128  -o \'" + pout + "\'"
         pas1exe = "nice -n 19 " + pas1exe
         print pas1exe
         txt=txt+commands.getoutput(pas1exe)