X-Git-Url: http://git.osdn.net/view?p=rec10%2Frec10-git.git;a=blobdiff_plain;f=rec10%2Ftrunk%2Fsrc%2Fts2x264.py;h=bde0c803330932695f352a476b4f9dffd8b99afd;hp=c33121089114cf35fbfbe6effcb47baa8c0f5fd5;hb=bdcd627011d8cfc6e210a477608423d8cd31f3b4;hpb=c363a10d99acf08f3a298919ffd20c5f4660b666

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index c331210..bde0c80 100644
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -1,7 +1,7 @@
 #!/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
@@ -10,6 +10,7 @@ import re
 import random
 import time
 import traceback
+import zip
 
 import recdblist
 def ts2x264(pin, pout, opts):#sizeは"HD"か"SD"
@@ -24,6 +25,8 @@ def ts2x264(pin, pout, opts):#sizeは"HD"か"SD"
     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):
@@ -32,12 +35,14 @@ def ts2x264(pin, pout, opts):#sizeは"HD"か"SD"
         size = "FullHD"
     if re.search("W",opts):
         size = "WVGA"
-    if re.search("1",opts):
+    if re.search("MW1",opts):
         size = "QVGA_BASE"
         crf=crf+4
-    if re.search("2", 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.getConfEnv("animation_crf"))
@@ -46,6 +51,9 @@ def ts2x264(pin, pout, opts):#sizeは"HD"か"SD"
         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):
@@ -64,83 +72,131 @@ def ts2x264(pin, pout, opts):#sizeは"HD"か"SD"
         crf=crf-2
     if re.search("d",opts):#二カ国語放送の場合
         tm2v=pin.replace(".ts",".m2v")
-        encodeFfmpegSar(tm2v,pout,size,is24fps,quality,crf,deinterlace)
+        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)
+        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:
-            encodeMencoderSar(pin, pout,size,is24fps,quality,crf,deinterlace)
+            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)+traceback.format_exc(),log_level=200)
-def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
-    mencoder=configreader.getpath("mencoder")
+            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="-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"
+    x264fps="30000/1001 --keyint 30"
     x264streamsize=""
     x264preset=""
     x264tune=""
     x264_bitrate="5000"
+    x264interlaced=0
+    x264sar="1:1"
     tsar=getMoviePAR2(pin)
-    x264sar=str(tsar[0])+":"+str(tsar[1])
+    if usesar==1:
+        x264sar=str(tsar[0])+u":"+str(tsar[1])
+    lavft=""
     if is24fps==1:
         ofps="-ofps 24000/1001"
         fps="-fps 30000/1001"
-        x264fps="24000/1001"
+        x264fps="24000/1001 --keyint 24"
         x264tune="--tune animation"
         encvf="-sws 9 -vf pullup,softskip"
         harddup=",pp=l5,unsharp=l3x3:0.75:c3x3:0.75,hqdn3d=2:1:2,harddup"
     if size == "HD":
         tsize=getParSize(pin,720)
-        encvf = encvf + ",scale=-3:720::0:3"+harddup
-        x264streamsize=str(tsize[0])+u"x720"
+        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":
         tsize=getParSize(pin,480)
-        encvf = encvf + ",scale=-3:480::0:3"+harddup
-        x264streamsize=str(tsize[0])+u"x480"
+        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":
         tsize=getParSize(pin,1080)
-        encvf = encvf + ",scale=-3:1080::0:3"+harddup
-        x264streamsize=str(tsize[0])+u"x1080"
+        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 == "QVGA_BASE":
         tsize=getParSize(pin,240)
-        encvf = encvf + ",scale=-3:240::0:3"+harddup
-        x264streamsize=str(tsize[0])+u"x240"
+        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":
         tsize=getParSize(pin,480)
-        encvf = encvf + ",scale=-3:480::0:3"+harddup
-        x264streamsize=str(tsize[0])+u"x480"
+        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)
-        encvf = encvf + ",scale=-3:720::0:3"+harddup
-        x264streamsize=str(tsize[0])+u"x720"
+        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"
-        x264tune=x264tune+" --tff --nal-hrd vbr"
+        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"
+        x264fps="30000/1001 --keyint 30"
         tsize=[1280,720]
         encvf = encvf + ",scale=-2:720::0:3,expand=1280:720"+harddup
         x264streamsize=u"1280x720"
@@ -157,10 +213,14 @@ def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
         x264preset=u"slow"
     elif quality==6:
         x264preset=u"slower"
+    else:
+        x264preset=u"medium"
     if size == "WVGA_BASE" or size == "QVGA_BASE":
         x264profile=" --level 32 --profile baseline "
     else:
         x264profile=" --level 41 --profile high "
+    if uselavf==1:
+        lavft="-demuxer lavf "
     x264crf=str(crf)
     os.environ['LANG']="ja_JP.UTF-8"
     random.seed(pin)
@@ -169,34 +229,53 @@ def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
     temptime=temptime % 9697
     random.jumpahead(temptime)
     streampath=os.path.join(os.path.dirname(pin),str(random.randint(10000, 99999999)))
-    os.system(u"mkfifo "+streampath)
-    encexe=mencoder+u" \""+pin+u"\" -vfm ffmpeg -quiet "+encvf+u",format=i420 "+fps+" "+ofps+" -oac mp3lame -ovc raw -of rawvideo -o \""+streampath+"\" & "
-    encexe=encexe+getX264Commandline(x264preset, x264sar, x264fps, x264profile, x264tune, pout, streampath, x264streamsize, crf=x264crf)
+    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
+    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','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 encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
+#    recdblist.addCommandLogTar(pin,u"Mencoder","mencoder", encexe,txt)
+def encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace=1,usebluray=0,usesar=1):
     """
 
     """
-    ffmpeg=configreader.getPathSetting("ffmpeg")
+    ffmpeg=configreader.getConfPath("ffmpeg")
+    tee=configreader.getConfPath("tee")
     fps=u"-r 29.970030 "
-    x264fps="30000/1001"
+    x264fps="30000/1001 --keyint 30"
     x264streamsize=""
     x264preset=""
     x264tune=""
     x264_bitrate="2500"
     x264_thread="auto"
+    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=getParSize(pin,720)
         s = "-s "+str(tsize[0])+"x720 "
@@ -236,8 +315,8 @@ def encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
         tsize=getMovieBaseSize2(pin)
         fps=""
         s = "-s "+str(tsize[0])+"x"+str(tsize[1])+" "
-        x264fps="30000/1001"
-        x264tune=x264tune+" --tff --nal-hrd vbr"
+        x264fps="30000/1001 --keyint 30"
+        x264interlaced=1
         filter=""
         x264streamsize=str(tsize[0])+u"x"+str(tsize[1])
     if quality==1:
@@ -252,6 +331,8 @@ def encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
         x264preset=u"slow"
     elif quality==6:
         x264preset=u"slower"
+    else:
+        x264preset=u"medium"
     if size == "WVGA_BASE" or size == "QVGA_BASE":
         x264profile=" --level 32 --profile baseline "
     else:
@@ -259,18 +340,27 @@ def encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
     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+" "+filter+" -an -f rawvideo - | "
-    exe=exe+getX264Commandline(x264preset, x264sar, x264fps, x264profile, x264tune, pout,"-", x264streamsize, crf=x264crf)
-    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+"\" -vsync 400 -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','ignore')
     except:
         ""
     recdblist.addCommandLog(pin, u"FFmpeg動画エンコード", exe, txt)
+    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 getMovieBaseSize(pin):
-    ffmpeg=configreader.getPathSetting("ffmpeg")
+    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','ignore')
@@ -292,9 +382,15 @@ def getMovieBaseSize(pin):
                 sizeMaxY=tY
     return [sizeMaxX,sizeMaxY]
 def getMovieBaseSize2(pin):##動画開始後すぐに解像度が変更されたときに対処
-    ffmpeg=configreader.getPathSetting("ffmpeg")
+    ffmpeg=configreader.getConfPath("ffmpeg")
     os.environ['LANG']="ja_JP.UTF-8"
     exe=ffmpeg+u" -ss 5 -fs 1 -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")
     sizeMaxX=0
@@ -315,7 +411,7 @@ def getMovieBaseSize2(pin):##動画開始後すぐに解像度が変更された
     os.remove(pin+".size.ts")
     return [sizeMaxX,sizeMaxY]
 def getMoviePAR(pin):
-    ffmpeg=configreader.getPathSetting("ffmpeg")
+    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','ignore')
@@ -343,9 +439,15 @@ def getMoviePAR(pin):
                     pary=tEY
     return [parx,pary]
 def getMoviePAR2(pin):
-    ffmpeg=configreader.getPathSetting("ffmpeg")
+    ffmpeg=configreader.getConfPath("ffmpeg")
     os.environ['LANG']="ja_JP.UTF-8"
     exe=ffmpeg+u" -ss 5 -fs 1 -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")
     sizeMaxX=0
@@ -372,7 +474,7 @@ def getMoviePAR2(pin):
     os.remove(pin+".size.ts")
     return [parx,pary]
 def getMovieDAR(pin):
-    ffmpeg=configreader.getPathSetting("ffmpeg")
+    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','ignore')
@@ -400,7 +502,7 @@ def getMovieDAR(pin):
                     dary=tEY
     return [darx,dary]
 def getMovieDAR2(pin):
-    ffmpeg=configreader.getPathSetting("ffmpeg")
+    ffmpeg=configreader.getConfPath("ffmpeg")
     os.environ['LANG']="ja_JP.UTF-8"
     exe=ffmpeg+u" -ss 5 -fs 1 -i \""+pin+"\" \""+pin+".size.ts\" 2>&1"
     txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8','ignore')
@@ -442,25 +544,64 @@ def getParSize(pin,y):
         tY=-1
     return [tX,tY]
 def getX264CoreVersion():
-    x264=configreader.getPathSetting("x264")
+    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):
-    x264=configreader.getPathSetting("x264")
+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"
     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)
-    x264_addline=configreader.getConfEnv("x264_addline")
+    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 --open-gop --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:
         xtt=configreader.getConfEnv("x264_thread")
@@ -470,9 +611,9 @@ def getX264Commandline(preset,sar,fps,x264profile,x264tune,pout,pin,x264streamsi
     except:
         x264_thread="auto"
     x264_addline=configreader.getConfEnv("x264_addline")
-    if get_x264core_version()>103:
+    if getX264CoreVersion()>103:
         x264res=u"--input-res "+x264streamsize
-        exe=u"nice -n 19 "+x264+" "+x264_sar+" "+x264crf+u" "+x264_addline+u" --colormatrix bt709 --threads "+x264_thread+" "+x264profile+x264preset+" "+x264tune+" "+x264fps+" "+x264res+" -o \""+pout+"\" "+pin
+        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:
-        exe=u"nice -n 19 "+x264+" "+x264_sar+" "+x264crf+u" "+x264_addline+u" --colormatrix bt709 --threads "+x264_thread+" "+x264profile+x264preset+" "+x264tune+" "+x264fps+" -o \""+pout+"\" "+pin+" "+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+" -o \""+pout+"\" "+pin+" "+x264streamsize
     return exe