From: Alan J. Pippin <ajp@pippins.net>
Date: Thu, 21 May 2009 20:07:35 +0000 (-0600)
Subject: Renamed compress_vob_file method to encode_vob_file and moved to top of function... 
X-Git-Tag: 1_0~15
X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=commitdiff_plain;h=aacf74d70ad8d74b29fdffc4d5d9a98ae3485c11;p=rip_dvd%2F.git

Renamed compress_vob_file method to encode_vob_file and moved to top of function list.
Since this will probably be the most commonly changed section of code, moved it up!
---

diff --git a/rip_dvd b/rip_dvd
index 18ef460..1b3fec5 100755
--- a/rip_dvd
+++ b/rip_dvd
@@ -351,6 +351,194 @@ trap cleanup EXIT
 ##############################################################################################
 # processing functions
 ##############################################################################################
+
+# encode the vob file into a compressed file format
+function encode_vob_file {
+  typeset -i found_profile=0
+   
+  # XVID profile
+  if [ "$profile" == "xvid" ]; then
+    found_profile=1
+    final_output_file="$dest/$dvdname.avi"
+    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$SCALE"
+    mencoder_video_encoder_opts="-ovc xvid -xvidencopts pass=%PASS"
+    video_encoder_opts[0]="bitrate=$target_bitrate"
+    video_encoder_opts[1]="threads=$mencoder_threads"
+    video_encoder_opts[2]="chroma_opt"
+    video_encoder_opts[3]="vhq=4"
+    video_encoder_opts[4]="bvhq=1"
+    video_encoder_opts[5]="quant_type=mpeg"
+    video_encoder_opts[6]="autoaspect"
+    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]=""
+    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]=""
+    fi
+ 
+  fi
+
+  # MP4 encoding profiles
+  if [ "$profile" == "mp4" ] || [ "$profile" == "mp4hq" ] || [ "$profile" == "mp4vhq" ]; then
+    found_profile=1
+    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 (17fps)
+    if [ "$profile" == "mp4" ]; 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"
+    mencoder_video_filter_opts="-vf harddup$CROP$SCALE";
+    mencoder_video_encoder_opts="-ovc x264 -x264encopts pass=%PASS"
+    video_encoder_opts[0]="bitrate=$target_bitrate"
+    video_encoder_opts[1]="threads=$mencoder_threads"
+    video_encoder_opts[2]="vbv_maxrate=1500"
+    video_encoder_opts[3]="vbv_bufsize=2000"
+    video_encoder_opts[4]="nocabac"
+    video_encoder_opts[5]="me=umh"
+    video_encoder_opts[6]="subq=6"
+    video_encoder_opts[7]="frameref=6"
+    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
+
+    mencoder_audio_opts="-oac faac -faacopts mpeg=4:object=2:br=$audio_bitrate:raw"
+    mencoder_audioch_opts[0]="-channels 2 -srate 48000"
+  fi
+
+  if [ $found_profile -eq 0 ]; then
+    fatal_and_exit "-E- Unable to find a profile handler for profile: $profile"
+  fi
+
+  # Do not edit this line. $mencoder_video_encoder_opts must be last
+  mencoder_opts="$mencoder_general_opts $mencoder_output_opts $mencoder_audio_opts $mencoder_video_filter_opts $mencoder_video_encoder_opts"
+  mencoder_retval=0
+
+  for PASS in 1 2 
+  do 
+    # Set some options based on which pass we are in
+    mencoder_opts_for_pass=$(echo "$mencoder_opts" | sed "s,%PASS,$PASS,g")
+    [ $PASS -eq 1 ] && mencoder_opts_for_pass="$mencoder_opts_for_pass:turbo"
+    [ $PASS -eq 1 ] && output_file="/dev/null"
+    [ $PASS -eq 2 ] && output_file="$final_output_file"
+  
+    # It's possible that the audio channel encoding may not work. Cycle through all our different audioch_opts until we find one that works.
+    for CH_OPTS in "${mencoder_audioch_opts[@]}"; 
+    do
+      echo -e "   Encoding pass $PASS"
+      echo -e "\n   Encoding pass $PASS: mencoder $CH_OPTS $mencoder_opts_for_pass \"$vobfile\" -o \"$output_file\" >> $encodelog 2>&1" >> "$logfile"
+      mencoder $CH_OPTS $mencoder_opts_for_pass "$vobfile" -o "$output_file" > $encodelog 2>&1
+      mencoder_retval=$? 
+      grep -q "\[channels\] Invalid" $encodelog
+      if [ $? != 0 ]; then	    
+        break;
+      else
+        echo -e "\n-W- Audio channel encoding error. Falling back to next audio channel encoding scheme." >> "$logfile"
+      fi
+    done
+      
+    if [ $mencoder_retval != 0 ]; then
+      fatal_and_exit "-E- Unhandled mencoder error"
+    fi
+
+    # Concatenate the encode log to our main log file, greping out unwanted lines
+    cat $encodelog | grep -v "Pos:" >> "$logfile"
+
+  done
+}
+
 function make_dvd_iso_image {
 
   isofile="$1"
@@ -809,193 +997,6 @@ function check_for_mplayer_dumpstream_incompatibility {
   fi
 }
 
-# encode the vob file into a compressed file format
-function compress_vob_file {
-  typeset -i found_profile=0
-   
-  # XVID profile
-  if [ "$profile" == "xvid" ]; then
-    found_profile=1
-    final_output_file="$dest/$dvdname.avi"
-    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$SCALE"
-    mencoder_video_encoder_opts="-ovc xvid -xvidencopts pass=%PASS"
-    video_encoder_opts[0]="bitrate=$target_bitrate"
-    video_encoder_opts[1]="threads=$mencoder_threads"
-    video_encoder_opts[2]="chroma_opt"
-    video_encoder_opts[3]="vhq=4"
-    video_encoder_opts[4]="bvhq=1"
-    video_encoder_opts[5]="quant_type=mpeg"
-    video_encoder_opts[6]="autoaspect"
-    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]=""
-    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]=""
-    fi
- 
-  fi
-
-  # MP4 encoding profiles
-  if [ "$profile" == "mp4" ] || [ "$profile" == "mp4hq" ] || [ "$profile" == "mp4vhq" ]; then
-    found_profile=1
-    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 (17fps)
-    if [ "$profile" == "mp4" ]; 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"
-    mencoder_video_filter_opts="-vf harddup$CROP$SCALE";
-    mencoder_video_encoder_opts="-ovc x264 -x264encopts pass=%PASS"
-    video_encoder_opts[0]="bitrate=$target_bitrate"
-    video_encoder_opts[1]="threads=$mencoder_threads"
-    video_encoder_opts[2]="vbv_maxrate=1500"
-    video_encoder_opts[3]="vbv_bufsize=2000"
-    video_encoder_opts[4]="nocabac"
-    video_encoder_opts[5]="me=umh"
-    video_encoder_opts[6]="subq=6"
-    video_encoder_opts[7]="frameref=6"
-    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
-
-    mencoder_audio_opts="-oac faac -faacopts mpeg=4:object=2:br=$audio_bitrate:raw"
-    mencoder_audioch_opts[0]="-channels 2 -srate 48000"
-  fi
-
-  if [ $found_profile -eq 0 ]; then
-    fatal_and_exit "-E- Unable to find a profile handler for profile: $profile"
-  fi
-
-  # Do not edit this line. $mencoder_video_encoder_opts must be last
-  mencoder_opts="$mencoder_general_opts $mencoder_output_opts $mencoder_audio_opts $mencoder_video_filter_opts $mencoder_video_encoder_opts"
-  mencoder_retval=0
-
-  for PASS in 1 2 
-  do 
-    # Set some options based on which pass we are in
-    mencoder_opts_for_pass=$(echo "$mencoder_opts" | sed "s,%PASS,$PASS,g")
-    [ $PASS -eq 1 ] && mencoder_opts_for_pass="$mencoder_opts_for_pass:turbo"
-    [ $PASS -eq 1 ] && output_file="/dev/null"
-    [ $PASS -eq 2 ] && output_file="$final_output_file"
-  
-    # It's possible that the audio channel encoding may not work. Cycle through all our different audioch_opts until we find one that works.
-    for CH_OPTS in "${mencoder_audioch_opts[@]}"; 
-    do
-      echo -e "   Encoding pass $PASS"
-      echo -e "\n   Encoding pass $PASS: mencoder $CH_OPTS $mencoder_opts_for_pass \"$vobfile\" -o \"$output_file\" >> $encodelog 2>&1" >> "$logfile"
-      mencoder $CH_OPTS $mencoder_opts_for_pass "$vobfile" -o "$output_file" > $encodelog 2>&1
-      mencoder_retval=$? 
-      grep -q "\[channels\] Invalid" $encodelog
-      if [ $? != 0 ]; then	    
-        break;
-      else
-        echo -e "\n-W- Audio channel encoding error. Falling back to next audio channel encoding scheme." >> "$logfile"
-      fi
-    done
-      
-    if [ $mencoder_retval != 0 ]; then
-      fatal_and_exit "-E- Unhandled mencoder error"
-    fi
-
-    # Concatenate the encode log to our main log file, greping out unwanted lines
-    cat $encodelog | grep -v "Pos:" >> "$logfile"
-
-  done
-}
-
 function fill_mythvideo_metadata {
 
   # This function must be passed the filename as an argument
@@ -1177,7 +1178,7 @@ if [ $mirror_mode -eq 0 ]; then
       calculate_bitrate_from_target_size        
      
       # encode the vob file into a compressed file format
-      compress_vob_file
+      encode_vob_file
 
       if [ $keep_intermediate_files -eq 0 ] && [ $make_final_dest_vob -eq 0 ]; then
         [[ -e "$vobfile" ]] && [[ $keep_vobfile -eq 0 ]] && rm -f "$vobfile";