OSDN Git Service

stop using trunk directory in rectool
[rec10/rec10-git.git] / rec10 / trunk / src / ts2x264.py
index 0ca6ff8..d47e9aa 100644 (file)
@@ -1,13 +1,17 @@
 #!/usr/bin/python
 # coding: UTF-8
 # Rec10 TS Recording Tools
-# Copyright (C) 2009-2010 Yukikaze
+# Copyright (C) 2009-2011 Yukikaze
 import commands
 import configreader
 import os
 import os.path
+import sys
 import re
 import random
+import time
+import traceback
+import zip
 
 import recdblist
 def ts2x264(pin, pout, opts):#sizeは"HD"か"SD"
@@ -19,8 +23,11 @@ def ts2x264(pin, pout, opts):#sizeは"HD"か"SD"
     size="HD"
     crf=18
     quality=4
-    quality=int(configreader.getenv("x264_preset"))
-    crf=int(configreader.getenv("crf"))
+    quality=int(configreader.getConfEnv("x264_preset"))
+    crf=int(configreader.getConfEnv("crf"))
+    deinterlace=1
+    bluray=0
+    sar=1
     if re.search("H", opts):
         size = "HD"
     if re.search("S", opts):
@@ -29,18 +36,25 @@ def ts2x264(pin, pout, opts):#sizeは"HD"か"SD"
         size = "FullHD"
     if re.search("W",opts):
         size = "WVGA"
-    if re.search("MW8", opts):
+    if re.search("MW1",opts):
         size = "QVGA_BASE"
         crf=crf+4
-    if re.search("MW9", opts):
+        sar=0
+    if re.search("MW2", opts):
         size = "WVGA_BASE"
         crf=crf+2
+        sar=0
     if re.search("v", opts):
         is24fps=1
-        crf=int(configreader.getenv("animation_crf"))
+        crf=int(configreader.getConfEnv("animation_crf"))
     if re.search("a", opts):
         is24fps=1
-        crf=int(configreader.getenv("animation_crf"))
+        crf=int(configreader.getConfEnv("animation_crf"))
+    if re.search("I", opts):
+        deinterlace=0
+    if re.search("B", opts):
+        bluray=1
+        sar=0
     if re.search("q",opts):
         quality=quality-2
     if re.search("w",opts):
@@ -57,478 +71,314 @@ def ts2x264(pin, pout, opts):#sizeは"HD"か"SD"
         crf=crf-1
     if re.search("p",opts):
         crf=crf-2
-    if re.search("d",opts):
-        encode_ffmpeg_kai(pin,pout,size,is24fps,quality,crf)
-    elif re.search("5",opts):
-        encode_ffmpeg_kai(pin,pout,size,is24fps,quality,crf)
-    elif re.search("Y",opts):
-        encode_sar(pin,pout,size,is24fps,quality,crf)
-    elif re.search("Z",opts):
-        encode_ffmpeg_sar(pin,pout,size,is24fps,quality,crf)
-    elif re.search("b",opts):
-        try:
-            tm2v=pin.replace(".ts",".m2v")
-            encode(tm2v, pout,size,is24fps,quality,crf)
-        except Exception, inst:
-            recdblist.Commonlogex("Error", "ts2x264(ts2x264.py)", str(type(inst)), str(inst))
+    if re.search("d",opts):#二カ国語放送の場合
+        tm2v=pin.replace(".ts",".m2v")
+        encodeFfmpegSar(tm2v,pout,size,is24fps,quality,crf,deinterlace=deinterlace,usebluray=bluray,usesar=sar)
+    elif re.search("5",opts):#5.1chの場合
+        encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace=deinterlace,usebluray=bluray,usesar=sar)
+    elif re.search("b",opts):#BonTsDemuxを使いたい場合
+        tm2v=pin.replace(".ts",".m2v")
+        encodeFfmpegSar(tm2v,pout,size,is24fps,quality,crf,deinterlace=deinterlace,usebluray=bluray,usesar=sar)
     else:
         try:
-            encode(pin, pout,size,is24fps,quality,crf)
+            encodeMencoderSar(pin, pout,size,is24fps,quality,crf,deinterlace=deinterlace,uselavf=1,usebluray=bluray,usesar=sar)
+            if os.path.exists(pout):
+                if not os.path.getsize(pout)>1*1000:
+                    recdblist.addCommonlogEX("Warning", "Old mencoder option used.","","",log_level=200)
+                    try:
+                        encodeMencoderSar(pin, pout,size,is24fps,quality,crf,deinterlace=deinterlace,uselavf=0,usebluray=bluray,usesar=sar)
+                    except Exception, inst:
+                        recdblist.addCommonlogEX("Error", "ts2x264_mencoder_old(ts2x264.py)", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)
+            else:
+                recdblist.addCommonlogEX("Warning", "Old mencoder option used.","","",log_level=200)
+                try:
+                    encodeMencoderSar(pin, pout,size,is24fps,quality,crf,deinterlace=deinterlace,uselavf=0,usebluray=bluray,usesar=sar)
+                except Exception, inst:
+                    recdblist.addCommonlogEX("Error", "ts2x264_mencoder_old(ts2x264.py)", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)
         except Exception, inst:
-            recdblist.Commonlogex("Error", "ts2x264(ts2x264.py)", str(type(inst)), str(inst))
-def encode(pin,pout,size,is24fps,quality,crf):
-    mencoder=configreader.getpath("mencoder")
-    x264=configreader.getpath("x264")
+            recdblist.addCommonlogEX("Error", "ts2x264(ts2x264.py)", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)
+def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1,uselavf=0,usebluray=0,usesar=1):
+    mencoder=configreader.getConfPath("mencoder")
+    tee=configreader.getConfPath("tee")
     encvf=""
     txt=""
-    encvf="-vf yadif=0,pp=l5"
+    encvf="-sws 9 -vf yadif=0,pp=l5"
     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"
+    x264fps="30000/1001 --keyint 30"
     x264streamsize=""
     x264preset=""
     x264tune=""
     x264_bitrate="5000"
-    x264_thread="auto"
-    try:
-        xtt=configreader.getenv("x264_thread")
-        xtt=int(xtt)
-        if xtt>0:
-            x264_thread=str(xtt)
-    except:
-        x264_thread="auto"
-    x264_addline=configreader.getenv("x264_addline")
+    x264interlaced=0
+    x264sar="1:1"
+    tsar=getMoviePAR2(pin)
+    if usesar==1:
+        x264sar=str(tsar[0])+u":"+str(tsar[1])
+    lavft=""
     if is24fps==1:
         ofps="-ofps 24000/1001"
         fps="-fps 30000/1001"
-        x264fps="--fps 24000/1001"
+        x264fps="24000/1001 --keyint 24"
         x264tune="--tune animation"
-        encvf="-vf pullup,softskip"
+        encvf="-sws 9 -vf pullup,softskip"
         harddup=",pp=l5,unsharp=l3x3:0.75:c3x3:0.75,hqdn3d=2:1:2,harddup"
     if size == "HD":
-        encvf = encvf + ",scale=-2:720::0:3,expand=1280:720"+harddup
-        x264streamsize=u"1280x720"
+        tsize=getParSize(pin,720)
+        if usesar==1:
+            encvf = encvf + ",scale=-3:720::0:3"+harddup
+            x264streamsize=str(tsize[0])+u"x720"
+        else:
+            encvf = encvf + ",scale=-2:720::0:3,expand=1280:720"+harddup
+            x264streamsize=u"1280x720"
         x264_bitrate="2500"
     elif size == "WVGA":
-        encvf = encvf + ",scale=-2:480::0:3,expand=854:480"+harddup
-        x264streamsize=u"854x480"
+        tsize=getParSize(pin,480)
+        if usesar==1:
+            encvf = encvf + ",scale=-3:480::0:3"+harddup
+            x264streamsize=str(tsize[0])+u"x480"
+        else:
+            encvf = encvf + ",scale=-2:480::0:3,expand=854:480"+harddup
+            x264streamsize=u"854x480"
         x264_bitrate="1500"
     elif size == "FullHD":
-        encvf = encvf + ",scale=-2:1080::0:3,expand=1920:1080"+harddup
-        x264streamsize=u"1920x1080"
+        tsize=getParSize(pin,1080)
+        if usesar==1:
+            encvf = encvf + ",scale=-3:1080::0:3"+harddup
+            x264streamsize=str(tsize[0])+u"x1080"
+        else:
+            encvf = encvf + ",scale=-2:1080::0:3,expand=1920:1080"+harddup
+            x264streamsize=u"1920x1080"
         x264_bitrate="5000"
-    elif size == "SD":
-        encvf = encvf + ",scale=720:-2::0:3,expand=720:480"+harddup
-        x264streamsize=u"720x480"
-        x264_bitrate="1250"
     elif size == "QVGA_BASE":
-        encvf = encvf + ",scale=320:-2::0:3,expand=320:240"+harddup
-        x264streamsize=u"320x240"
+        tsize=getParSize(pin,240)
+        if usesar==1:
+            encvf = encvf + ",scale=-3:240::0:3"+harddup
+            x264streamsize=str(tsize[0])+u"x240"
+        else:
+            encvf = encvf + ",scale=320:-2::0:3,expand=320:240"+harddup
+            x264streamsize=u"320x240"
         x264_bitrate="300"
     elif size == "WVGA_BASE":
-        encvf = encvf + ",scale=-2:480::0:3,expand=854:480"+harddup
-        x264streamsize=u"854x480"
+        tsize=getParSize(pin,480)
+        if usesar==1:
+            encvf = encvf + ",scale=-3:480::0:3"+harddup
+            x264streamsize=str(tsize[0])+u"x480"
+        else:
+            encvf = encvf + ",scale=-2:480::0:3,expand=854:480"+harddup
+            x264streamsize=u"854x480"
         x264_bitrate="1500"
     else:
+        tsize=getParSize(pin,720)
+        if usesar==1:
+            encvf = encvf + ",scale=-3:720::0:3"+harddup
+            x264streamsize=str(tsize[0])+u"x720"
+        else:
+            encvf = encvf + ",scale=-2:720::0:3,expand=1280:720"+harddup
+            x264streamsize=u"1280x720"
+        x264_bitrate="2500"
+    if deinterlace==0:
+        tsize=getMovieBaseSize2(pin)
+        ofps="-ofps 30000/1001"
+        #fps="-fps 30000/1001"
+        fps=""
+        x264fps="30000/1001 --keyint 30"
+        x264interlaced=1
+        encvf="-vf hqdn3d=2:1:2"
+        harddup=",harddup"
+        encvf=encvf+harddup
+        x264streamsize=str(tsize[0])+u"x"+str(tsize[1])
+        if usebluray==1:
+            encvf = u"-sws 9 "+encvf + ",scale=-2:1080::0:3,expand=1920:1080"+harddup
+            x264streamsize=u"1920x1080"
+    if tsize[0] <= 0 or tsize[1] <= 0:
+        encvf="-sws 9 -vf yadif=0,pp=l5"
+        harddup=",hqdn3d=2:1:2,unsharp=l3x3:0.75:c3x3:0.75,harddup"
+        ofps="-ofps 30000/1001"
+        fps="-fps 30000/1001"
+        x264fps="30000/1001 --keyint 30"
+        tsize=[1280,720]
         encvf = encvf + ",scale=-2:720::0:3,expand=1280:720"+harddup
         x264streamsize=u"1280x720"
         x264_bitrate="2500"
     if quality==1:
-        x264preset=u"--preset ultrafast"
+        x264preset=u"ultrafast"
     elif quality==2:
-        x264preset=u"--preset veryfast"
+        x264preset=u"veryfast"
     elif quality==3:
-        x264preset=u"--preset fast"
+        x264preset=u"fast"
     elif quality==4:
-        x264preset=u"--preset medium"
+        x264preset=u"medium"
     elif quality==5:
-        x264preset=u"--preset slow"
+        x264preset=u"slow"
     elif quality==6:
-        x264preset=u"--preset slower"
-    if size == "WVGA_BASE" or size == "QVGA_BASE":
-        x264profile=" --level 32 --profile baseline "
-    else:
-        x264profile=" --level 41 --profile high "
-    x264crf=u"--crf "+str(crf)
-    os.environ['LANG']="ja_JP.UTF-8"
-    random.seed(pin)
-    random.jumpahead(10)
-    streampath=os.path.join(os.path.dirname(pin),str(random.randint(10000, 999999)))
-    os.system(u"mkfifo "+streampath)
-    encexe=mencoder+u" \""+pin+u"\" -vfm ffmpeg -quiet -sws 9 "+encvf+u",format=i420 "+fps+" "+ofps+" -oac mp3lame -ovc raw -of rawvideo -o \""+streampath+"\" &"
-    encexe=encexe+u" nice -n 19 "+x264+" "+x264crf+u" "+x264_addline+u"  --threads "+x264_thread+" "+x264profile+x264preset+" "+x264tune+" "+x264fps+" -o \""+pout+"\" "+streampath+" "+x264streamsize
-    encexe=u"nice -n 19 " +encexe
-    recdblist.printutf8(encexe)
-    txt=""
-    try:
-        txt=unicode(commands.getoutput(encexe.encode('utf-8')),'utf-8')
-    except:
-        ""
-    os.system("rm "+streampath)
-    recdblist.addCommandLog(pin, u"Mencoder", encexe, txt)
-def encode_sar(pin,pout,size,is24fps,quality,crf):
-    mencoder=configreader.getpath("mencoder")
-    x264=configreader.getpath("x264")
-    encvf=""
-    txt=""
-    encvf="-vf yadif=0,pp=l5"
-    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"
-    x264streamsize=""
-    x264preset=""
-    x264tune=""
-    x264_bitrate="5000"
-    x264_thread="auto"
-    tsar=getMoviePAR(pin)
-    x264_sar="--sar "+str(tsar[0])+":"+str(tsar[1])
-    try:
-        xtt=configreader.getenv("x264_thread")
-        xtt=int(xtt)
-        if xtt>0:
-            x264_thread=str(xtt)
-    except:
-        x264_thread="auto"
-    x264_addline=configreader.getenv("x264_addline")
-    if is24fps==1:
-        ofps="-ofps 24000/1001"
-        fps="-fps 30000/1001"
-        x264fps="--fps 24000/1001"
-        x264tune="--tune animation"
-        encvf="-vf pullup,softskip"
-        harddup=",pp=l5,unsharp=l3x3:0.75:c3x3:0.75,hqdn3d=2:1:2,harddup"
-    if size == "HD":
-        tsize=get_par_size(pin,720)
-        encvf = encvf + ",scale=-3:720::0:3"+harddup
-        x264streamsize=str(tsize[0])+u"x720"
-        x264_bitrate="2500"
-    elif size == "WVGA":
-        tsize=get_par_size(pin,480)
-        encvf = encvf + ",scale=-3:480::0:3"+harddup
-        x264streamsize=str(tsize[0])+u"x480"
-        x264_bitrate="1500"
-    elif size == "FullHD":
-        tsize=get_par_size(pin,1080)
-        encvf = encvf + ",scale=-3:1080::0:3"+harddup
-        x264streamsize=str(tsize[0])+u"x1080"
-        x264_bitrate="5000"
-    elif size == "QVGA_BASE":
-        tsize=get_par_size(pin,240)
-        encvf = encvf + ",scale=-3:240::0:3"+harddup
-        x264streamsize=str(tsize[0])+u"x240"
-        x264_bitrate="300"
-    elif size == "WVGA_BASE":
-        tsize=get_par_size(pin,480)
-        encvf = encvf + ",scale=-3:480::0:3"+harddup
-        x264streamsize=str(tsize[0])+u"x480"
-        x264_bitrate="1500"
+        x264preset=u"slower"
     else:
-        tsize=get_par_size(pin,720)
-        encvf = encvf + ",scale=-3:720::0:3"+harddup
-        x264streamsize=str(tsize[0])+u"x720"
-        x264_bitrate="2500"
-    if quality==1:
-        x264preset=u"--preset ultrafast"
-    elif quality==2:
-        x264preset=u"--preset veryfast"
-    elif quality==3:
-        x264preset=u"--preset fast"
-    elif quality==4:
-        x264preset=u"--preset medium"
-    elif quality==5:
-        x264preset=u"--preset slow"
-    elif quality==6:
-        x264preset=u"--preset slower"
+        x264preset=u"medium"
     if size == "WVGA_BASE" or size == "QVGA_BASE":
         x264profile=" --level 32 --profile baseline "
     else:
         x264profile=" --level 41 --profile high "
-    x264crf=u"--crf "+str(crf)
+    if uselavf==1:
+        lavft="-demuxer lavf "
+    x264crf=str(crf)
     os.environ['LANG']="ja_JP.UTF-8"
     random.seed(pin)
     random.jumpahead(10)
-    streampath=os.path.join(os.path.dirname(pin),str(random.randint(10000, 999999)))
-    os.system(u"mkfifo "+streampath)
-    encexe=mencoder+u" \""+pin+u"\" -vfm ffmpeg -quiet -sws 9 "+encvf+u",format=i420 "+fps+" "+ofps+" -oac mp3lame -ovc raw -of rawvideo -o \""+streampath+"\" &"
-    encexe=encexe+u" nice -n 19 "+x264+" "+x264_sar+" "+x264crf+u" "+x264_addline+u"  --threads "+x264_thread+" "+x264profile+x264preset+" "+x264tune+" "+x264fps+" -o \""+pout+"\" "+streampath+" "+x264streamsize
-    encexe=u"nice -n 19 " +encexe
+    temptime=int(time.time())
+    temptime=temptime % 9697
+    random.jumpahead(temptime)
+    streampath=os.path.join(os.path.dirname(pin),str(random.randint(10000, 99999999)))
+    unicode(commands.getoutput(u"mkfifo "+streampath),'utf-8','ignore')
+    logmencoder=recdblist.getLogTitle(pin)+".mencoder.log"
+    logx264=recdblist.getLogTitle(pin)+".x264.log"
+    encexe=mencoder+u" \""+pin+u"\" -quiet -vfm ffmpeg "+lavft+encvf+u",format=i420 "+fps+" "+ofps+" -oac mp3lame -ovc raw -of rawvideo -o \""+streampath+"\" 2>&1 | "+tee+" \""+logmencoder+"\" & "
+    encexe=encexe+getX264Commandline(x264preset, x264sar, x264fps, x264profile, x264tune, pout, streampath, x264streamsize, crf=x264crf,interlaced=x264interlaced,bluray=usebluray)
+    #encexe=encexe+u" nice -n 19 "+x264+" "+x264_sar+" "+x264crf+u" "+x264_addline+u"  --threads "+x264_thread+" "+x264profile+x264preset+" "+x264tune+" "+x264fps+" -o \""+pout+"\" "+streampath+" "+x264streamsize
+    encexe=u"nice -n 19 " +encexe+" 2>&1 | "+tee+" \""+logx264+"\""
+    try:
+        recdblist.addCommandSelfLog(pin, encexe)
+    except Exception, inst:
+        print type(inst)
+        print str(inst)
+        print traceback.print_exc(file=sys.stdout)
     recdblist.printutf8(encexe)
     txt=""
     try:
-        txt=unicode(commands.getoutput(encexe.encode('utf-8')),'utf-8')
+        txt=unicode(commands.getoutput(encexe.encode('utf-8')),'utf-8','ignore')
     except:
         ""
-    os.system("rm "+streampath)
+    os.remove(streampath)
+    zip.addFile2FileZip(logmencoder, recdblist.getLogTitle(pin)+".log.zip")
+    zip.addFile2FileZip(logx264, recdblist.getLogTitle(pin)+".log.zip")
+    os.remove(logmencoder)
+    os.remove(logx264)
     recdblist.addCommandLog(pin, u"Mencoder", encexe, txt)
-
-def encode_ffmpeg(pin,pout,size,is24fps,quality,crf):
-    """
-    
-    """
-    ffmpeg=configreader.getpath("ffmpeg")
-    x264=configreader.getpath("x264")
-    fps=u"-r 29.970030 "
-    x264fps="--fps 30000/1001"
-    x264streamsize=""
-    x264preset=""
-    x264tune=""
-    x264_bitrate="2500"
-    x264_thread="auto"
-    try:
-        xtt=configreader.getenv("x264_thread")
-        xtt=int(xtt)
-        if xtt>0:
-            x264_thread=str(xtt)
-    except:
-        x264_thread="auto"
-    x264_addline=configreader.getenv("x264_addline")
-    if size == "HD":
-        s = "-s 1280x720 "
-        x264streamsize=u"1280x720"
-        x264_bitrate="2500"
-    elif size == "WVGA":
-        s = "-s 854x480 "
-        x264streamsize=u"854x480"
-        x264_bitrate="1500"
-    elif size == "FullHD":
-        s = "-s 1920x1080 "
-        x264streamsize=u"1920x1080"
-        x264_bitrate="5000"
-    elif size == "SD":
-        s = "-s 720x480 "
-        x264streamsize=u"720x480"
-        x264_bitrate="1250"
-    elif size == "QVGA_BASE":
-        s = "-s 320x240 "
-        x264streamsize=u"320x240"
-        x264_bitrate="300"
-    elif size == "WVGA_BASE":
-        s = "-s 854x480 "
-        x264streamsize=u"854x480"
-        x264_bitrate="1500"
-    else:
-        s = "-s 1280x720 "
-        x264streamsize=u"1280x720"
-        x264_bitrate="2500"
-    if quality==1:
-        x264preset=u"--preset ultrafast"
-    elif quality==2:
-        x264preset=u"--preset veryfast"
-    elif quality==3:
-        x264preset=u"--preset fast"
-    elif quality==4:
-        x264preset=u"--preset medium"
-    elif quality==5:
-        x264preset=u"--preset slow"
-    elif quality==6:
-        x264preset=u"--preset slower"
-    if size == "WVGA_BASE" or size == "QVGA_BASE":
-        x264profile=" --level 32 --profile baseline "
-    else:
-        x264profile=" --level 41 --profile high "
-    x264crf=u"--crf "+str(crf)
-    txt=""
-    os.environ['LANG']="ja_JP.UTF-8"
-    exe=ffmpeg+u" -y -i \""+pin+"\" -vsync 400 -vcodec rawvideo -pix_fmt yuv420p "+s+fps+"-deinterlace -an -f rawvideo - |"
-    exe=exe+u" nice -n 19 "+x264+" "+x264crf+u" "+x264_addline+u" --threads "+x264_thread+" "+x264profile+x264preset+" "+x264tune+" "+x264fps+" -o \""+pout+"\" - "+x264streamsize
-    exe = "nice -n 19 " + exe
-    txt=""
-    recdblist.printutf8(exe)
-    try:
-        txt=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8')
-    except:
-        ""
-    recdblist.addCommandLog(pin, u"FFmpeg動画エンコード", exe, txt)
-def encode_ffmpeg_sar(pin,pout,size,is24fps,quality,crf):
+#    recdblist.addCommandLogTar(pin,u"Mencoder","mencoder", encexe,txt)
+def encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace=1,usebluray=0,usesar=1):
     """
 
     """
-    ffmpeg=configreader.getpath("ffmpeg")
-    x264=configreader.getpath("x264")
+    ffmpeg=configreader.getConfPath("ffmpeg")
+    tee=configreader.getConfPath("tee")
     fps=u"-r 29.970030 "
-    x264fps="--fps 30000/1001"
+    x264fps="30000/1001 --keyint 30"
     x264streamsize=""
     x264preset=""
     x264tune=""
     x264_bitrate="2500"
     x264_thread="auto"
-    tsar=getMoviePAR(pin)
-    x264_sar="--sar "+str(tsar[0])+":"+str(tsar[1])
-    try:
-        xtt=configreader.getenv("x264_thread")
-        xtt=int(xtt)
-        if xtt>0:
-            x264_thread=str(xtt)
-    except:
-        x264_thread="auto"
-    x264_addline=configreader.getenv("x264_addline")
+    x264interlaced=0
+    tsar=getMoviePAR2(pin)
+    filter="-deinterlace"
+    x264sar=str(tsar[0])+":"+str(tsar[1])
+    if is24fps==1:
+        fps=u"-r 23.976023 "
+        x264fps="24000/1001 --keyint 24"
+        x264tune="--tune animation"
     if size == "HD":
-        tsize=get_par_size(pin,720)
+        tsize=getParSize(pin,720)
         s = "-s "+str(tsize[0])+"x720 "
         x264streamsize=str(tsize[0])+u"x720"
         x264_bitrate="2500"
     elif size == "WVGA":
-        tsize=get_par_size(pin,480)
+        tsize=getParSize(pin,480)
         s = "-s "+str(tsize[0])+"x480 "
         x264streamsize=str(tsize[0])+u"x480"
         x264_bitrate="1500"
     elif size == "FullHD":
-        tsize=get_par_size(pin,1080)
+        tsize=getParSize(pin,1080)
         s = "-s "+str(tsize[0])+"x1080 "
         x264streamsize=str(tsize[0])+u"x1080"
         x264_bitrate="5000"
     elif size == "SD":
-        tsize=get_par_size(pin,480)
+        tsize=getParSize(pin,480)
         s = "-s "+str(tsize[0])+"x480 "
         x264streamsize=str(tsize[0])+u"x480"
         x264_bitrate="1250"
     elif size == "QVGA_BASE":
-        tsize=get_par_size(pin,240)
+        tsize=getParSize(pin,240)
         s = "-s "+str(tsize[0])+"x240 "
         x264streamsize=str(tsize[0])+u"x240"
         x264_bitrate="300"
     elif size == "WVGA_BASE":
-        tsize=get_par_size(pin,480)
+        tsize=getParSize(pin,480)
         s = "-s "+str(tsize[0])+"x480 "
         x264streamsize=str(tsize[0])+u"x480"
         x264_bitrate="1500"
     else:
-        tsize=get_par_size(pin,720)
+        tsize=getParSize(pin,720)
         s = "-s "+str(tsize[0])+"x720 "
         x264streamsize=str(tsize[0])+u"x720"
         x264_bitrate="2500"
+    if deinterlace==0:
+        tsize=getMovieBaseSize2(pin)
+        fps=""
+        s = "-s "+str(tsize[0])+"x"+str(tsize[1])+" "
+        x264fps="30000/1001 --keyint 30"
+        x264interlaced=1
+        filter=""
+        x264streamsize=str(tsize[0])+u"x"+str(tsize[1])
     if quality==1:
-        x264preset=u"--preset ultrafast"
+        x264preset=u"ultrafast"
     elif quality==2:
-        x264preset=u"--preset veryfast"
+        x264preset=u"veryfast"
     elif quality==3:
-        x264preset=u"--preset fast"
+        x264preset=u"fast"
     elif quality==4:
-        x264preset=u"--preset medium"
+        x264preset=u"medium"
     elif quality==5:
-        x264preset=u"--preset slow"
+        x264preset=u"slow"
     elif quality==6:
-        x264preset=u"--preset slower"
-    if size == "WVGA_BASE" or size == "QVGA_BASE":
-        x264profile=" --level 32 --profile baseline "
+        x264preset=u"slower"
     else:
-        x264profile=" --level 41 --profile high "
-    x264crf=u"--crf "+str(crf)
-    txt=""
-    os.environ['LANG']="ja_JP.UTF-8"
-    exe=ffmpeg+u" -y -i \""+pin+"\" -vsync 400 -vcodec rawvideo -pix_fmt yuv420p "+s+fps+"-deinterlace -an -f rawvideo - |"
-    exe=exe+u" nice -n 19 "+x264+" "+x264_sar+" "+x264crf+u" "+x264_addline+u" --threads "+x264_thread+" "+x264profile+x264preset+" "+x264tune+" "+x264fps+" -o \""+pout+"\" - "+x264streamsize
-    exe = "nice -n 19 " + exe
-    txt=""
-    recdblist.printutf8(exe)
-    try:
-        txt=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8')
-    except:
-        ""
-    recdblist.addCommandLog(pin, u"FFmpeg動画エンコード", exe, txt)
-def encode_ffmpeg_kai(pin,pout,size,is24fps,quality,crf):
-    """
-
-    """
-    ffmpeg=configreader.getpath("ffmpeg")
-    x264=configreader.getpath("x264")
-    fps=u"-r 29.970030 "
-    x264fps="--fps 30000/1001"
-    x264streamsize=""
-    x264preset=""
-    x264tune=""
-    x264_bitrate="2500"
-    x264_thread="auto"
-    try:
-        xtt=configreader.getenv("x264_thread")
-        xtt=int(xtt)
-        if xtt>0:
-            x264_thread=str(xtt)
-    except:
-        x264_thread="auto"
-    x264_addline=configreader.getenv("x264_addline")
-    if size == "HD":
-        padx=get16_9ffmpeg_s(pin,1280,720)
-        s = "-s "+str(1280-2*padx)+"x720 "
-        if padx>0:
-            s=s+"-padleft "+str(padx)+" -padright "+str(padx)+" "
-        x264streamsize=u"1280x720"
-        x264_bitrate="2500"
-    elif size == "WVGA":
-        padx=get16_9ffmpeg_s(pin,854,480)
-        s = "-s "+str(854-2*padx)+"x480 "
-        if padx>0:
-            s=s+"-padleft "+str(padx)+" -padright "+str(padx)+" "
-        x264streamsize=u"854x480"
-        x264_bitrate="1500"
-    elif size == "FullHD":
-        padx=get16_9ffmpeg_s(pin,1920,1080)
-        s = "-s "+str(1920-2*padx)+"x1080 "
-        if padx>0:
-            s=s+"-padleft "+str(padx)+" -padright "+str(padx)+" "
-        x264streamsize=u"1920x1080"
-        x264_bitrate="5000"
-    elif size == "SD":
-        s = "-s 720x480 "
-        x264streamsize=u"720x480"
-        x264_bitrate="1250"
-    elif size == "QVGA_BASE":
-        s = "-s 320x240 "
-        x264streamsize=u"320x240"
-        x264_bitrate="300"
-    elif size == "WVGA_BASE":
-        s = "-s 854x480 "
-        x264streamsize=u"854x480"
-        x264_bitrate="1500"
-    else:
-        padx=get16_9ffmpeg_s(pin,1280,720)
-        s = "-s "+str(1280-2*padx)+"x720 "
-        if padx>0:
-            s=s+"-padleft "+str(padx)+" -padright "+str(padx)+" "
-        x264streamsize=u"1280x720"
-        x264_bitrate="2500"
-    if quality==1:
-        x264preset=u"--preset ultrafast"
-    elif quality==2:
-        x264preset=u"--preset veryfast"
-    elif quality==3:
-        x264preset=u"--preset fast"
-    elif quality==4:
-        x264preset=u"--preset medium"
-    elif quality==5:
-        x264preset=u"--preset slow"
-    elif quality==6:
-        x264preset=u"--preset slower"
+        x264preset=u"medium"
     if size == "WVGA_BASE" or size == "QVGA_BASE":
         x264profile=" --level 32 --profile baseline "
     else:
         x264profile=" --level 41 --profile high "
-    x264crf=u"--crf "+str(crf)
+    x264crf=str(crf)
     txt=""
     os.environ['LANG']="ja_JP.UTF-8"
-    exe=ffmpeg+u" -y -i \""+pin+"\" -vsync 400 -vcodec rawvideo -pix_fmt yuv420p "+s+fps+"-deinterlace -an -f rawvideo - |"
-    exe=exe+u" nice -n 19 "+x264+" "+x264crf+u" "+x264_addline+u" --threads "+x264_thread+" "+x264profile+x264preset+" "+x264tune+" "+x264fps+" -o \""+pout+"\" - "+x264streamsize
-    exe = "nice -n 19 " + exe
+    log_ffmpeg=recdblist.getLogTitle(pin)+".ffmpeg.log"
+    log_x264=recdblist.getLogTitle(pin)+".x264.log"
+    exe=ffmpeg+u" -y -i \""+pin+"\" -vcodec rawvideo -pix_fmt yuv420p "+s+fps+" "+filter+" -an -f rawvideo - 2> \""+log_ffmpeg+"\" | "
+    exe=exe+getX264Commandline(x264preset, x264sar, x264fps, x264profile, x264tune, pout,"-", x264streamsize, crf=x264crf,interlaced=x264interlaced,bluray=usebluray)
+    exe = "nice -n 19 " + exe+" 2>&1 | "+tee+" \""+log_x264+"\""
     txt=""
+    #recdblist.addCommandSelfLog(log_ffmpeg,recdblist.getLogTitle(pin)+".log.zip")
+    #recdblist.addCommandSelfLog(log_x264,recdblist.getLogTitle(pin)+".log.zip")
     recdblist.printutf8(exe)
+    recdblist.addCommandSelfLog(pin,exe)
     try:
-        txt=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8')
+        txt=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8','ignore')
     except:
         ""
     recdblist.addCommandLog(pin, u"FFmpeg動画エンコード", exe, txt)
-def getMovieSize(pin):
-    ffmpeg=configreader.getpath("ffmpeg")
+    zip.addFile2FileZip(log_ffmpeg, recdblist.getLogTitle(pin+".log.zip"))
+    zip.addFile2FileZip(log_x264, recdblist.getLogTitle(pin+".log.zip"))
+    os.remove(log_ffmpeg)
+    os.remove(log_x264)
+def getMovieBaseSize2(pin):##動画開始後すぐに解像度が変更されたときに対処
+    ffmpeg=configreader.getConfPath("ffmpeg")
     os.environ['LANG']="ja_JP.UTF-8"
-    exe=ffmpeg+u" -i \""+pin+"\" 2>&1"
-    txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8')
-    rT=re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+PAR\D+(\d+:\d+)\D+.*\Z")
+    exe=ffmpeg+u" -ss 5 -fs 1 -t 10 -i \""+pin+"\" \""+pin+".size.ts\" 2>&1"
+    try:
+        recdblist.addCommandSelfLog(pin, exe)
+    except Exception, inst:
+        print type(inst)
+        print str(inst)
+        print traceback.print_exc(file=sys.stdout)
+    txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8','ignore')
+    rT=re.compile(u"Stream.*#.*:.*\D+([\d]+x[\d]+)\D+PAR\D+(\d+:\d+)\D+.*\Z")
+    rT2=re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+SAR\D+(\d+:\d+)\D+.*DAR\D+(\d+:\d+)\D+.*\Z")
     sizeMaxX=0
     sizeMaxY=0
     txtls=txts.split("\n")
     for t in txtls:
-        rM=rT.match(t)
+        rM=rT.search(t)
+        rM2=rT2.search(t)
         if rM:
             sizetxt=rM.group(1)
             partxt=rM.group(2)
@@ -536,110 +386,171 @@ def getMovieSize(pin):
             tY=int(sizetxt.split("x")[1])
             tEX=int(partxt.split(":")[0])
             tEY=int(partxt.split(":")[1])
-            tX2=tX*tEX*10/tEY
-            if tX2>10*int(tX2/10):
-                tX2=tX2/10+1
-            else:
-                tX2=tX2/10
-            if sizeMaxX<tX2:
-                sizeMaxX=tX2
+            if sizeMaxX<tX:
+                sizeMaxX=tX
                 sizeMaxY=tY
-    return [sizeMaxX,sizeMaxY]
-def getMovieBaseSize(pin):
-    ffmpeg=configreader.getpath("ffmpeg")
-    os.environ['LANG']="ja_JP.UTF-8"
-    exe=ffmpeg+u" -i \""+pin+"\" 2>&1"
-    txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8')
-    rT=re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+PAR\D+(\d+:\d+)\D+.*\Z")
-    sizeMaxX=0
-    sizeMaxY=0
-    txtls=txts.split("\n")
-    for t in txtls:
-        rM=rT.match(t)
-        if rM:
-            sizetxt=rM.group(1)
-            partxt=rM.group(2)
+        if rM2:
+            sizetxt=rM2.group(1)
             tX=int(sizetxt.split("x")[0])
             tY=int(sizetxt.split("x")[1])
-            tEX=int(partxt.split(":")[0])
-            tEY=int(partxt.split(":")[1])
             if sizeMaxX<tX:
                 sizeMaxX=tX
                 sizeMaxY=tY
+    os.remove(pin+".size.ts")
     return [sizeMaxX,sizeMaxY]
-def getMoviePAR(pin):
-    ffmpeg=configreader.getpath("ffmpeg")
+def getMoviePAR2(pin):
+    ffmpeg=configreader.getConfPath("ffmpeg")
     os.environ['LANG']="ja_JP.UTF-8"
-    exe=ffmpeg+u" -i \""+pin+"\" 2>&1"
-    txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8')
-    rT=re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+PAR\D+(\d+:\d+)\D+.*\Z")
-    #rT=re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+.*DAR\D+(\d+:\d+)\D+.*\Z")
-    sizeMaxX=0
-    parx=0
-    pary=0
-    txtls=txts.split("\n")
+    exe=ffmpeg+u" -ss 5 -fs 1 -t 10 -i \""+pin+"\" \""+pin+".size.ts\" 2>&1"
+    try:
+        recdblist.addCommandSelfLog(pin, exe)
+    except Exception, inst:
+        print type(inst)
+        print str(inst)
+        print traceback.print_exc(file=sys.stdout)
+    txts = unicode(commands.getoutput(exe.encode('utf-8')), 'utf-8', 'ignore')
+    rT = re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+PAR\D+(\d+:\d+)\D+.*\Z")
+    rT2 = re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+SAR\D+(\d+:\d+)\D+.*DAR\D+(\d+:\d+)\D+.*\Z")
+    sizeMaxX = 0
+    parx = 0
+    pary = 0
+    txtls = txts.split("\n")
     for t in txtls:
-        rM=rT.match(t)
+        rM = rT.match(t)
+        rM2 = rT2.match(t)
         if rM:
-            sizetxt=rM.group(1)
-            dartxt=rM.group(2)
-            tX=int(sizetxt.split("x")[0])
-            tY=int(sizetxt.split("x")[1])
-            tEX=int(dartxt.split(":")[0])
-            tEY=int(dartxt.split(":")[1])
-            if sizeMaxX<tX:
-                sizeMaxX=tX
-                parx=tEX
-                pary=tEY
+            sizetxt = rM.group(1)
+            dartxt = rM.group(2)
+            tX = int(sizetxt.split("x")[0])
+            tY = int(sizetxt.split("x")[1])
+            tEX = int(dartxt.split(":")[0])
+            tEY = int(dartxt.split(":")[1])
+            if sizeMaxX < tX:
+                sizeMaxX = tX
+                if tX == 1920 and tY == 1080:
+                    parx = 1
+                    pary = 1
+                else:
+                    parx = tEX
+                    pary = tEY
+        rM = rT.match(t)
+        if rM2:
+            sizetxt = rM2.group(1)
+            sartxt = rM2.group(2)
+            dartxt = rM2.group(3)
+            tX = int(sizetxt.split("x")[0])
+            tY = int(sizetxt.split("x")[1])
+            tEX = int(dartxt.split(":")[0])
+            tEY = int(dartxt.split(":")[1])##dar=sarxpar
+            tSX = int(sartxt.split(":")[0])
+            tSY = int(sartxt.split(":")[1])##par=dar/sar= darx*pary*sary=dary*parx*sarx
+            if sizeMaxX < tX:
+                sizeMaxX = tX
+                if tX == 1920 and tY == 1080:
+                    parx = 1
+                    pary = 1
+                else:
+                    if tEX * tSY == tEY * tSX:
+                        parx = 1
+                        pary = 1
+                    elif tEX * tSY * 3 == tEY * tSX * 4:
+                        parx = 4
+                        pary = 3
+                    elif tEX * tSY * 4 == tEY * tSX * 3:
+                        parx = 3
+                        pary = 4
+                    elif tEX * tSY * 9 == tEY * tSX * 16:
+                        parx = 16
+                        pary = 9
+                    elif tEX * tSY * 16 == tEY * tSX * 9:
+                        parx = 9
+                        pary = 16
+    os.remove(pin+".size.ts")
     return [parx,pary]
-def getMovieDAR(pin):
-    ffmpeg=configreader.getpath("ffmpeg")
+def getParSize(pin,y):
+    tSize=getMovieBaseSize2(pin)
+    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=-1
+        tY=-1
+    return [tX,tY]
+def getX264CoreVersion():
+    x264=configreader.getConfPath("x264")
+    #print x264
+    t1=commands.getoutput(x264+" --help|grep core")
+    #print t1
+    rT=re.compile(u"x264 core:(\d*)[\d]*.*\Z")
+    rM=rT.match(t1)
+    v=-1
+    if rM:
+        v=int(rM.group(1))
+    return v
+def getX264Commandline(preset,sar,fps,x264profile,x264tune,pout,pin,x264streamsize,crf=-1,bitrate=0,interlaced=0,bluray=0):
+    x264=configreader.getConfPath("x264")
     os.environ['LANG']="ja_JP.UTF-8"
-    exe=ffmpeg+u" -i \""+pin+"\" 2>&1"
-    txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8')
-    rT=re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+.*DAR\D+(\d+:\d+)\D+.*\Z")
-    sizeMaxX=0
-    darx=0
-    dary=0
-    txtls=txts.split("\n")
-    for t in txtls:
-        rM=rT.match(t)
-        if rM:
-            sizetxt=rM.group(1)
-            dartxt=rM.group(2)
-            tX=int(sizetxt.split("x")[0])
-            tY=int(sizetxt.split("x")[1])
-            tEX=int(dartxt.split(":")[0])
-            tEY=int(dartxt.split(":")[1])
-            if sizeMaxX<tX:
-                sizeMaxX=tX
-                darx=tEX
-                dary=tEY
-    return [darx,dary]
-def get16_9ffmpeg_s(pin,x,y):
+    x264_sar="--sar "+sar
+    x264preset=u"--preset "+preset
+    x264fps="--fps "+fps
+    x264interlaced=""
+    x264bluray=""
+    x264_addline=configreader.getConfEnv("x264_addline")
+    if crf==-1:
+        x264bitrate=u"--bitrate "+str(bitrate)
+    else:
+        x264crf=u"--crf "+str(crf)
+    if interlaced==1:
+        x264interlaced="--tff --nal-hrd vbr"
+    if bluray==1:
+        if getX264CoreVersion()<115:
+            x264bluray=" --weightp 1 --nal-hrd vbr --bframes 3 --b-pyramid none --open-gop bluray --slices 4 --aud --colorprim bt709 --transfer bt709 "
+            x264_addline=""
+            if fps=="24000/1001 --keyint 24" or fps =="24000/1001":
+                if x264streamsize=="1280x720":
+                    x264bluray=u"--ref 6 "+x264bluray
+                if x264streamsize=="1920x1080":
+                    x264bluray=u"--ref 4 "+x264bluray
+            elif fps=="30000/1001 --keyint 30" or fps =="30000/1001":
+                if x264streamsize=="1280x720":
+                    x264bluray=u"--ref 6 --pulldown double "+x264bluray
+                if x264streamsize=="1920x1080":
+                    if interlaced==0:
+                        x264bluray=u"--ref 4 --fake-interlaced --pic-struct "+x264bluray
+                    else:
+                        x264bluray=u"--ref 4 "+x264bluray
+        elif getX264CoreVersion()>=115:
+            x264bluray=" --slices 4 --bluray-compat --nal-hrd vbr --bframes 3 --b-pyramid strict --aud --colorprim bt709 --transfer bt709 "
+            x264_addline=""
+            if fps=="24000/1001 --keyint 24" or fps =="24000/1001":
+                if x264streamsize=="1280x720":
+                    x264bluray=u"--ref 6 "+x264bluray
+                if x264streamsize=="1920x1080":
+                    x264bluray=u"--ref 4 "+x264bluray
+            elif fps=="30000/1001 --keyint 30" or fps =="30000/1001":
+                if x264streamsize=="1280x720":
+                    x264bluray=u"--ref 6 --pulldown double "+x264bluray
+                if x264streamsize=="1920x1080":
+                    if interlaced==0:
+                        x264bluray=u"--ref 4 --fake-interlaced --pic-struct "+x264bluray
+                    else:
+                        x264bluray=u"--ref 4 "+x264bluray
+    x264_thread="auto"
     try:
-        tDAR=getMovieDAR(pin)
-        if (tDAR[0]==16 and tDAR[1]==9):
-            return 0
-        elif tDAR==[0,0]:
-            return 0
-        else:
-            tSize=getMovieSize(pin)
-            tn=x-tSize[1]*x/tSize[0]
-            tn=tn/4
-            tn=tn*2#偶数にするための処理
-            return tn
+        xtt=configreader.getConfEnv("x264_thread")
+        xtt=int(xtt)
+        if xtt>0:
+            x264_thread=str(xtt)
     except:
-        return 0
-def get_par_size(pin,y):
-    tSize=getMovieBaseSize(pin)
-    tX=tSize[0]*10/tSize[1]*y
-    if tX>int(tX/10)*10:
-        tX=tX/10+1
-    else:
-        tX=tX/10
-    if tY>int(tY/10)*10:
-        tY=tY/10+1
+        x264_thread="auto"
+    x264_addline=configreader.getConfEnv("x264_addline")
+    if getX264CoreVersion()>103:
+        x264res=u"--input-res "+x264streamsize
+        exe=u"nice -n 19 "+x264+" --demuxer raw --vbv-maxrate 30000 --vbv-bufsize 25000 "+x264_sar+" "+x264crf+u" "+x264bluray+u" "+x264interlaced+u" "+x264_addline+u" --colormatrix bt709 --threads "+x264_thread+" "+x264profile+x264preset+" "+x264tune+" "+x264fps+" "+x264res+" -o \""+pout+"\" "+pin
     else:
-        tY=tY/10
-    return [tX,tY]
\ No newline at end of file
+        exe=u"nice -n 19 "+x264+" --demuxer raw --vbv-maxrate 30000 --vbv-bufsize 25000 "+x264_sar+" "+x264crf+u" "+x264bluray+u" "+x264interlaced+u" "+x264_addline+u" --colormatrix bt709 --threads "+x264_thread+" "+x264profile+x264preset+" "+x264tune+" "+x264fps+" -o \""+pout+"\" "+pin+" "+x264streamsize
+    return exe