fix ffmpeg encode option.

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

diff --git a/rec10/trunk/src/classify.py b/rec10/trunk/src/classify.py
index 145cb52..5076b02 100644 (file)
--- a/rec10/trunk/src/classify.py
+++ b/rec10/trunk/src/classify.py
@@ -155,8 +155,16 @@ def searchFolder(title,path):
         rT=re.compile("(.+)_(\d*)\Z")
         tT=rT.match(title)
         tT2=rT.match(cmpp)
-        if tT:
+        rT3=re.compile("(.+)_(.+)_(\d*)\Z")#_(aichi)_2010-02-06T01:59:00.mkv
+        tT3=rT3.match(title)
+        rT4=re.compile("(.+)_(.+)_\d-\d-\dT\d:\d:\d\Z")#_(aichi)_2010-02-06T01:59:00.mkv
+        tT4=rT4.match(title)
+        if tT :
             ntitle=tT.group(0)
+        elif tT3:
+            ntitle=tT3.group(0)
+        elif tT4:
+            ntitle=tT4.group(0)
         if tT2:
             cmpp=cmpp.group(0)
         p=n_gram.trigram(ntitle,cmpp)

diff --git a/rec10/trunk/src/recdblist.py b/rec10/trunk/src/recdblist.py
index 651d69e..7d1bc29 100644 (file)
--- a/rec10/trunk/src/recdblist.py
+++ b/rec10/trunk/src/recdblist.py
@@ -93,11 +93,11 @@ def addlog(tspath,txt,log_title):
     f=open(logo,'a')
     s=len(txt)
     stxt=""
-    if s>1000:
-        stxt=txt[0:500]+"\n\n(ry..)\n"
-        st=txt[s-500:].find("\n")
+    if s>1400:
+        stxt=txt[0:700]+"\n\n(ry..)\n"
+        st=txt[s-700:].find("\n")
         if st>0:
-            stxt=stxt+txt[s-500+st:]
+            stxt=stxt+txt[s-700+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 8a838bf..b68475f 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -186,45 +186,54 @@ def encode_ffmpeg(pin,pout,size,is2pass,is24fps,quality):
     """
     ffmpeg="ffmpeg"
     if quality<3:
-        x264enc="-vpre hq -level 42 -me_method dia -partitions none -refs 1 -scenecut 0 -trellis 0 "
+        x264enc="-level 42 -me_method dia -partitions none -refs 1 -scenecut 0 -trellis 0 "
         x264enc1=x264enc
         x264enc2=x264enc1
     elif quality<5:
-        x264enc="-vpre hq -level 42 -me_method dia -partitions parti8x8+parti4x4 -refs 1 -trellis 0 "
-        x264enc1="-vpre hq -level 42 -me_method dia -partitions none -refs 1 -trellis 0 "
+        x264enc="-level 42 -me_method dia -partitions parti8x8+parti4x4 -refs 1 -trellis 0 "
+        x264enc1="-level 42 -me_method dia -partitions none -refs 1 -trellis 0 "
+        x264enc1=x264enc
         x264enc2=x264enc
     elif quality<7:
-        x264enc="-vpre hq -level 42 "
-        x264enc1="-vpre hq -level 42 -me_method dia -partitions none "
+        x264enc="-level 42 "
+        x264enc1="-level 42 -me_method dia -partitions none "
+        x264enc1=x264enc
         x264enc2=x264enc
     elif quality<9:
-        x264enc="-vpre hq -level 42 -directpred auto -refs 5 -subq 6 -bf 1 -trellis 1 "
-        x264enc1="-vpre hq -level 42 -me_method dia -partitions none -refs 1 -subq 6 -bf 1 -trellis 1 "
+        x264enc="-level 42 -directpred auto -refs 5 -subq 6 -bf 1 -trellis 1 "
+        x264enc1="-level 42 -me_method dia -partitions none -refs 1 -subq 6 -bf 1 -trellis 1 "
+        x264enc1=x264enc
         x264enc2=x264enc
     elif quality<11:
-        x264enc="-vpre hq -level 42 -refs 5 -subq 7 -trellis 2 -partitions all -directpred auto -me_method umh -bf 3 "
-        x264enc1="-vpre hq -level 42 -me_method dia -partitions none -refs 1 -subq 7 -trellis 2 -directpred auto -bf 3 "
+        x264enc="-level 42 -refs 5 -subq 7 -trellis 2 -partitions all -directpred auto -me_method umh -bf 3 "
+        x264enc1="-level 42 -me_method dia -partitions none -refs 1 -subq 7 -trellis 2 -directpred auto -bf 3 "
+        x264enc1=x264enc
         x264enc2=x264enc
     if is24fps==1:
         if quality<3:
-            x264enc="-vpre hq -level 42 -me_method dia -partitions none -refs 1 -scenecut 0 -trellis 0 -deblockalpha 1 -deblockbeta 1 "
-            x264enc1="-vpre hq -level 42 -me_method dia -partitions none -refs 1 -scenecut 0 -trellis 0 -deblockalpha 1 -deblockbeta 1 "
+            x264enc="-level 42 -me_method dia -partitions none -refs 1 -scenecut 0 -trellis 0 -deblockalpha 1 -deblockbeta 1 "
+            x264enc1="-level 42 -me_method dia -partitions none -refs 1 -scenecut 0 -trellis 0 -deblockalpha 1 -deblockbeta 1 "
+            x264enc1=x264enc
             x264enc2=x264enc
         elif quality<5:
-            x264enc="-vpre hq -level 42 -me_method dia -partitions parti8x8+parti4x4 -refs 1 -trellis 0 -deblockalpha 1 -deblockbeta 1 "
-            x264enc1="-vpre hq -level 42 -me_method dia -partitions none -refs 1 -trellis 0 -deblockalpha 1 -deblockbeta 1 "
+            x264enc="-level 42 -me_method dia -partitions parti8x8+parti4x4 -refs 1 -trellis 0 -deblockalpha 1 -deblockbeta 1 "
+            x264enc1="-level 42 -me_method dia -partitions none -refs 1 -trellis 0 -deblockalpha 1 -deblockbeta 1 "
+            x264enc1=x264enc
             x264enc2=x264enc
         elif quality<7:
-            x264enc="-vpre hq -level 42 -deblockalpha 1 -deblockbeta 1 "
-            x264enc1="-me_method dia -partitions none -refs 1 -vpre hq -level 42 -deblockalpha 1 -deblockbeta 1 "
+            x264enc="-level 42 -deblockalpha 1 -deblockbeta 1 "
+            x264enc1="-me_method dia -partitions none -vpre hq -level 42 -deblockalpha 1 -deblockbeta 1 "
+            x264enc1=x264enc
             x264enc2=x264enc
         elif quality<9:
-            x264enc="-vpre hq -level 42 -directpred auto -refs 5 -subq 6 -bf 1 -trellis 1 -deblockalpha 1 -deblockbeta 1 "
-            x264enc1="-vpre hq -level 42 -directpred auto -me_method dia -partitions none -refs 1 -subq 6 -bf 1 -trellis 1 -deblockalpha 1 -deblockbeta 1 "
+            x264enc="-level 42 -directpred auto -refs 5 -subq 6 -bf 1 -trellis 1 -deblockalpha 1 -deblockbeta 1 "
+            x264enc1="-level 42 -directpred auto -me_method dia -partitions none -refs 1 -subq 6 -bf 1 -trellis 1 -deblockalpha 1 -deblockbeta 1 "
+            x264enc1=x264enc
             x264enc2=x264enc
         elif quality<11:
-            x264enc="-vpre hq -level 42 -refs 5 -subq 7 -trellis 2 -partitions all -directpred auto -me_method umh -bf 3 -deblockalpha 1 -deblockbeta 1 "
-            x264enc1="-vpre hq -level 42 -refs 1 -subq 7 -trellis 2 -partitions none -directpred auto -me_method dia -bf 3 -deblockalpha 1 -deblockbeta 1 "
+            x264enc="-level 42 -refs 5 -subq 7 -trellis 2 -partitions all -directpred auto -me_method umh -bf 3 -deblockalpha 1 -deblockbeta 1 "
+            x264enc1="-level 42 -refs 1 -subq 7 -trellis 2 -partitions none -directpred auto -me_method dia -bf 3 -deblockalpha 1 -deblockbeta 1 "
+            x264enc1=x264enc
             x264enc2=x264enc
     if size == "HD":
         s = "-s 1280x720 "
@@ -253,27 +262,31 @@ def encode_ffmpeg(pin,pout,size,is2pass,is24fps,quality):
     txt=""
     if is2pass==1:
         os.environ['LANG']="ja_JP.UTF-8"
-        exe1=ffmpeg+" -y -i \""+pin+"\" -pass 1 -vsync 400 -vcodec libx264 -b "+bitrate+"k "+x264enc1+s+"-deinterlace -an -f avi -passlogfile \'" + pin + ".log\' " + " /dev/null"
-        exe2=ffmpeg+" -y -i \""+pin+"\" -pass 2 -vsync 400 -vcodec libx264 -b "+bitrate+"k "+x264enc2+s+"-deinterlace -an -f avi -passlogfile \'" + pin + ".log\' \"" +pout+"\"" #aviにすべきかどうか
+        exe1=ffmpeg+" -y -i \""+pin+"\" -pass 1 -vsync 400 -vcodec libx264 -vpre fastfirstpass -b "+bitrate+"k "+x264enc1+s+"-deinterlace -an -f avi /dev/null"
+        exe2=ffmpeg+" -y -i \""+pin+"\" -pass 2 -vsync 400 -vcodec libx264 -vpre hq -b "+bitrate+"k "+x264enc2+s+"-deinterlace -an -f avi \"" +pout+"\"" #aviにすべきかどうか
         recdblist.printutf8(exe1)
         exe1 = "nice -n 19 " + exe1
         exe2 = "nice -n 19 " + exe2
-        txt=txt+u"Cmd : "+exe1+"\n"+exe2+"\n"
+        txt=txt+u"Cmd : "+exe1+"\n"
         txtt=""
         try:
             txtt=unicode(commands.getoutput(exe1.encode('utf-8')),'utf-8')
         except:
             ""
         txt=txt+txtt
+        recdblist.addlog( pin, txt, "dual audio ffmpeg-log - 1pass")
+        txt=""
+        txt=txt+u"Cmd : "+exe2+"\n"
         txtt=""
         try:
             txtt=unicode(commands.getoutput(exe2.encode('utf-8')),'utf-8')
         except:
             ""
         txt=txt+txtt
+        recdblist.addlog( pin, txt, "dual audio ffmpeg-log - 2pass")
     else:
         os.environ['LANG']="ja_JP.UTF-8"
-        exe=ffmpeg+" -y -i \""+pin+"\" -vsync 400 -vcodec libx264 -b "+bitrate+"k "+x264enc+s+"-deinterlace -an \"" +pout+"\""
+        exe=ffmpeg+" -y -i \""+pin+"\" -vsync 400 -vcodec libx264 -vpre hq -b "+bitrate+"k "+x264enc+s+"-deinterlace -an \"" +pout+"\""
         txt=txt+"Cmd : "+exe+"\n"
         exe = "nice -n 19 " + exe
         txt=txt+"Cmd : "+exe+"\n"
@@ -283,5 +296,5 @@ def encode_ffmpeg(pin,pout,size,is2pass,is24fps,quality):
         except:
             ""
         txt=txt+txtt
-    recdblist.addlog( pin, txt, "dual audio ffmpeg-log")
+        recdblist.addlog( pin, txt, "dual audio ffmpeg-log")
     
\ No newline at end of file