Fixed -s option to properly constrain size in HandBrake encodings.

diff --git a/README b/README
index 02b8a0f34458845e59379a72a83f04f86caf2295..93c6860f5f381b7543cb1c8804558a1be18460c0 100644 (file)
--- a/README
+++ b/README
@@ -108,13 +108,13 @@ else on your system and change it appropriately to meet your needs.
 COMMAND LINE EXAMPLES
 ----------------------------------------------
 
-Rip a DVD into a compressed AVI file with default xvidvhq profile:
+Rip a DVD into a compressed AVI file with default xvidhq profile:
 > rip_dvd -d /path/to/dest/dir -b 2000 -z
 
-Rip a DVD into a compressed AVI file with default xvidvhq profile scaling to 320x240 compressed video size:
+Rip a DVD into a compressed AVI file with default xvidhq profile scaling to 320x240 compressed video size:
 > rip_dvd -d /path/to/dest/dir -b 2000 -z -a 320:240
 
-Rip a DVD into a compressed AVI file with default xvidvhq profile targetting a certain compressed video filesize (in MB):
+Rip a DVD into a compressed AVI file with default xvidhq profile targetting a certain compressed video filesize (in MB):
 > rip_dvd -d /path/to/dest/dir -b 2000 -z -s 650
 
 Rip a DVD into a VOB file:
@@ -139,6 +139,6 @@ Rip a DVD into a compressed MP4 file for an ipod AND again for a compressed AVI
 > dvdname=`volname /dev/dvd | awk '{ print $1 }'`
 > rip_dvd -d /path/to/dest/dir -v
 > rip_dvd -d /path/to/dest/dir/ipod -b 2000 -z -p ipod -n /path/to/dest/dir/$dvdname.VOB
-> rip_dvd -d /path/to/dest/dir/xvid -b 2000 -z -p xvidvhq -n /path/to/dest/dir/$dvdname.VOB
+> rip_dvd -d /path/to/dest/dir/xvid -b 2000 -z -p xvidhq -n /path/to/dest/dir/$dvdname.VOB
 > rm /path/to/dest/dir/$dvdname.VOB
 

diff --git a/rip_dvd b/rip_dvd
index e68012a3f237df2190c5053bbb67477ef8885fd6..ecf2f6705d65055e77e77c84294630a9dfa0d5ed 100755 (executable)
--- a/rip_dvd
+++ b/rip_dvd
@@ -3,7 +3,7 @@
 # Author: Alan J. Pippin (apippin@pippins.net)
 # Date: 05/17/2009
 #
-  REV=2.0
+  REV=2.2
 #
 # Description: This script wraps a number of linux utilities to
 # create a recipe for ripping protected DVDs, circumventing 
@@ -475,6 +475,7 @@ function encode_vob_file_handbrake {
   typeset filetype=""
   typeset handbrake_audio_opts=""
   typeset hb_profile=""
+  typeset SIZE=""
 
   # Set a variable that we will use later to determine if we found a handler for $profile or not
   typeset -i found_profile=0    
@@ -487,6 +488,10 @@ function encode_vob_file_handbrake {
   # Set our DRC option
   DRC="-D $drc"
 
+  if [ $target_size -ne 0 ]; then
+    SIZE="-S $target_size"
+  fi 
+
   # Check the global force_onepass_mode. If it is set, change our variables appropriately
   # to force 1-pass encoding across all profiles.
   if [ $force_onepass_mode -eq 1 ]; then
@@ -647,6 +652,7 @@ function encode_vob_file_handbrake {
   handbrake_cmd_line_opts="$handbrake_cmd_line_opts $PASSES"
   handbrake_cmd_line_opts="$handbrake_cmd_line_opts $DRC"
   handbrake_cmd_line_opts="$handbrake_cmd_line_opts $SCALE"
+  handbrake_cmd_line_opts="$handbrake_cmd_line_opts $SIZE"
 
   # Execute the handbrake command to encode the video
   if [ -n "$hb_profile" ]; then