X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=rip_dvd;h=3e6d5059b9cf910df259fccf5ce72413c944993d;hb=a0392e5f7d75539a0a6831d88fda15c821507dae;hp=4d3d08acb87e0a32999bce3aa5de511a1cb8aa46;hpb=b2055077d5762068e961ae88907470bfa31b73c8;p=rip_dvd%2F.git

diff --git a/rip_dvd b/rip_dvd
index 4d3d08a..3e6d505 100755
--- a/rip_dvd
+++ b/rip_dvd
@@ -15,52 +15,27 @@
 # Known Issues/Limitations:
 # - Mirror mode is always done in ISO mode
 #
-# Package Dependencies:
-# lsdvd dvdauthor gddrescue dvdbackup makexml tovid mencoder vlc mplayer genisoimage
+# Package Dependencies (apt-get install these for example):
+# lsdvd dvdauthor gddrescue dvdbackup tovid mencoder mplayer genisoimage libdvdcss2
+#
+# Specific Executable (program) Dependencies (must be found in $PATH):
+# volname makexml lsdvd dvdauthor gddrescue dvdbackup mencoder mplayer mkisofs
 #
 # Optional Dependencies:
 # lookup imdb info/posters for mythvideo: http://www.mythtv.org/wiki/Fill_mythvideo_metadata.pl
 #
 
-###############################################
-# Local Machine Settings - EDIT THIS SECTION
-
-# Specify the device path to the DVD drive
-dev=/dev/dvd2
-
-# Specify the path to the log directory 
-logdir=/var/log/ripdvd
-
-# Specify the path to the tmp rip directory
-tmpdir=/myth/video/DVDs/.ripdvd
-
-# Specify the email address to send job notifications to
-mailto=ajp@pippins.net
-
-# Setup the path to the tools needed by this ripper
-PATH=/etc/mythtv/bin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:.:$PATH
-
-# Use mplayer dumpstream to create the main VOB file
-# If set to 0, cat and other utils will be used to make it instead.
-# Using mplayer dumpstream is by far the best way to create the main VOB file
-# The only thing this doesn't work for are DVDs with the 99 title copy protection.
-# The script will autodetect these types of disks, and change this to 0 if necessary.
-# If this is set to 0, other methods will be employed to get the DVD VOB dump.
-use_mplayer_dumpstream=1
-
-# 2-channel AVI encoding audio bit rate
-audio_bitrate=224
-
-# If set to 1, this script will call another script to fill in the mythvideo metadata
-# If you don't use mythtv, set this option to 0. If you use mythtv, and have downloaded
-# the fill_mythvideo_metadata.pl script shown above, you can leave this option set to 1.
-fill_mythvideo_metadata=1
-
-# If the 99 titleset copy protection scheme is detected, trust the autodetection or abort.
-# The autodetection may work, but it probably won't in this case. Set to 0 by default. 
-# Override to 1 if you want the script to wing it, and hope it picks the right feature title.
-# Otherwise, you will need to rerun the script providing the feature title with the -t option.
-trust_feature_title_autodetect_when_uncertain=0
+##############################################################################
+# Local Machine Settings:
+# Sources both the "default" conf file tracked by GIT (rip_dvd.conf.dist)
+# and the local conf file created by each local machine (rip_dvd.conf)
+# Copy the rip_dvd.conf.dist file to rip_dvd.conf and edit the later.
+# This will allow you to override all the default values to meet your needs
+# in a way that won't get clobbered when you pull updates from my GIT repo.
+##############################################################################
+config="${0%/*}/rip_dvd.conf"
+[ -e "${config}.dist" ] && . ${config}.dist
+[ -e "${config}" ] && . ${config}
 
 ###############################################
 # Command line processing
@@ -229,6 +204,12 @@ else
   ripdvd=0
 fi
 
+# remove bad characters from the dvdname
+dvdname=${dvdname%.} # remove trailing '.' character
+
+# make a "safe" dvdname (remove special characters)
+safedvdname=`basename "$dvdname" | sed 's/[ !&*\\$?]/_/g'`
+
 # Make sure we have a non-empty dvdname
 if [ -z "$dvdname" ]; then
   echo "-E- unable to determine dvdname"
@@ -240,9 +221,6 @@ if [ -z "$vobfile" ]; then
   vobfile="$dest/$dvdname.VOB"
 fi
 
-# make a "safe" dvdname (remove special characters)
-safedvdname=`basename "$dvdname" | sed 's/[ !&*\\$?]/_/g'`
-
 # set up some variables to hold various logfiles
 logfile="$logdir/$dvdname.log"
 passlogfile="$tmpdir/$safedvdname.log"
@@ -341,14 +319,24 @@ function make_dvd_iso_image_from_folder {
   echo "   mkisofs -dvd-video \"$src\" 2>> \"$dumplog\" | dd of=\"$dst\" obs=32k seek=0 > /dev/null 2>> $dumplog" >> "$logfile"
   mkisofs -dvd-video "$src" 2>> "$dumplog" | dd of="$dst" obs=32k seek=0 > /dev/null 2>> "$dumplog"
 
+  # set the audio languages from the iso if it exists and is non-zero in size
+  if [ -s "$dst" ]; then
+    get_feature_title "$dst"
+    get_audio_id_from_iso "$dst"
+  fi
+
   # make sure we were able to create the iso image from the folder given to us
-  if [ ! -s "$tmpdir/$dvdname.iso" ] && [ $handle_error -eq 1 ]; then
+  if [ ! -s "$dst" ] && [ $handle_error -eq 1 ]; then
     echo "-> Unable to make an iso image from the DVD folder: $dvdpath"
     echo "   Falling back to mplayer to create a main feature VOB from the folder instead: $dvdpath"
+    # remove the bad iso file
+    [[ -e "$dst" ]] && rm -f "$dst"
     # get the feature title from the DVD folder
     get_feature_title "$dvdpath"
     # create our main VOB file from the ISO
-    create_main_vob_with_mplayer "$dvdpath"
+    create_main_vob_with_mplayer "$dvdpath" 
+    # get our audio id from the VOB file
+    get_audio_id_from_vob "$vobfile"
   fi
 }
 
@@ -458,9 +446,10 @@ function create_main_vob_with_mplayer {
 function get_audio_id_from_iso {
   # 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.
+  iso="$1"
   aidcheck=`tempfile`
   aid=128
-  mplayer -v -endpos 0 -dvd-device "$isofile" dvd://$feature_title > $aidcheck 2>&1
+  mplayer -v -endpos 0 -dvd-device "$iso" dvd://$feature_title > $aidcheck 2>&1
   grep -q "aid: $aid" $aidcheck
   while [ $? == 1 ] && [ $aid -lt 159 ]; do
     (( aid = aid + 1 ))
@@ -499,9 +488,10 @@ function get_crop_from_iso {
 function get_audio_id_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"
   aidcheck=`tempfile`
   aid=128
-  mplayer -v -endpos 0 "$tmpdir/$dvdname.VOB" > $aidcheck 2>&1
+  mplayer -v -endpos 0 "$vob" > $aidcheck 2>&1
   grep -q "Found audio stream: $aid" $aidcheck
   while [ $? == 1 ] && [ $aid -lt 159 ]; do
     (( aid = aid + 1 ))
@@ -697,6 +687,7 @@ function check_for_mplayer_dumpstream_incompatibility {
       if [ $trust_feature_title_autodetect_when_uncertain -eq 0 ]; then
         echo "-E- Unable to determine the feature title due to the 99 title copy protection scheme" | tee -a "$logfile"
         echo "    You will need to determine this yourself and rerun the script with the -t option" | tee -a "$logfile"
+        echo "    You can google this DVD to find out what it's feature title is, or you can play it in a conventional DVD player to find it." | tee -a "$logfile"
         invalid_feature_title=1
       else 
         echo "    Falling back to non mplayer dumpstream methods to copy the DVD" | tee -a "$logfile"
@@ -843,7 +834,7 @@ if [ $mirror_mode -eq 0 ]; then
       if [ $use_mplayer_dumpstream -eq 1 ]; then 
 
         # get our audio id from the ISO file
-        get_audio_id_from_iso
+        get_audio_id_from_iso "$isofile"
 
         # create our main VOB file from the ISO
         create_main_vob_with_mplayer "$isofile"
@@ -866,7 +857,7 @@ if [ $mirror_mode -eq 0 ]; then
         create_main_vob_with_cat
 
         # get our audio id from the VOB file
-        get_audio_id_from_vob
+        get_audio_id_from_vob "$tmpdir/$dvdname.VOB"
   
         # check for corrupted VOB start
         check_vob_for_corrupted_start
@@ -907,7 +898,7 @@ if [ $mirror_mode -eq 0 ]; then
       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"
-      mencoder_video_encoder_opts="-ovc xvid -xvidencopts pass=%PASS:chroma_opt:vhq=4:bvhq=1:quant_type=mpeg:bitrate=$target_bitrate:autoaspect:threads=2"
+      mencoder_video_encoder_opts="-ovc xvid -xvidencopts pass=%PASS:chroma_opt:vhq=4:bvhq=1:quant_type=mpeg:bitrate=$target_bitrate:autoaspect:threads=$mencoder_threads"
 
       # There are a number of different ways to encode 6 channel audio.
       # I've loaded 3 different ways into the mencoder_audioch_opts.