From: Alan J. Pippin <ajp@pippins.net>
Date: Fri, 22 May 2009 16:10:57 +0000 (-0600)
Subject: Fixed default threads option (from 8 to 2 since 2 is faster than 8)
X-Git-Tag: 1_0~11
X-Git-Url: http://git.pippins.net/embedvideo/.git/%27%20%20%20%20.%20%24GLOBALS%5B%27phpgw%27%5D-%3Elink%28%27inc/jquery/static/%7Bview%7D?a=commitdiff_plain;h=7b5df66230bc8b3ddc7d83a92f7269e8a736c77e;p=rip_dvd%2F.git

Fixed default threads option (from 8 to 2 since 2 is faster than 8)
Changed crop size errors to warnings since they really aren't fatal
---

diff --git a/rip_dvd b/rip_dvd
index 8aefb82..6ab57ca 100755
--- a/rip_dvd
+++ b/rip_dvd
@@ -250,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"
@@ -343,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
 }
 
@@ -756,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=""
@@ -780,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=""
diff --git a/rip_dvd.conf.dist b/rip_dvd.conf.dist
index e03d86e..b2a5669 100644
--- a/rip_dvd.conf.dist
+++ b/rip_dvd.conf.dist
@@ -49,6 +49,7 @@ trust_feature_title_autodetect_when_uncertain=0
 # an optimal setting for this should be the number of cores you have times 2
 # note: you have to have an mplayer version that has been compiled with multi thread support.
 # if you don't, this will have no effect, but won't hurt anything to have it set otherwise.
-mencoder_threads=4
+# note: the xvid codec seems to be fastest with threads set to 2.
+mencoder_threads=2
 
-###########################################################################################
\ No newline at end of file
+###########################################################################################