OSDN Git Service

fix scale option of mencoder when blu-ray and interlaced option.
[rec10/rec10-git.git] / rec10 / trunk / src / ts2x264.py
index a409fc6..4a2b37f 100644 (file)
@@ -25,6 +25,8 @@ def ts2x264(pin, pout, opts):#sizeは"HD"か"SD"
     quality=int(configreader.getConfEnv("x264_preset"))\r
     crf=int(configreader.getConfEnv("crf"))\r
     deinterlace=1\r
+    bluray=0\r
+    sar=1\r
     if re.search("H", opts):\r
         size = "HD"\r
     if re.search("S", opts):\r
@@ -36,9 +38,11 @@ def ts2x264(pin, pout, opts):#sizeは"HD"か"SD"
     if re.search("MW1",opts):\r
         size = "QVGA_BASE"\r
         crf=crf+4\r
+        sar=0\r
     if re.search("MW2", opts):\r
         size = "WVGA_BASE"\r
         crf=crf+2\r
+        sar=0\r
     if re.search("v", opts):\r
         is24fps=1\r
         crf=int(configreader.getConfEnv("animation_crf"))\r
@@ -47,6 +51,9 @@ def ts2x264(pin, pout, opts):#sizeは"HD"か"SD"
         crf=int(configreader.getConfEnv("animation_crf"))\r
     if re.search("I", opts):\r
         deinterlace=0\r
+    if re.search("B", opts):\r
+        bluray=1\r
+        sar=0\r
     if re.search("q",opts):\r
         quality=quality-2\r
     if re.search("w",opts):\r
@@ -65,15 +72,31 @@ def ts2x264(pin, pout, opts):#sizeは"HD"か"SD"
         crf=crf-2\r
     if re.search("d",opts):#二カ国語放送の場合\r
         tm2v=pin.replace(".ts",".m2v")\r
-        encodeFfmpegSar(tm2v,pout,size,is24fps,quality,crf,deinterlace)\r
+        encodeFfmpegSar(tm2v,pout,size,is24fps,quality,crf,deinterlace=deinterlace,usebluray=bluray,usesar=sar)\r
     elif re.search("5",opts):#5.1chの場合\r
-        encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace)\r
+        encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace=deinterlace,usebluray=bluray,usesar=sar)\r
+    elif re.search("b",opts):#BonTsDemuxを使いたい場合\r
+        tm2v=pin.replace(".ts",".m2v")\r
+        encodeFfmpegSar(tm2v,pout,size,is24fps,quality,crf,deinterlace=deinterlace,usebluray=bluray,usesar=sar)\r
     else:\r
         try:\r
-            encodeMencoderSar(pin, pout,size,is24fps,quality,crf,deinterlace)\r
+            encodeMencoderSar(pin, pout,size,is24fps,quality,crf,deinterlace=deinterlace,uselavf=1,usebluray=bluray,usesar=sar)\r
+            if os.path.exists(pout):\r
+                if not os.path.getsize(pout)>1*1000:\r
+                    recdblist.addCommonlogEX("Warning", "Old mencoder option used.","","",log_level=200)\r
+                    try:\r
+                        encodeMencoderSar(pin, pout,size,is24fps,quality,crf,deinterlace=deinterlace,uselavf=0,usebluray=bluray,usesar=sar)\r
+                    except Exception, inst:\r
+                        recdblist.addCommonlogEX("Error", "ts2x264_mencoder_old(ts2x264.py)", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)\r
+            else:\r
+                recdblist.addCommonlogEX("Warning", "Old mencoder option used.","","",log_level=200)\r
+                try:\r
+                    encodeMencoderSar(pin, pout,size,is24fps,quality,crf,deinterlace=deinterlace,uselavf=0,usebluray=bluray,usesar=sar)\r
+                except Exception, inst:\r
+                    recdblist.addCommonlogEX("Error", "ts2x264_mencoder_old(ts2x264.py)", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)\r
         except Exception, inst:\r
             recdblist.addCommonlogEX("Error", "ts2x264(ts2x264.py)", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)\r
-def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):\r
+def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1,uselavf=0,usebluray=0,usesar=1):\r
     mencoder=configreader.getConfPath("mencoder")\r
     tee=configreader.getConfPath("tee")\r
     encvf=""\r
@@ -82,67 +105,98 @@ def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
     harddup=",hqdn3d=2:1:2,unsharp=l3x3:0.75:c3x3:0.75,harddup"\r
     ofps="-ofps 30000/1001"\r
     fps="-fps 30000/1001"\r
-    x264fps="30000/1001"\r
+    x264fps="30000/1001 --keyint 30"\r
     x264streamsize=""\r
     x264preset=""\r
     x264tune=""\r
     x264_bitrate="5000"\r
+    x264interlaced=0\r
+    x264sar="1:1"\r
     tsar=getMoviePAR2(pin)\r
-    x264sar=str(tsar[0])+":"+str(tsar[1])\r
+    if usesar==1:\r
+        x264sar=str(tsar[0])+u":"+str(tsar[1])\r
+    lavft=""\r
     if is24fps==1:\r
         ofps="-ofps 24000/1001"\r
         fps="-fps 30000/1001"\r
-        x264fps="24000/1001"\r
+        x264fps="24000/1001 --keyint 24"\r
         x264tune="--tune animation"\r
         encvf="-sws 9 -vf pullup,softskip"\r
         harddup=",pp=l5,unsharp=l3x3:0.75:c3x3:0.75,hqdn3d=2:1:2,harddup"\r
     if size == "HD":\r
         tsize=getParSize(pin,720)\r
-        encvf = encvf + ",scale=-3:720::0:3"+harddup\r
-        x264streamsize=str(tsize[0])+u"x720"\r
+        if usesar==1:\r
+            encvf = encvf + ",scale=-3:720::0:3"+harddup\r
+            x264streamsize=str(tsize[0])+u"x720"\r
+        else:\r
+            encvf = encvf + ",scale=-2:720::0:3,expand=1280:720"+harddup\r
+            x264streamsize=u"1280x720"\r
         x264_bitrate="2500"\r
     elif size == "WVGA":\r
         tsize=getParSize(pin,480)\r
-        encvf = encvf + ",scale=-3:480::0:3"+harddup\r
-        x264streamsize=str(tsize[0])+u"x480"\r
+        if usesar==1:\r
+            encvf = encvf + ",scale=-3:480::0:3"+harddup\r
+            x264streamsize=str(tsize[0])+u"x480"\r
+        else:\r
+            encvf = encvf + ",scale=-2:480::0:3,expand=854:480"+harddup\r
+            x264streamsize=u"854x480"\r
         x264_bitrate="1500"\r
     elif size == "FullHD":\r
         tsize=getParSize(pin,1080)\r
-        encvf = encvf + ",scale=-3:1080::0:3"+harddup\r
-        x264streamsize=str(tsize[0])+u"x1080"\r
+        if usesar==1:\r
+            encvf = encvf + ",scale=-3:1080::0:3"+harddup\r
+            x264streamsize=str(tsize[0])+u"x1080"\r
+        else:\r
+            encvf = encvf + ",scale=-2:1080::0:3,expand=1920:1080"+harddup\r
+            x264streamsize=u"1920x1080"\r
         x264_bitrate="5000"\r
     elif size == "QVGA_BASE":\r
         tsize=getParSize(pin,240)\r
-        encvf = encvf + ",scale=-3:240::0:3"+harddup\r
-        x264streamsize=str(tsize[0])+u"x240"\r
+        if usesar==1:\r
+            encvf = encvf + ",scale=-3:240::0:3"+harddup\r
+            x264streamsize=str(tsize[0])+u"x240"\r
+        else:\r
+            encvf = encvf + ",scale=320:-2::0:3,expand=320:240"+harddup\r
+            x264streamsize=u"320x240"\r
         x264_bitrate="300"\r
     elif size == "WVGA_BASE":\r
         tsize=getParSize(pin,480)\r
-        encvf = encvf + ",scale=-3:480::0:3"+harddup\r
-        x264streamsize=str(tsize[0])+u"x480"\r
+        if usesar==1:\r
+            encvf = encvf + ",scale=-3:480::0:3"+harddup\r
+            x264streamsize=str(tsize[0])+u"x480"\r
+        else:\r
+            encvf = encvf + ",scale=-2:480::0:3,expand=854:480"+harddup\r
+            x264streamsize=u"854x480"\r
         x264_bitrate="1500"\r
     else:\r
         tsize=getParSize(pin,720)\r
-        encvf = encvf + ",scale=-3:720::0:3"+harddup\r
-        x264streamsize=str(tsize[0])+u"x720"\r
+        if usesar==1:\r
+            encvf = encvf + ",scale=-3:720::0:3"+harddup\r
+            x264streamsize=str(tsize[0])+u"x720"\r
+        else:\r
+            encvf = encvf + ",scale=-2:720::0:3,expand=1280:720"+harddup\r
+            x264streamsize=u"1280x720"\r
         x264_bitrate="2500"\r
     if deinterlace==0:\r
         tsize=getMovieBaseSize2(pin)\r
         ofps="-ofps 30000/1001"\r
         #fps="-fps 30000/1001"\r
         fps=""\r
-        x264fps="30000/1001"\r
-        x264tune=x264tune+" --tff --nal-hrd vbr"\r
+        x264fps="30000/1001 --keyint 30"\r
+        x264interlaced=1\r
         encvf="-vf hqdn3d=2:1:2"\r
         harddup=",harddup"\r
         encvf=encvf+harddup\r
         x264streamsize=str(tsize[0])+u"x"+str(tsize[1])\r
+        if usebluray==1:\r
+            encvf = u"-sws 9 "+encvf + ",scale=-2:1080::0:3,expand=1920:1080"+harddup\r
+            x264streamsize=u"1920x1080"\r
     if tsize[0] <= 0 or tsize[1] <= 0:\r
         encvf="-sws 9 -vf yadif=0,pp=l5"\r
         harddup=",hqdn3d=2:1:2,unsharp=l3x3:0.75:c3x3:0.75,harddup"\r
         ofps="-ofps 30000/1001"\r
         fps="-fps 30000/1001"\r
-        x264fps="30000/1001"\r
+        x264fps="30000/1001 --keyint 30"\r
         tsize=[1280,720]\r
         encvf = encvf + ",scale=-2:720::0:3,expand=1280:720"+harddup\r
         x264streamsize=u"1280x720"\r
@@ -165,6 +219,8 @@ def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
         x264profile=" --level 32 --profile baseline "\r
     else:\r
         x264profile=" --level 41 --profile high "\r
+    if uselavf==1:\r
+        lavft="-demuxer lavf "\r
     x264crf=str(crf)\r
     os.environ['LANG']="ja_JP.UTF-8"\r
     random.seed(pin)\r
@@ -176,8 +232,8 @@ def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
     unicode(commands.getoutput(u"mkfifo "+streampath),'utf-8','ignore')\r
     logmencoder=recdblist.getLogTitle(pin)+".mencoder.log"\r
     logx264=recdblist.getLogTitle(pin)+".x264.log"\r
-    encexe=mencoder+u" \""+pin+u"\" -quiet -vfm ffmpeg "+encvf+u",format=i420 "+fps+" "+ofps+" -oac mp3lame -ovc raw -of rawvideo -o \""+streampath+"\" 2>&1 | "+tee+" \""+logmencoder+"\" & "\r
-    encexe=encexe+getX264Commandline(x264preset, x264sar, x264fps, x264profile, x264tune, pout, streampath, x264streamsize, crf=x264crf)\r
+    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+"\" & "\r
+    encexe=encexe+getX264Commandline(x264preset, x264sar, x264fps, x264profile, x264tune, pout, streampath, x264streamsize, crf=x264crf,interlaced=x264interlaced,bluray=usebluray)\r
     #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\r
     encexe=u"nice -n 19 " +encexe+" 2>&1 | "+tee+" \""+logx264+"\""\r
     try:\r
@@ -199,22 +255,27 @@ def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
     os.remove(logx264)\r
     recdblist.addCommandLog(pin, u"Mencoder", encexe, txt)\r
 #    recdblist.addCommandLogTar(pin,u"Mencoder","mencoder", encexe,txt)\r
-def encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):\r
+def encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace=1,usebluray=0,usesar=1):\r
     """\r
 \r
     """\r
     ffmpeg=configreader.getConfPath("ffmpeg")\r
     tee=configreader.getConfPath("tee")\r
     fps=u"-r 29.970030 "\r
-    x264fps="30000/1001"\r
+    x264fps="30000/1001 --keyint 30"\r
     x264streamsize=""\r
     x264preset=""\r
     x264tune=""\r
     x264_bitrate="2500"\r
     x264_thread="auto"\r
+    x264interlaced=0\r
     tsar=getMoviePAR2(pin)\r
     filter="-deinterlace"\r
     x264sar=str(tsar[0])+":"+str(tsar[1])\r
+    if is24fps==1:\r
+        fps=u"-r 23.976023 "\r
+        x264fps="24000/1001 --keyint 24"\r
+        x264tune="--tune animation"\r
     if size == "HD":\r
         tsize=getParSize(pin,720)\r
         s = "-s "+str(tsize[0])+"x720 "\r
@@ -254,8 +315,8 @@ def encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
         tsize=getMovieBaseSize2(pin)\r
         fps=""\r
         s = "-s "+str(tsize[0])+"x"+str(tsize[1])+" "\r
-        x264fps="30000/1001"\r
-        x264tune=x264tune+" --tff --nal-hrd vbr"\r
+        x264fps="30000/1001 --keyint 30"\r
+        x264interlaced=1\r
         filter=""\r
         x264streamsize=str(tsize[0])+u"x"+str(tsize[1])\r
     if quality==1:\r
@@ -282,7 +343,7 @@ def encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
     log_ffmpeg=recdblist.getLogTitle(pin)+".ffmpeg.log"\r
     log_x264=recdblist.getLogTitle(pin)+".x264.log"\r
     exe=ffmpeg+u" -y -i \""+pin+"\" -vsync 400 -vcodec rawvideo -pix_fmt yuv420p "+s+fps+" "+filter+" -an -f rawvideo - 2> \""+log_ffmpeg+"\" | "\r
-    exe=exe+getX264Commandline(x264preset, x264sar, x264fps, x264profile, x264tune, pout,"-", x264streamsize, crf=x264crf)\r
+    exe=exe+getX264Commandline(x264preset, x264sar, x264fps, x264profile, x264tune, pout,"-", x264streamsize, crf=x264crf,interlaced=x264interlaced,bluray=usebluray)\r
     exe = "nice -n 19 " + exe+" 2>&1 | "+tee+" \""+log_x264+"\""\r
     txt=""\r
     #recdblist.addCommandSelfLog(log_ffmpeg,recdblist.getLogTitle(pin)+".log.zip")\r
@@ -324,6 +385,12 @@ def getMovieBaseSize2(pin):##動画開始後すぐに解像度が変更された
     ffmpeg=configreader.getConfPath("ffmpeg")\r
     os.environ['LANG']="ja_JP.UTF-8"\r
     exe=ffmpeg+u" -ss 5 -fs 1 -i \""+pin+"\" \""+pin+".size.ts\" 2>&1"\r
+    try:\r
+        recdblist.addCommandSelfLog(pin, exe)\r
+    except Exception, inst:\r
+        print type(inst)\r
+        print str(inst)\r
+        print traceback.print_exc(file=sys.stdout)\r
     txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8','ignore')\r
     rT=re.compile(u"Stream.*#.*:.*\D+([\d]+x[\d]+)\D+PAR\D+(\d+:\d+)\D+.*\Z")\r
     sizeMaxX=0\r
@@ -375,6 +442,12 @@ def getMoviePAR2(pin):
     ffmpeg=configreader.getConfPath("ffmpeg")\r
     os.environ['LANG']="ja_JP.UTF-8"\r
     exe=ffmpeg+u" -ss 5 -fs 1 -i \""+pin+"\" \""+pin+".size.ts\" 2>&1"\r
+    try:\r
+        recdblist.addCommandSelfLog(pin, exe)\r
+    except Exception, inst:\r
+        print type(inst)\r
+        print str(inst)\r
+        print traceback.print_exc(file=sys.stdout)\r
     txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8','ignore')\r
     rT=re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+PAR\D+(\d+:\d+)\D+.*\Z")\r
     sizeMaxX=0\r
@@ -472,24 +545,63 @@ def getParSize(pin,y):
     return [tX,tY]\r
 def getX264CoreVersion():\r
     x264=configreader.getConfPath("x264")\r
+    #print x264\r
     t1=commands.getoutput(x264+" --help|grep core")\r
+    #print t1\r
     rT=re.compile(u"x264 core:(\d*)[\d]*.*\Z")\r
     rM=rT.match(t1)\r
     v=-1\r
     if rM:\r
         v=int(rM.group(1))\r
     return v\r
-def getX264Commandline(preset,sar,fps,x264profile,x264tune,pout,pin,x264streamsize,crf=-1,bitrate=0):\r
+def getX264Commandline(preset,sar,fps,x264profile,x264tune,pout,pin,x264streamsize,crf=-1,bitrate=0,interlaced=0,bluray=0):\r
     x264=configreader.getConfPath("x264")\r
     os.environ['LANG']="ja_JP.UTF-8"\r
     x264_sar="--sar "+sar\r
     x264preset=u"--preset "+preset\r
     x264fps="--fps "+fps\r
+    x264interlaced=""\r
+    x264bluray=""\r
+    x264_addline=configreader.getConfEnv("x264_addline")\r
     if crf==-1:\r
         x264bitrate=u"--bitrate "+str(bitrate)\r
     else:\r
         x264crf=u"--crf "+str(crf)\r
-    x264_addline=configreader.getConfEnv("x264_addline")\r
+    if interlaced==1:\r
+        x264interlaced="--tff --nal-hrd vbr"\r
+    if bluray==1:\r
+        if getX264CoreVersion()<115:\r
+            x264bluray=" --weightp 1 --nal-hrd vbr --bframes 3 --b-pyramid none --open-gop bluray --slices 4 --aud --colorprim bt709 --transfer bt709 "\r
+            x264_addline=""\r
+            if fps=="24000/1001 --keyint 24" or fps =="24000/1001":\r
+                if x264streamsize=="1280x720":\r
+                    x264bluray=u"--ref 6 "+x264bluray\r
+                if x264streamsize=="1920x1080":\r
+                    x264bluray=u"--ref 4 "+x264bluray\r
+            elif fps=="30000/1001 --keyint 30" or fps =="30000/1001":\r
+                if x264streamsize=="1280x720":\r
+                    x264bluray=u"--ref 6 --pulldown double "+x264bluray\r
+                if x264streamsize=="1920x1080":\r
+                    if interlaced==0:\r
+                        x264bluray=u"--ref 4 --fake-interlaced --pic-struct "+x264bluray\r
+                    else:\r
+                        x264bluray=u"--ref 4 "+x264bluray\r
+        elif getX264CoreVersion()>=115:\r
+            x264bluray=" --slices 4 --bluray-compat --nal-hrd vbr --bframes 3 --b-pyramid strict --aud --colorprim bt709 --transfer bt709 "\r
+            x264_addline=""\r
+            if fps=="24000/1001 --keyint 24" or fps =="24000/1001":\r
+                if x264streamsize=="1280x720":\r
+                    x264bluray=u"--ref 6 "+x264bluray\r
+                if x264streamsize=="1920x1080":\r
+                    x264bluray=u"--ref 4 "+x264bluray\r
+            elif fps=="30000/1001 --keyint 30" or fps =="30000/1001":\r
+                if x264streamsize=="1280x720":\r
+                    x264bluray=u"--ref 6 --pulldown double "+x264bluray\r
+                if x264streamsize=="1920x1080":\r
+                    if interlaced==0:\r
+                        x264bluray=u"--ref 4 --fake-interlaced --pic-struct "+x264bluray\r
+                    else:\r
+                        x264bluray=u"--ref 4 "+x264bluray\r
     x264_thread="auto"\r
     try:\r
         xtt=configreader.getConfEnv("x264_thread")\r
@@ -501,7 +613,7 @@ def getX264Commandline(preset,sar,fps,x264profile,x264tune,pout,pin,x264streamsi
     x264_addline=configreader.getConfEnv("x264_addline")\r
     if getX264CoreVersion()>103:\r
         x264res=u"--input-res "+x264streamsize\r
-        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\r
+        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\r
     else:\r
-        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\r
+        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\r
     return exe\r