X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=rip_dvd;h=ce9f0c767502a92f75f46635467bf8d6d9d8c1be;hb=a765eff91d0c9e94cc24fe73f1f6fbd0b9034448;hp=601bde74399fc2cef1c8ac44a961dd94c14db876;hpb=1016cc3b78dac3e5c8b5a7faa7b74d17652d661a;p=rip_dvd%2F.git

diff --git a/rip_dvd b/rip_dvd
index 601bde7..ce9f0c7 100755
--- a/rip_dvd
+++ b/rip_dvd
@@ -38,7 +38,7 @@ typeset dvdpath=""
 typeset aspect=""
 typeset SCALE=""
 typeset CROP=""
-typeset profile="xvidvhq"
+typeset profile="xvidhq"
 typeset extension=""
 typeset mailto=""
 typeset encoder=""
@@ -146,8 +146,8 @@ function usage() {
     echo >&2 "                 5) If dvdname is a full path to a VOB 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 "                 Mencoder and Handbrake Encoder Profiles:"
-    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 "                 - xvidvhq = AVI, very high quality encoding, Xvid codec, 2 pass encoding"
+    echo >&2 "                 - xvidhq = AVI, high quality encoding, Xvid codec, 2 pass encoding (default)"
     echo >&2 "                 - xvid = AVI, fast encoding, Xvid 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"
@@ -166,7 +166,7 @@ function usage() {
     echo >&2 "   -f            Make the final image a DVD folder"
     echo >&2 "   -z            Make the final image a compressed file based on your profile selection and encoder"
     echo >&2 "   -e <encoder>  Specify the encoder to use to make the compressed file (valid encoders=mencoder|handbrake) (default=handbrake if found)"
-    echo >&2 "                 You must also specify the target size or bitrate using the '-s' or '-b' options"
+    echo >&2 "                 You must also specify the target size or bitrate using the '-s' or '-b' options with xvid profiles"
     echo >&2 "   -s <size>     Set the target size of the compressed file in MB (ex: 700, 1000, etc)"
     echo >&2 "   -b <bitrate>  Set the bitrate desired in the compressed file in kbits/sec (ex: 1500, 2000 (default), etc)"    
     echo >&2 "   -a <W:H>      Specify the width x height aspect ratio to scale the DVD to (only used in -x mode)"
@@ -230,6 +230,7 @@ if [ -z "$encoder" ]; then
   encoder="mencoder"; # If we can't find handbrake, set mencoder as the default
   [[ -x `which $handbrake_xvid` ]] && [[ "$profile" =~ "xvid" ]] && encoder="handbrake";
   [[ -x `which $handbrake_mp4` ]] && [[ "$profile" =~ "mp4" ]] && encoder="handbrake";
+  [[ -x `which $handbrake_mp4` ]] && [[ "$profile" =~ "ip" ]] && encoder="handbrake";
   [[ -x `which $handbrake_mp4` ]] && [[ "$profile" =~ "hb" ]] && encoder="handbrake";
 fi
 
@@ -269,6 +270,7 @@ fi
 [[ ! -x `which mkisofs` ]] && echo "-E- missing dependency: mkisofs" && exit
 [[ "$encoder" == "handbrake" ]] && [[ "$profile" =~ "xvid" ]] && [[ ! -x `which $handbrake_xvid` ]] && echo "-E- missing encoder: $handbrake_xvid" && exit
 [[ "$encoder" == "handbrake" ]] && [[ "$profile" =~ "mp4" ]] && [[ ! -x `which $handbrake_mp4` ]] && echo "-E- missing encoder: $handbrake_mp4" && exit
+[[ "$encoder" == "handbrake" ]] && [[ "$profile" =~ "ip" ]] && [[ ! -x `which $handbrake_mp4` ]] && echo "-E- missing encoder: $handbrake_mp4" && exit
 [[ "$encoder" == "handbrake" ]] && [[ "$profile" =~ "hb" ]] && [[ ! -x `which $handbrake_mp4` ]] && echo "-E- missing encoder: $handbrake_mp4" && exit
 [[ "$encoder" == "handbrake" ]] && [[ ! -x `which ffmpeg` ]] && echo "-E- missing dependency: ffmpeg" && exit
 
@@ -475,8 +477,8 @@ function encode_vob_file_handbrake {
     PASSES=""
   fi
 
-  # get our audio track from the VOB file
-  get_audio_track_from_vob "$vobfile"
+  # get our audio track from the VOB file (requires mp4 version of handbrake to extract)
+  get_audio_track_from_vob "$vobfile" "$handbrake_mp4"
 
   # XVID profile
   if [[ "$profile" =~ "xvid" ]]; then
@@ -489,7 +491,7 @@ function encode_vob_file_handbrake {
     if [ "$profile" == "xvidvhq" ]; then
       handbrake_opts[0]="-f avi"
       handbrake_opts[1]="-b $target_bitrate"
-      handbrake_opts[2]="-e ffmpeg"
+      handbrake_opts[2]="-e xvid"
       handbrake_opts[3]="-T"
       handbrake_opts[4]="-5"
       handbrake_opts[5]="-8"
@@ -567,10 +569,10 @@ function encode_vob_file_handbrake {
 
   # setup our audio option
   if [ $audio_2ch -eq 1 ] && [ $audio_6ch -eq 1 ]; then
-    handbrake_audio_opts="-E faac,ac3 -6 dpl2,none"
+    handbrake_audio_opts="-E faac,ac3 -6 dpl2,auto"
   fi
   if [ $audio_6ch -eq 1 ] && [ $audio_2ch -eq 0 ]; then
-    handbrake_audio_opts="-E ac3 -6 none"
+    handbrake_audio_opts="-E ac3 -6 auto"
   fi
   if [ $audio_2ch -eq 1 ] && [ $audio_6ch -eq 0 ]; then
     handbrake_audio_opts="-E faac -6 dpl2"
@@ -605,7 +607,7 @@ function encode_vob_file_handbrake {
   fi
 
   # Concatenate the encode log to our main log file, greping out unwanted lines
-  cat $encodelog | grep -v "Encoding" >> "$logfile" 
+  cat $encodelog | grep -v "Encoding:" | grep -v "hb_demux_ps" >> "$logfile" 
   cat $encodelog | grep "Encoding:" | sed 's/
/\n/g' | grep "Encoding:" | grep "ETA" | head -1 >> "$logfile"
   cat $encodelog | grep "Encoding:" | sed 's/
/\n/g' | grep "Encoding:" | grep "ETA" | tail -1 >> "$logfile"
 }
@@ -1010,6 +1012,7 @@ function get_audio_track_from_vob {
   # Adjust our audio ID to find the english audio stream
   # This should be 128. However, if 128 is not there, pick the next one that incrementally is.
   vob="$1"
+  handbrake_cli="$2"
   aidcheck=`tempfile`
   aid=$default_aid
   alang=$default_alang
@@ -1030,13 +1033,16 @@ function get_audio_track_from_vob {
   aid_hex=`echo "obase=16; $aid" | bc`
   
   # extract the audio streams in the vob
-  ffmpeg -i "$vob" > $aidcheck 2>&1
+  #ffmpeg -i "$vob" > $aidcheck 2>&1
+  $handbrake_cli --stop-at 0 -i "$vob" -o /dev/null -v 100 > $aidcheck 2>&1
   
   # find the stream that matches our aid
-  stream=`grep "Stream.*\[0x$aid_hex\]" $aidcheck`
+  #stream=`grep "Stream.*\[0x$aid_hex\]" $aidcheck`
+  stream=`grep "scan: audio" $aidcheck | grep -n "" | grep "scan: audio 0x$aid_hex"`
  
   # extract the track number that handbrake uses
-  track=`expr match "$stream" '.*#[0-9]\.\([0-9]*\)'`
+  #track=`expr match "$stream" '.*#[0-9]\.\([0-9]*\)'`
+  track=`expr match "$stream" '^\([0-9]*\):'`
 
   if [ -n "$track" ]; then   
     echo "-> Setting the audio ID to $aid. Setting the audio track to $track." | tee -a "$logfile"