Added new -j eject option. You can now tell it when you want it to eject the disk.

Added new -1 option that forces 1 pass encoding mode across all profiles.

diff --git a/rip_dvd b/rip_dvd
index 6ab57cac29e026d87cd25c2dac70212a7d073749..da6b81fa98649b0004eb8125298bab6d3ffb6b45 100755 (executable)
--- a/rip_dvd
+++ b/rip_dvd
@@ -51,6 +51,8 @@ typeset SCALE=""
 typeset CROP=""
 typeset profile="xvidvhq"
 typeset extension=""
+typeset -i force_onepass_mode=0
+typeset -i eject_disk=1
 typeset -i keep_isofile=0
 typeset -i keep_vobfile=0
 typeset -i keep_dvdfolder=0
@@ -62,14 +64,14 @@ typeset -i make_final_dest_comp=0
 typeset -i errors=0
 typeset -i show_usage=0
 typeset -i mirror_mode=0
-typeset -i target_bitrate=0
+typeset -i target_bitrate=2000
 typeset -i target_size=0
 typeset -i audio_2ch=0
 typeset -i invalid_feature_title=0
 typeset -i feature_title_override=0
 typeset -i mplayer_dumpstream_incompatibility=0
 
-while (($#)) && getopts 2mvifkxht:n:d:b:s:t:a:p:e: opt "$@"
+while (($#)) && getopts 12mvifkxht:n:d:b:s:t:a:p:e:j: opt "$@"
 do
     case $opt in
         (n)     dvdname=$OPTARG;;
@@ -77,6 +79,7 @@ do
         (b)     target_bitrate=$OPTARG;;
        (s)     target_size=$OPTARG;;
         (2)     audio_2ch=1;;
+        (1)     force_onepass_mode=1;;
         (v)     make_final_dest_vob=1;;
         (i)     make_final_dest_iso=1;;
         (f)     make_final_dest_folder=1;; 
@@ -87,6 +90,7 @@ do
        (a)     aspect=$OPTARG;;
        (p)     profile=$OPTARG;;
        (e)     extension=$OPTARG;;
+       (j)     eject_disk=$OPTARG;;
         (w)     set -$opt;;
         (h)     show_usage=1;;
         (:)     echo >&2 "$0: $OPTARG requires a value"; errors=errors+1;;
@@ -131,6 +135,12 @@ function usage() {
     echo >&2 "   -a <W:H>      Specify the width x height aspect ratio to scale the DVD to (only used in -x mode)"
     echo >&2 "      <W>        If only the width is given, it will autoset the height to a value which preserves the aspect ratio"
     echo >&2 "                 The default behavior is autoaspect mode, which preserves the original aspect, with no scaling being done"
+    echo >&2 "   -j <n>        Eject the disk:"
+    echo >&2 "                 - 0 = do not eject the disk"
+    echo >&2 "                 - 1 = eject after the entire script is done (default)"
+    echo >&2 "                 - 2 = eject after the disk is no longer needed (prior to starting the encode process)"
+    echo >&2 "                 The last option will allow you to start ripping another disk while the encoding process is running on a previous"
+    echo >&2 "   -1            Force 1-pass encoding mode across all profiles"
     echo >&2 "   -2            Use 2 channel MP3 audio encoding when making a compressed file (default is 6 channel AC3)"
     echo >&2 "   -k            Keep the intermediate files (good for debugging)"
     echo >&2 "                 In -x mode, run with this option to keep the original .VOB file"
@@ -152,8 +162,8 @@ if [ "$dest" == "" ]; then
   usage
 fi
 
-if ([ $target_bitrate -ne 0 ] || [ $target_size -ne 0 ] || [ "$aspect" != "" ]) && [ $make_final_dest_comp -ne 1 ]; then
-  echo "-E- You can't specify a bitrate, target_size, or aspect in non compressed file mode. You must specify '-x' when using '-b' or '-s' or '-a'" | tee -a $logfile
+if ([ $target_size -ne 0 ] || [ "$aspect" != "" ]) && [ $make_final_dest_comp -ne 1 ]; then
+  echo "-E- You can't specify a target_size, or aspect in non compressed file mode. You must specify '-x' when using '-b' or '-s' or '-a'" | tee -a $logfile
   usage
 fi
 
@@ -267,6 +277,8 @@ else
     fi
   fi
   ripdvd=0
+  # Since we aren't ripping a DVD disk, don't eject anything
+  eject_disk=0
 fi
 
 # remove bad characters from the dvdname
@@ -357,16 +369,35 @@ trap cleanup EXIT
 
 # encode the vob file into a compressed file format
 function encode_vob_file {
+
+  # Set a variable that we will use later to determine if we found a handler for $profile or not
   typeset -i found_profile=0
-   
+
+  # For a given profile, to override the 2 pass behavior to be single pass,
+  # simply set the PASSES variable below to "2" instead of "1 2" inside your profile handler. 
+  # It indicates which PASS numbers to loop over. PASSES="2" means just do pass 2 => single pass mode.
+  PASSES="1 2"
+
+  # Declare our default 2 pass variables
+  passlogfile_opt="-passlogfile $passlogfile"
+  pass_opt="pass=%PASS"
+
+  # Check the 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
+    PASSES="2"
+    passlogfile_opt=""
+    pass_opt=""    
+  fi
+
   # XVID profile
   if [ "$profile" == "xvid" ] || [ "$profile" == "xvidhq" ] || [ "$profile" == "xvidvhq" ]; then
     found_profile=1
     final_output_file="$dest/$dvdname.avi"
-    mencoder_general_opts="-quiet $lang_opts -passlogfile $passlogfile"
+    mencoder_general_opts="-quiet $lang_opts $passlogfile_opt"
     mencoder_output_opts="-ofps 30000/1001 -ffourcc DIVX"
     mencoder_video_filter_opts="-vf pullup,softskip,hqdn3d=2:1:2$CROP$SCALE"
-    mencoder_video_encoder_opts="-ovc xvid -xvidencopts pass=%PASS"
+    mencoder_video_encoder_opts="-ovc xvid -xvidencopts $pass_opt"
 
     # Very High Quality (16fps)
     if [ "$profile" == "xvidvhq" ]; then
@@ -420,10 +451,10 @@ function encode_vob_file {
   if [ "$profile" == "mp4" ] || [ "$profile" == "mp4hq" ] || [ "$profile" == "mp4vhq" ]; then
     found_profile=1
     final_output_file="$dest/$dvdname.mp4"
-    mencoder_general_opts="-quiet $lang_opts -passlogfile $passlogfile"
+    mencoder_general_opts="-quiet $lang_opts $passlogfile_opt"
     mencoder_output_opts="-ofps 30000/1001 -sws 9 -of lavf -lavfopts format=mp4"
     mencoder_video_filter_opts="-vf harddup$CROP$SCALE";
-    mencoder_video_encoder_opts="-ovc x264 -x264encopts pass=%PASS"
+    mencoder_video_encoder_opts="-ovc x264 -x264encopts $pass_opt"
 
     # Very High Quality (6fps)
     if [ "$profile" == "mp4vhq" ]; then
@@ -499,10 +530,10 @@ function encode_vob_file {
       SCALE=",dsize=320:240:0,scale=-8:-8"
     fi
     final_output_file="$dest/$dvdname.mp4"
-    mencoder_general_opts="-quiet $lang_opts -passlogfile $passlogfile"
+    mencoder_general_opts="-quiet $lang_opts $passlogfile_opt"
     mencoder_output_opts="-ofps 30000/1001 -sws 9 -of lavf -lavfopts format=mp4"
     mencoder_video_filter_opts="-vf harddup$CROP$SCALE";
-    mencoder_video_encoder_opts="-ovc x264 -x264encopts pass=%PASS"
+    mencoder_video_encoder_opts="-ovc x264 -x264encopts $pass_opt"
     video_encoder_opts[0]="bitrate=$target_bitrate"
     video_encoder_opts[1]="threads=$mencoder_threads"
     video_encoder_opts[2]="vbv_maxrate=1500"
@@ -532,7 +563,7 @@ function encode_vob_file {
   mencoder_opts="$mencoder_general_opts $mencoder_output_opts $mencoder_audio_opts $mencoder_video_filter_opts $mencoder_video_encoder_opts"
   mencoder_retval=0
 
-  for PASS in 1 2 
+  for PASS in $PASSES
   do 
     # Set some options based on which pass we are in
     mencoder_opts_for_pass=$(echo "$mencoder_opts" | sed "s,%PASS,$PASS,g")
@@ -1095,7 +1126,9 @@ if [ $mirror_mode -eq 1 ]; then
   fill_mythvideo_metadata "$dest/$dvdname.iso" 
 
   # eject the disk upon completion
-  eject -T $dev
+  if [ $eject_disk -ne 0 ]; then
+    eject -T $dev
+  fi
 
   date=`date`
   echo "$date DVD rip completed" | tee -a "$logfile"
@@ -1198,6 +1231,9 @@ if [ $mirror_mode -eq 0 ]; then
       get_crop_from_vob
     fi
 
+    # eject the DVD disk since we are finished with it
+    [ $eject_disk -eq 2 ] && eject -T $dev
+
     # encode the VOB file to a compressed file format
     if [ $make_final_dest_comp -eq 1 ]; then
       echo "-> Encoding the DVD video to a compressed file" | tee -a "$logfile"
@@ -1277,7 +1313,7 @@ if [ $mirror_mode -eq 0 ]; then
   remove_intermediate_dvdbackup_folder
 
   # eject the DVD disk upon completion
-  [ $ripdvd -eq 1 ] && eject -T $dev
+  [ $eject_disk -eq 1 ] && eject -T $dev
 
   date=`date`
   echo "$date DVD rip completed" | tee -a "$logfile"