Changed hdtv profile to xvid. Made this the default profile.

Added new profiles: mp4, mp4hq, mp4vhq

diff --git a/README b/README
index 33f8b10b19c00cd634abba97b58302dd9d38a146..8fb2589e2a629e0319f8814871d7145416f51cb8 100644 (file)
--- a/README
+++ b/README
@@ -59,13 +59,13 @@ I choose to place it on the optical menu.
 COMMAND LINE EXAMPLES
 ----------------------------------------------
 
-Rip a DVD into a compressed AVI file with default hdtv profile:
+Rip a DVD into a compressed AVI file with default xvid profile:
 > rip_dvd -d /path/to/dest/dir -b 2000 -x
 
-Rip a DVD into a compressed AVI file with default hdtv profile scaling to 320x240 compressed video size:
+Rip a DVD into a compressed AVI file with default xvid profile scaling to 320x240 compressed video size:
 > rip_dvd -d /path/to/dest/dir -b 2000 -x -a 320:240
 
-Rip a DVD into a compressed AVI file with default hdtv profile targetting a certain compressed video filesize (in MB):
+Rip a DVD into a compressed AVI file with default xvid profile targetting a certain compressed video filesize (in MB):
 > rip_dvd -d /path/to/dest/dir -b 2000 -x -s 650
 
 Rip a DVD into a VOB file:
@@ -90,6 +90,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 -x -p ipod -n /path/to/dest/dir/$dvdname.VOB
-> rip_dvd -d /path/to/dest/dir/hdtv -b 2000 -x -p hdtv -n /path/to/dest/dir/$dvdname.VOB
+> rip_dvd -d /path/to/dest/dir/xvid -b 2000 -x -p xvid -n /path/to/dest/dir/$dvdname.VOB
 > rm /path/to/dest/dir/$dvdname.VOB
 

diff --git a/rip_dvd b/rip_dvd
index b11c77d7b60656e0a42c86d83223ac3e55aea916..39d35b52a032b8f32e78eea043253be3e0f6f180 100755 (executable)
--- a/rip_dvd
+++ b/rip_dvd
@@ -49,7 +49,7 @@ typeset dvdpath=""
 typeset aspect=""
 typeset SCALE=""
 typeset CROP=""
-typeset profile="hdtv"
+typeset profile="xvid"
 typeset extension=""
 typeset -i keep_isofile=0
 typeset -i keep_vobfile=0
@@ -108,10 +108,13 @@ 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 "                 - hdtv = AVI, Xvid codec, 2 pass encoding (default)"
+    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 "   -e <ext>      Specify a suffix extension to apply to the end of the final image filename (like .hdtv, .ipod, etc)"
+    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"
     echo >&2 "                 The default operation is non-mirror mode where only the main"
@@ -810,7 +813,7 @@ function check_for_mplayer_dumpstream_incompatibility {
 function compress_vob_file {
   typeset -i found_profile=0
    
-  if [ "$profile" == "hdtv" ]; then
+  if [ "$profile" == "xvid" ]; then
     # DIVX 2 pass encoding
     found_profile=1
     final_output_file="$dest/$dvdname.avi"
@@ -844,6 +847,71 @@ function compress_vob_file {
  
   fi
 
+  if [ "$profile" == "mp4" ] || [ "$profile" == "mp4hq" ] || [ "$profile" == "mp4vhq" ]; then
+
+    final_output_file="$dest/$dvdname.mp4"
+    mencoder_general_opts="-quiet $lang_opts -passlogfile $passlogfile"
+    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"
+
+    # Very High Quality (6fps)
+    if [ "$profile" == "mp4vhq" ]; then
+      video_encoder_opts[0]="bitrate=$target_bitrate"
+      video_encoder_opts[1]="threads=$mencoder_threads"
+      video_encoder_opts[2]="subq=6"
+      video_encoder_opts[3]="frameref=5"
+      video_encoder_opts[4]="bframes=3"
+      video_encoder_opts[5]="8x8dct"
+      video_encoder_opts[6]="me=umh"
+      video_encoder_opts[7]="b_pyramid"
+      video_encoder_opts[8]="weight_b"
+      video_encoder_opts[9]="partitions=all" 
+    fi
+    # High Quality (13fps)
+    if [ "$profile" == "mp4hq" ]; then
+      video_encoder_opts[0]="bitrate=$target_bitrate"
+      video_encoder_opts[1]="threads=$mencoder_threads"
+      video_encoder_opts[2]="subq=5"
+      video_encoder_opts[3]="frameref=2"
+      video_encoder_opts[4]="bframes=3"
+      video_encoder_opts[5]="8x8dct"
+      video_encoder_opts[6]="b_pyramid"
+      video_encoder_opts[7]="weight_b"
+    fi
+    # Fast
+    if [ "$profile" == "mp4hq" ]; then
+      video_encoder_opts[0]="bitrate=$target_bitrate"
+      video_encoder_opts[1]="threads=$mencoder_threads"
+      video_encoder_opts[2]="subq=4"
+      video_encoder_opts[3]="bframes=2"
+      video_encoder_opts[4]="b_pyramid"
+      video_encoder_opts[5]="weight_b"
+    fi
+
+    for OPTS in "${video_encoder_opts[@]}"; do
+      mencoder_video_encoder_opts="$mencoder_video_encoder_opts:$OPTS"
+    done
+
+    if [ $audio_2ch -eq 0 ]; then
+      # These options produce good 6 channel audio for linux and windows
+      #mencoder_audio_opts="-oac copy"
+      # There are 3 different ways to specify 6 channel encoding. We'll try the other ones in order if one of them fails.
+      #mencoder_audioch_opts[0]="-channels 6 -af channels=6"
+      #mencoder_audioch_opts[1]="-af channels=6"
+      #mencoder_audioch_opts[2]=""
+      mencoder_audio_opts="-oac faac -faacopts mpeg=4:object=2:br=$audio_bitrate:raw"
+      mencoder_audioch_opts[0]="-channels 6 -srate 48000"
+    else
+      # These options produce good 2 channel audio for linux and windows (including the internal mythvideo player)
+      #mencoder_audio_opts="-oac mp3lame -lameopts cbr:br=$audio_bitrate"
+      #mencoder_audioch_opts[0]=""
+      mencoder_audio_opts="-oac faac -faacopts mpeg=4:object=2:br=$audio_bitrate:raw"
+      mencoder_audioch_opts[0]="-channels 2 -srate 48000"
+    fi
+
+  fi
+
   if [ "$profile" == "iphone" ] || [ "$profile" == "ipod" ]; then
     # MP4 encoding 
     found_profile=1