Fixed default threads option (from 8 to 2 since 2 is faster than 8)

[rip_dvd/.git] / rip_dvd

diff --git a/rip_dvd b/rip_dvd
index 1b3fec5840f85005ce9650404c89da00be0eed56..6ab57cac29e026d87cd25c2dac70212a7d073749 100755 (executable)
--- a/rip_dvd
+++ b/rip_dvd
@@ -49,7 +49,7 @@ typeset dvdpath=""
 typeset aspect=""
 typeset SCALE=""
 typeset CROP=""
-typeset profile="xvid"
+typeset profile="xvidvhq"
 typeset extension=""
 typeset -i keep_isofile=0
 typeset -i keep_vobfile=0
@@ -108,12 +108,14 @@ function usage() {
     echo >&2 "                 4) If dvdname is a full path to an MPG2 file, it will be ripped as a DVD instead of $dev"
     echo >&2 "                 5) If dvdname is a full path to an ISO file, it will be ripped as a DVD instead of $dev"
     echo >&2 "   -p <profile>  Specify which encoding profile to use in -x mode as shown below:"
-    echo >&2 "                 - xvid = AVI, Xvid codec, 2 pass encoding, original aspect, no scaling (default)"
-    echo >&2 "                 - mp4vhq = MP4, very high quality encoding, x264 codec, 2 pass encoding, original aspect, no scaling"
-    echo >&2 "                 - mp4hq = MP4, high quality encoding, x264 codec, 2 pass encoding, original aspect, no scaling"
-    echo >&2 "                 - mp4 = MP4, fast encoding, x264 codec, 2 pass encoding, original aspect, no scaling"
-    echo >&2 "                 - iphone = MP4, x264 codec, 2 pass encoding, 480:320 scaling"
-    echo >&2 "                 - ipod = MP4, x264 codec, 2 pass encoding, 320:240 scaling"
+    echo >&2 "                 - xvidvhq = AVI, very high quality encoding, Xvid codec, 2 pass encoding (default)"
+    echo >&2 "                 - xvidhq = AVI, high quality encoding, Xvid codec, 2 pass encoding"
+    echo >&2 "                 - xvid = AVI, fast encoding, Xvid codec, 2 pass encoding"
+    echo >&2 "                 - mp4vhq = MP4, very high quality encoding, x264 codec, 2 pass encoding"
+    echo >&2 "                 - mp4hq = MP4, high quality encoding, x264 codec, 2 pass encoding"
+    echo >&2 "                 - mp4 = MP4, fast encoding, x264 codec, 2 pass encoding"
+    echo >&2 "                 - iphone = MP4, x264 codec, 2 pass encoding, forced 480:320 scaling"
+    echo >&2 "                 - ipod = MP4, x264 codec, 2 pass encoding, forced 320:240 scaling"
     echo >&2 "   -e <ext>      Specify a suffix extension to apply to the end of the final image filename (like .xvid, .ipod, etc)"
     echo >&2 "                 If you run multiple instances of this script ripping the same DVD, you need to specify this option."
     echo >&2 "   -m            Make a mirror image of the DVD and save it as a DVD ISO file"
@@ -248,7 +250,7 @@ else
 
     # check to see if dvdname is a full path to an ISO file
     # if it is, set dvdname and isofile appropriately
-    file "$dvdname" | grep -q "ISO"
+    file "$dvdname" | grep -q -e "ISO" -e "UDF"
     if [ $? == 0 ]; then
       # It is a valid ISO file, now strip the extension off our dvdname
       isofile="$dvdname"
@@ -341,6 +343,7 @@ fatal_and_exit() {
   if [[ -n "$mailto" ]]; then
     echo -e "$msg" | mailx -s "dvd rip of $dvdname FAILED" "$mailto"
   fi
+  keep_intermediate_files=1
   exit 1
 }
 
@@ -357,20 +360,43 @@ function encode_vob_file {
   typeset -i found_profile=0
    
   # XVID profile
-  if [ "$profile" == "xvid" ]; then
+  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_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"
-    video_encoder_opts[0]="bitrate=$target_bitrate"
-    video_encoder_opts[1]="threads=$mencoder_threads"
-    video_encoder_opts[2]="chroma_opt"
-    video_encoder_opts[3]="vhq=4"
-    video_encoder_opts[4]="bvhq=1"
-    video_encoder_opts[5]="quant_type=mpeg"
-    video_encoder_opts[6]="autoaspect"
+
+    # Very High Quality (16fps)
+    if [ "$profile" == "xvidvhq" ]; then
+      video_encoder_opts[0]="bitrate=$target_bitrate"
+      video_encoder_opts[1]="threads=$mencoder_threads"
+      video_encoder_opts[2]="chroma_opt"
+      video_encoder_opts[3]="vhq=4"
+      video_encoder_opts[4]="bvhq=1"
+      video_encoder_opts[5]="quant_type=mpeg"
+      video_encoder_opts[6]="autoaspect"
+    fi
+    # High Quality (20fps)
+    if [ "$profile" == "xvidhq" ]; then
+      video_encoder_opts[0]="bitrate=$target_bitrate"
+      video_encoder_opts[1]="threads=$mencoder_threads"
+      video_encoder_opts[2]="chroma_opt"
+      video_encoder_opts[3]="vhq=2"
+      video_encoder_opts[4]="bvhq=1"
+      video_encoder_opts[5]="quant_type=mpeg"
+      video_encoder_opts[6]="autoaspect"
+    fi
+    # Fast (28fps)
+    if [ "$profile" == "xvid" ]; then
+      video_encoder_opts[0]="bitrate=$target_bitrate"
+      video_encoder_opts[1]="threads=$mencoder_threads"
+      video_encoder_opts[2]="vhq=0"
+      video_encoder_opts[3]="turbo"
+      video_encoder_opts[4]="autoaspect"
+    fi
+
     for OPTS in "${video_encoder_opts[@]}"; do 
       mencoder_video_encoder_opts="$mencoder_video_encoder_opts:$OPTS"
     done
@@ -731,7 +757,8 @@ function get_crop_from_iso {
   CROPCHECK=`echo "$CROP" | awk -F ':' '{ print $1 }'`
   echo "   Final crop value of $CROP with cropcheck value of $CROPCHECK" >> "$logfile"
   if [ -z "$CROP" ]; then
-    fatal_and_exit "-E- Unable to extract CROP value from iso: $isofile"
+    echo "-W- Unable to extract CROP value from iso: $isofile" | tee -a "$logfile"
+    return
   fi
   if [ $CROPCHECK -lt 0 ]; then 
     CROP=""
@@ -755,7 +782,8 @@ function get_crop_from_vob {
   CROPCHECK=`echo "$CROP" | awk -F ':' '{ print $1 }'`
   echo "   Final crop value of $CROP with cropcheck value of $CROPCHECK" >> "$logfile"
   if [ -z "$CROP" ]; then
-    fatal_and_exit "-E- Unable to extract CROP value from iso: $isofile"
+    echo "-W- Unable to extract CROP value from iso: $isofile" | tee -a "$logfile"
+    return
   fi
   if [ $CROPCHECK -lt 0 ]; then 
     CROP=""