Use correct quality settings

teknoraver · Nov 9, 2010 · 2bb95fc · 2bb95fc
1 parent 319f3e9
commit 2bb95fc
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 18 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+mp4tools (0.6.8) maverick; urgency=low
+
+  * Maverick upload
+
+ -- Matteo Croce <matteo@raver>  Sun, 07 Nov 2010 20:02:46 +0100
+
 mp4tools (0.6.7) intrepid; urgency=low
 
   * Fix mplayer status line

diff --git a/debian/control b/debian/control
@@ -1,5 +1,5 @@
 Source: mp4tools
-Build-Depends: debhelper, dpatch
+Build-Depends: debhelper
 Section: sound
 Priority: optional
 Standards-Version: 3.7.3

diff --git a/dvd2ipod b/dvd2ipod
@@ -11,7 +11,7 @@
 X264OPTS='nocabac:level_idc=13:ref=3:me=umh:subq=7:trellis=1'
 TWIDTH=320
 THEIGHT=240
-VB=300
+VQ=24
 
 analyse "dvd://$DVDTITLE"
 scaleres $WIDTH $HEIGHT $TWIDTH $THEIGHT
@@ -31,7 +31,7 @@ fi
 if [ $HAS_VIDEO ]
 then
 #	OFPS=15
-	h264enc /tmp/dvd.$$.avi /tmp/video.$$.264 $X264OPTS $VB || clean_tmp
+	h264enc /tmp/dvd.$$.avi /tmp/video.$$.264 $X264OPTS $VQ || clean_tmp
 fi
 
 MP4BOX_OPTS='-ipod'

diff --git a/dvd2mp4 b/dvd2mp4
@@ -9,7 +9,7 @@
 . mp4tools
 
 X264OPTS='bframes=16:b-pyramid:ref=6:partitions=all:direct=auto:weightb:me=umh:subme=7:b-rdo:mixed-refs:bime:8x8dct:trellis=1'
-VB=700
+VQ=24
 
 analyse "dvd://$DVDTITLE"
 
@@ -27,7 +27,7 @@ fi
 
 if [ $HAS_VIDEO ]
 then
-	h264enc /tmp/dvd.$$.avi /tmp/video.$$.264 $X264OPTS $VB || clean_tmp
+	h264enc /tmp/dvd.$$.avi /tmp/video.$$.264 $X264OPTS $VQ || clean_tmp
 fi
 
 avmux "$1" || clean_tmp

diff --git a/dvd2psp b/dvd2psp
@@ -11,7 +11,7 @@
 X264OPTS='partitions=all:direct=auto:ref=6:me=umh:subq=7:mixed_refs:trellis=1:level_idc=13'
 TWIDTH=480
 THEIGHT=272
-VB=300
+VQ=24
 
 analyse "dvd://$DVDTITLE"
 scaleres $WIDTH $HEIGHT $TWIDTH $THEIGHT
@@ -30,7 +30,7 @@ fi
 
 if [ $HAS_VIDEO ]
 then
-	h264enc /tmp/dvd.$$.avi /tmp/video.$$.264 $X264OPTS $VB || clean_tmp
+	h264enc /tmp/dvd.$$.avi /tmp/video.$$.264 $X264OPTS $VQ || clean_tmp
 fi
 
 avmux "$1" || clean_tmp

diff --git a/dvd2s60 b/dvd2s60
@@ -12,7 +12,7 @@
 XVIDOPTS='max_bframes=0:chroma_opt'
 TWIDTH=320
 THEIGHT=240
-VB=160
+VQ=24
 
 analyse "dvd://$DVDTITLE"
 scaleres $WIDTH $HEIGHT $TWIDTH $THEIGHT
@@ -31,9 +31,7 @@ fi
 
 if [ $HAS_VIDEO ]
 then
-#	OFPS=15
-#	h264enc /tmp/dvd.$$.avi /tmp/video.$$.264 $X264OPTS $VB || clean_tmp
-	xvidenc /tmp/dvd.$$.avi /tmp/video.$$.m4v $XVIDOPTS $VB || clean_tmp
+	xvidenc /tmp/dvd.$$.avi /tmp/video.$$.m4v $XVIDOPTS $VQ || clean_tmp
 fi
 
 avmux "$1" || clean_tmp

diff --git a/mkipod b/mkipod
@@ -2,7 +2,7 @@
 
 . mp4tools
 
-VB=${3:-300}
+VQ=${3:-24}
 X264OPTS='nocabac:level_idc=13:ref=3:me=umh:subq=7:trellis=1'
 TWIDTH=320
 THEIGHT=240
@@ -33,7 +33,7 @@ fi
 
 if [ $HAS_VIDEO ]
 then
-	h264enc "$1" /tmp/video.$$.264 $X264OPTS $VB || clean_tmp
+	h264enc "$1" /tmp/video.$$.264 $X264OPTS $VQ || clean_tmp
 fi
 
 MP4BOX_OPTS='-ipod'

diff --git a/mkpsp b/mkpsp
@@ -5,7 +5,7 @@
 X264OPTS='partitions=all:frameref=3:me=umh:qcomp=0.8:subq=7:me_range=32:mixed_refs:trellis=2:level_idc=13'
 TWIDTH=480
 THEIGHT=272
-VB=${3:-200}
+VQ=${3:-24}
 
 [ "$#" -lt 1 ] && exec echo "usage: $0 <inputfile> [outfile] [bitrate]"
 
@@ -32,7 +32,7 @@ fi
 
 if [ $HAS_VIDEO ]
 then
-	h264enc "$1" /tmp/video.$$.264 $X264OPTS $VB || clean_tmp
+	h264enc "$1" /tmp/video.$$.264 $X264OPTS $VQ || clean_tmp
 fi
 
 avmux "$OUTFILE" || clean_tmp

diff --git a/mks60 b/mks60
@@ -8,7 +8,7 @@ X264OPTS='nocabac:qcomp=0.8:level_idc=12:ref=3:partitions=all:direct=auto:me=umh
 #XVIDOPTS='max_bframes=0:chroma_opt'
 TWIDTH=320
 THEIGHT=240
-VB=${3:-160}
+VQ=${3:-24}
 OUTFILE="${1%.*}.mp4"
 [ "$#" -gt 1 ] && OUTFILE="$2"
 
@@ -33,7 +33,7 @@ fi
 if [ $HAS_VIDEO ]
 then
 #	OFPS=15
-	h264enc "$1" /tmp/video.$$.264 $X264OPTS $VB || clean_tmp
+	h264enc "$1" /tmp/video.$$.264 $X264OPTS $VQ || clean_tmp
 #	xvidenc "$1" /tmp/video.$$.m4v $XVIDOPTS $VB || clean_tmp
 fi
 

diff --git a/mp4tools b/mp4tools
@@ -182,7 +182,7 @@ audiorip()
 {
 	[ -n "$3" ] && AF="-af $3"
 	green "Ripping Audio"
-	mplayer "$1" -benchmark -novideo -ao "pcm:fast:file=$2" $AF $MSG
+	mplayer "$1" -benchmark -vo null -ao "pcm:fast:file=$2" $AF $MSG
 }
 
 #aacenc <infile> <outfile>