fix some error.

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

diff --git a/rec10/trunk/src/Makefile b/rec10/trunk/src/Makefile
index 18c8892..dbb54e2 100644 (file)
--- a/rec10/trunk/src/Makefile
+++ b/rec10/trunk/src/Makefile
@@ -13,7 +13,6 @@ install:
        echo -e "#!/bin/sh\nexport LANG=\"ja_JP.UTF-8\" && python2.6 ${DEST}/rec10d.py" > ./rec10
        install -m755 ./rec10 $(DEST)/
        if ! [ -f /usr/local/bin/rec10 ]; then ln $(DEST)/rec10 /usr/local/bin;fi
-       ln $(DEST)/rec10 /usr/local/bin
        chmod 755 /usr/local/bin/rec10
        if ! [ -f /etc/rec10.conf ]; then cp ./rec10.conf /etc/rec10.conf;fi
        if ! [ -d /tmp/rec10 ]; then mkdir -p /tmp/rec10 ;fi

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index 8485020..ad41195 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -17,29 +17,35 @@ def ts2x264(pin, pout, opts):#sizeは"HD"か"SD"
     is24fps=0
     islight=0
     size="Tall"
+    quality=5
     if re.search("2", opts):
         dualpass = 1
     if re.search("H", opts):
         size = "HD"
+        quality=9
     if re.search("S", opts):
         size = "SD"
+        quality=5
     if re.search("F", opts):
         size = "FHD"
+        quality=15
     if re.search("L", opts):
         size = "Short"
+        quality=3
     if re.search("G", opts):
         size = "LowHD"
+        quality=5
     if re.search("v", opts):
-        isvfr=1
+        is24fps=1
     if re.search("a", opts):
         is24fps=1
     if re.search("l",opts):
-        islight=1
+        quality=3
     if re.search("d",opts):
         encode_ffmpeg(pin, pout, size, dualpass)
     else:
-        encode(pin, pout,size,isvfr,dualpass,is24fps,islight)
-def encode(pin,pout,size,isvfr,is2pass,is24fps,islight):
+        encode(pin, pout,size,dualpass,is24fps,quality)
+def encode(pin,pout,size,is2pass,is24fps,quality):
     encvf=""
     txt=""
     encvf="-vf yadif=0,pp=l5"
@@ -50,6 +56,18 @@ def encode(pin,pout,size,isvfr,is2pass,is24fps,islight):
     scale=""
     x264enc1=":me=dia:subme=4"
     x264enc2=":frameref=3:subme=8:bframes=3"
+    if quality<5:
+        x264enc1=":me=dia:partitions=i8x8,i4x4:frameref=1:subme=1:trellis=0"
+        x264enc2=":me=dia:partitions=i8x8,i4x4:frameref=1:subme=1:trellis=0"
+    elif quality<8:
+        x264enc1=""
+        x264enc2=""
+    elif quality<10:
+        x264enc1=":direct_pred=auto:frameref=5:subme=8:bframes=1:trellis=1"
+        x264enc2=":direct_pred=auto:frameref=5:subme=8:bframes=1:trellis=1"
+    elif quality<15:
+        x264enc1=":me=hex:bframes=3"
+        x264enc2=":frameref=6:subme=8:subq=7:trellis=2:partitions=all:8x8dct:direct_pred=auto:me=umh:bframes=3"
     crf=""
     if is24fps==1:
         ofps="-ofps 24000/1001"
@@ -57,22 +75,18 @@ def encode(pin,pout,size,isvfr,is2pass,is24fps,islight):
         encvf="-vf pullup,softskip"
         harddup=",pp=l5,unsharp=l3x3:0.75:c3x3:0.75,hqdn3d=2:1:2,harddup"
         bm=1
-        x264enc1=":me=hex:bframes=3"
-        x264enc2=":frameref=6:subme=8:subq=7:trellis=2:aq-strength=0.6:deblock=1,1:psy-rd=0.4:partitions=all:8x8dct:direct_pred=auto:me=umh:bframes=3"
-    if isvfr==1:
-        ofps="-ofps 60000/1001"
-        fps="-fps 60000/1001"
-        encvf="-vf tfields=1,hqdn3d=2:1:2"
-        #encvf="-vf yadif=1,pp=ac,pp=mb"
-        harddup=",pp=ac,pp=l5,unsharp=l3x3:0.75:c3x3:0.75,harddup"
-        #encvf="-vf pullup,softskip,pp=ac"
-        #encvf="-vf filmdint=io=2997:119880,pp=md"
-        bm=1
-        x264enc1=":me=hex:bframes=3:cqm=jvt"
-        x264enc2=":frameref=3:subme=8:subq=7:8x8dct:direct_pred=auto:me=umh:bframes=3:weight_b:cqm=jvt"
-    if islight==1:
-        x264enc1=":no8x8dct:b-adapt=0:bframes=0:no-cabac:no-deblock:me=dia:partitions=i8x8,i4x4:frameref=1:subme=1:trellis=0:scenecut=0"
-        x264enc2=":no8x8dct:b-adapt=0:bframes=0:no-cabac:no-deblock:me=dia:partitions=i8x8,i4x4:frameref=1:subme=1:trellis=0:scenecut=0"
+        if quality<3:
+            x264enc1=":me=dia:partitions=i8x8,i4x4:frameref=1:subme=1:trellis=0"
+            x264enc2=":me=dia:aq-strength=0.6:deblock=1,1:psy-rd=0.4:partitions=i8x8,i4x4:frameref=1:subme=1:trellis=0"
+        elif quality<5:
+            x264enc1=""
+            x264enc2=":aq-strength=0.6:deblock=1,1:psy-rd=0.4"
+        elif quality<8:
+            x264enc1=":direct_pred=auto:frameref=5:subme=8:bframes=1:trellis=1"
+            x264enc2=":direct_pred=auto:aq-strength=0.6:deblock=1,1:psy-rd=0.4:frameref=5:subme=8:bframes=1:trellis=1"
+        elif quality<10:
+            x264enc1=":me=hex:bframes=3"
+            x264enc2=":frameref=6:subme=8:subq=7:trellis=2:aq-strength=0.6:deblock=1,1:psy-rd=0.4:partitions=all:8x8dct:direct_pred=auto:me=umh:bframes=3"
     if size == "HD":
         encvf = encvf + ",scale=1280:720::0:3"+harddup
         bitrate = "bitrate=" + str(tv2avi.Bitrate_HD*bm)