import configreader\r
import os\r
import os.path\r
+import sys\r
import re\r
import random\r
import time\r
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
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
zip.addFile2FileZip(log_x264, recdblist.getLogTitle(pin+".log.zip"))\r
os.remove(log_ffmpeg)\r
os.remove(log_x264)\r
-def getMovieBaseSize(pin):\r
- ffmpeg=configreader.getConfPath("ffmpeg")\r
- os.environ['LANG']="ja_JP.UTF-8"\r
- exe=ffmpeg+u" -i \""+pin+"\" 2>&1"\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
- sizeMaxY=0\r
- txtls=txts.split("\n")\r
- for t in txtls:\r
- rM=rT.match(t)\r
- if rM:\r
- sizetxt=rM.group(1)\r
- partxt=rM.group(2)\r
- tX=int(sizetxt.split("x")[0])\r
- tY=int(sizetxt.split("x")[1])\r
- tEX=int(partxt.split(":")[0])\r
- tEY=int(partxt.split(":")[1])\r
- if sizeMaxX<tX:\r
- sizeMaxX=tX\r
- sizeMaxY=tY\r
- return [sizeMaxX,sizeMaxY]\r
def getMovieBaseSize2(pin):##動画開始後すぐに解像度が変更されたときに対処\r
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
+ exe=ffmpeg+u" -ss 5 -fs 1 -t 10 -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
+ rT2=re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+SAR\D+(\d+:\d+)\D+.*DAR\D+(\d+:\d+)\D+.*\Z")\r
sizeMaxX=0\r
sizeMaxY=0\r
txtls=txts.split("\n")\r
for t in txtls:\r
rM=rT.search(t)\r
+ rM2=rT2.search(t)\r
if rM:\r
sizetxt=rM.group(1)\r
partxt=rM.group(2)\r
if sizeMaxX<tX:\r
sizeMaxX=tX\r
sizeMaxY=tY\r
- os.remove(pin+".size.ts")\r
- return [sizeMaxX,sizeMaxY]\r
-def getMoviePAR(pin):\r
- ffmpeg=configreader.getConfPath("ffmpeg")\r
- os.environ['LANG']="ja_JP.UTF-8"\r
- exe=ffmpeg+u" -i \""+pin+"\" 2>&1"\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
- parx=0\r
- pary=0\r
- txtls=txts.split("\n")\r
- for t in txtls:\r
- rM=rT.match(t)\r
- if rM:\r
- sizetxt=rM.group(1)\r
- dartxt=rM.group(2)\r
- tX=int(sizetxt.split("x")[0])\r
- tY=int(sizetxt.split("x")[1])\r
- tEX=int(dartxt.split(":")[0])\r
- tEY=int(dartxt.split(":")[1])\r
- if sizeMaxX<tX:\r
- sizeMaxX=tX\r
- if tX==1920 and tY==1080:\r
- parx=1\r
- pary=1\r
- else:\r
- parx=tEX\r
- pary=tEY\r
- return [parx,pary]\r
-def getMoviePAR2(pin):\r
- 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
- 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
- parx=0\r
- pary=0\r
- txtls=txts.split("\n")\r
- for t in txtls:\r
- rM=rT.match(t)\r
- if rM:\r
- sizetxt=rM.group(1)\r
- dartxt=rM.group(2)\r
+ if rM2:\r
+ sizetxt=rM2.group(1)\r
tX=int(sizetxt.split("x")[0])\r
tY=int(sizetxt.split("x")[1])\r
- tEX=int(dartxt.split(":")[0])\r
- tEY=int(dartxt.split(":")[1])\r
if sizeMaxX<tX:\r
sizeMaxX=tX\r
- if tX==1920 and tY==1080:\r
- parx=1\r
- pary=1\r
- else:\r
- parx=tEX\r
- pary=tEY\r
+ sizeMaxY=tY\r
os.remove(pin+".size.ts")\r
- return [parx,pary]\r
-def getMovieDAR(pin):\r
+ return [sizeMaxX,sizeMaxY]\r
+def getMoviePAR2(pin):\r
ffmpeg=configreader.getConfPath("ffmpeg")\r
os.environ['LANG']="ja_JP.UTF-8"\r
- exe=ffmpeg+u" -i \""+pin+"\" 2>&1"\r
- txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8','ignore')\r
- rT=re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+.*DAR\D+(\d+:\d+)\D+.*\Z")\r
- sizeMaxX=0\r
- darx=0\r
- dary=0\r
- txtls=txts.split("\n")\r
+ exe=ffmpeg+u" -ss 5 -fs 1 -t 10 -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
+ rT2 = re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+SAR\D+(\d+:\d+)\D+.*DAR\D+(\d+:\d+)\D+.*\Z")\r
+ sizeMaxX = 0\r
+ parx = 0\r
+ pary = 0\r
+ txtls = txts.split("\n")\r
for t in txtls:\r
- rM=rT.match(t)\r
+ rM = rT.match(t)\r
+ rM2 = rT2.match(t)\r
if rM:\r
- sizetxt=rM.group(1)\r
- dartxt=rM.group(2)\r
- tX=int(sizetxt.split("x")[0])\r
- tY=int(sizetxt.split("x")[1])\r
- tEX=int(dartxt.split(":")[0])\r
- tEY=int(dartxt.split(":")[1])\r
- if sizeMaxX<tX:\r
- sizeMaxX=tX\r
- if tX==1920 and tY==1080:\r
- darx=16\r
- dary=9\r
+ sizetxt = rM.group(1)\r
+ dartxt = rM.group(2)\r
+ tX = int(sizetxt.split("x")[0])\r
+ tY = int(sizetxt.split("x")[1])\r
+ tEX = int(dartxt.split(":")[0])\r
+ tEY = int(dartxt.split(":")[1])\r
+ if sizeMaxX < tX:\r
+ sizeMaxX = tX\r
+ if tX == 1920 and tY == 1080:\r
+ parx = 1\r
+ pary = 1\r
else:\r
- darx=tEX\r
- dary=tEY\r
- return [darx,dary]\r
-def getMovieDAR2(pin):\r
- 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
- txts=unicode(commands.getoutput(exe.encode('utf-8')),'utf-8','ignore')\r
- rT=re.compile(u".*Stream.*#.*:.*\D+([\d]+x[\d]+)\D+.*DAR\D+(\d+:\d+)\D+.*\Z")\r
- sizeMaxX=0\r
- darx=0\r
- dary=0\r
- txtls=txts.split("\n")\r
- for t in txtls:\r
- rM=rT.match(t)\r
- if rM:\r
- sizetxt=rM.group(1)\r
- dartxt=rM.group(2)\r
- tX=int(sizetxt.split("x")[0])\r
- tY=int(sizetxt.split("x")[1])\r
- tEX=int(dartxt.split(":")[0])\r
- tEY=int(dartxt.split(":")[1])\r
- if sizeMaxX<tX:\r
- sizeMaxX=tX\r
- if tX==1920 and tY==1080:\r
- darx=16\r
- dary=9\r
+ parx = tEX\r
+ pary = tEY\r
+ rM = rT.match(t)\r
+ if rM2:\r
+ sizetxt = rM2.group(1)\r
+ sartxt = rM2.group(2)\r
+ dartxt = rM2.group(3)\r
+ tX = int(sizetxt.split("x")[0])\r
+ tY = int(sizetxt.split("x")[1])\r
+ tEX = int(dartxt.split(":")[0])\r
+ tEY = int(dartxt.split(":")[1])##dar=sarxpar\r
+ tSX = int(sartxt.split(":")[0])\r
+ tSY = int(sartxt.split(":")[1])##par=dar/sar= darx*pary*sary=dary*parx*sarx\r
+ if sizeMaxX < tX:\r
+ sizeMaxX = tX\r
+ if tX == 1920 and tY == 1080:\r
+ parx = 1\r
+ pary = 1\r
else:\r
- darx=tEX\r
- dary=tEY\r
+ if tEX * tSY == tEY * tSX:\r
+ parx = 1\r
+ pary = 1\r
+ elif tEX * tSY * 3 == tEY * tSX * 4:\r
+ parx = 4\r
+ pary = 3\r
+ elif tEX * tSY * 4 == tEY * tSX * 3:\r
+ parx = 3\r
+ pary = 4\r
+ elif tEX * tSY * 9 == tEY * tSX * 16:\r
+ parx = 16\r
+ pary = 9\r
+ elif tEX * tSY * 16 == tEY * tSX * 9:\r
+ parx = 9\r
+ pary = 16\r
os.remove(pin+".size.ts")\r
- return [darx,dary]\r
+ return [parx,pary]\r
def getParSize(pin,y):\r
tSize=getMovieBaseSize2(pin)\r
if tSize[1] != 0 :\r
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 interlaced==1:\r
x264interlaced="--tff --nal-hrd vbr"\r
if bluray==1:\r
- x264bluray="--weightp 1 --bframes 3 --nal-hrd vbr --b-pyramid none --open-gop bluray --slices 4 --aud --colorprim bt709 --transfer bt709 "\r
- x264_addline=""\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
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" "+x264bluray+u" "+x264interlaced+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" "+x264bluray+u" "+x264interlaced+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
OSDN Git Service
