X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=rip_dvd;h=b83e060122f2fdc50bf7e6a187a1c4eadc3a1e47;hb=1326f3fcfd3d0888e6a6f0dfda7cf526cd66aadf;hp=44d700080975bbc626bc486e9f47738ad5afbaed;hpb=aa526a7bbd385ca4ac9254cdcb8ac2dd4fa67ef7;p=rip_dvd%2F.git

diff --git a/rip_dvd b/rip_dvd
index 44d7000..b83e060 100755
--- 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,9 +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 "                 - ipod = MP4, x264 codec, 2 pass encoding, 576:320 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 "                 - 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 .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"
@@ -179,7 +183,7 @@ if [ "$aspect" != "" ]; then
   fi
   echo "$aspect" | grep -q ":"
   if [ $? != 0 ]; then
-    SCALE=",scale -zoom -xy $aspect"
+    SCALE=",scale -zoom -sws 9 -xy $aspect"
   else
     SCALE=",scale=$aspect"
   fi
@@ -809,8 +813,8 @@ function check_for_mplayer_dumpstream_incompatibility {
 function compress_vob_file {
   typeset -i found_profile=0
    
-  if [ "$profile" == "hdtv" ]; then
-    # DIVX 2 pass encoding
+  # XVID profile
+  if [ "$profile" == "xvid" ]; then
     found_profile=1
     final_output_file="$dest/$dvdname.avi"
     mencoder_general_opts="-quiet $lang_opts -passlogfile $passlogfile"
@@ -843,10 +847,88 @@ function compress_vob_file {
  
   fi
 
-  if [ "$profile" == "ipod" ]; then
-    # MP4 encoding 
+  # MP4 encoding profiles
+  if [ "$profile" == "mp4" ] || [ "$profile" == "mp4hq" ] || [ "$profile" == "mp4vhq" ]; then
     found_profile=1
-    SCALE=",scale=576:320"
+    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
+
+  # iphone and ipod MP4 profiles
+  if [ "$profile" == "iphone" ] || [ "$profile" == "ipod" ]; then
+    found_profile=1
+    if [ "$profile" == "iphone" ]; then
+      # SCALE: 480x320
+      # scale width to 480, set height appropriately, but keep a multiple of 16
+      #SCALE=",scale=480:-10"
+      # scale the video down however far is necessary to fit in 480x320
+      SCALE=",dsize=480:320:0,scale=-8:-8"
+    else
+      # SCALE: 320x240
+      # scale width to 320, set height appropriately, but keep a multiple of 16
+      #SCALE=",scale=320:-10"
+      # scale the video down however far is necessary to fit in 320x240
+      SCALE=",dsize=320:240:0,scale=-8:-8"
+    fi
     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"
@@ -863,6 +945,8 @@ function compress_vob_file {
     video_encoder_opts[8]="trellis=1"
     video_encoder_opts[9]="level_idc=30"
     video_encoder_opts[10]="global_header"
+    video_encoder_opts[11]="bframes=0"
+    video_encoder_opts[12]="partitions=all"
     for OPTS in "${video_encoder_opts[@]}"; do 
       mencoder_video_encoder_opts="$mencoder_video_encoder_opts:$OPTS"
     done