From: Alan J. Pippin Date: Wed, 10 Feb 2010 04:55:37 +0000 (-0700) Subject: Added new Dynamic Range Compression option for HandBrake encodings. X-Git-Tag: 2_0~1 X-Git-Url: http://git.pippins.net/embedvideo/.git/%22%22.%24thumbnail.%22/static/gitweb.css?a=commitdiff_plain;h=27cd43baa5583cd66597cc68bf2de2782fb780e1;p=rip_dvd%2F.git Added new Dynamic Range Compression option for HandBrake encodings. Added aspect ratio command support to HandBrake encodings. --- diff --git a/rip_dvd b/rip_dvd index ce9f0c7..aa4b13b 100755 --- a/rip_dvd +++ b/rip_dvd @@ -44,6 +44,7 @@ typeset mailto="" typeset encoder="" typeset default_alang="en" typeset track="" +typeset drc="0.0" typeset -i default_aid=128 typeset -i aid_override=-1 typeset -i force_onepass_mode=0 @@ -101,7 +102,7 @@ fi ############################################################################################## # Command line processing ############################################################################################## -while (($#)) && getopts 162wmvifkzx:ht:n:d:b:s:t:a:p:e:j:l: opt "$@" +while (($#)) && getopts 162wmvifkzx:ht:n:d:b:s:t:a:p:e:j:l:r: opt "$@" do case $opt in (n) dvdname=$OPTARG;; @@ -124,6 +125,7 @@ do (x) extension=$OPTARG;; (j) eject_disk=$OPTARG;; (l) aid_override=$OPTARG;; + (r) drc=$OPTARG;; (w) set -x;; (h) show_usage=1;; (:) echo >&2 "$0: $OPTARG requires a value"; errors=errors+1;; @@ -144,7 +146,7 @@ function usage() { echo >&2 " 3) If dvdname is a full path to an MPG2 file, it will be ripped as a DVD instead of $dev" echo >&2 " 4) If dvdname is a full path to an ISO file, it will be ripped as a DVD instead of $dev" 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 Specify which encoding profile to use in -x mode as shown below:" + echo >&2 " -p Specify which encoding profile to use in -w mode as shown below:" echo >&2 " Mencoder and Handbrake Encoder Profiles:" 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)" @@ -155,7 +157,7 @@ function usage() { echo >&2 " - mp4vhq = MP4, very high quality encoding, x264 codec, 2 pass encoding" echo >&2 " - mp4hq = MP4, high quality encoding, x264 codec, 2 pass encoding" echo >&2 " - mp4 = MP4, fast encoding, x264 codec, 2 pass encoding" - echo >&2 " - hb_ = Any predefined HandBrake profile" + echo >&2 " - hb_ = Any predefined HandBrake profile (run HandBrakeCLI -z and replace spaces with underscores) " echo >&2 " -x 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" @@ -169,7 +171,7 @@ function usage() { echo >&2 " You must also specify the target size or bitrate using the '-s' or '-b' options with xvid profiles" echo >&2 " -s Set the target size of the compressed file in MB (ex: 700, 1000, etc)" echo >&2 " -b Set the bitrate desired in the compressed file in kbits/sec (ex: 1500, 2000 (default), etc)" - echo >&2 " -a Specify the width x height aspect ratio to scale the DVD to (only used in -x mode)" + echo >&2 " -a Specify the width x height aspect ratio to scale the DVD to (only used in -z mode)" echo >&2 " If only the width is given, it will autoset the height to a value which preserves the aspect ratio" echo >&2 " The default behavior is autoaspect mode, which preserves the original aspect, with no scaling being done" echo >&2 " -j Eject the disk:" @@ -180,8 +182,10 @@ function usage() { echo >&2 " -1 Force 1-pass encoding mode across all profiles" echo >&2 " -2 Use 2 channel MP3 audio encoding when making a compressed file (default is 6 channel AC3)" echo >&2 " -6 Use 6 channel AC3 audio encoding when making a compressed file (default)" + echo >&2 " -r Apply extra dynamic range compression to the audio, making soft sounds louder. " + echo >&2 " Range is 1.0 to 4.0 with 1.5 - 2.5 being a useful range (HandBrake Only) (default value is 0.0)" echo >&2 " -k Keep the intermediate files (good for debugging)" - echo >&2 " In -x mode, run with this option to keep the original .VOB file" + echo >&2 " In -z mode, run with this option to keep the original .VOB file" echo >&2 " By default, all intermediary files are deleted. Only the final image is kept" echo >&2 " -l Specify the audio AID language ID to rip from the source DVD" echo >&2 " -t Specify the main feature title to pull from the DVD (only required if this script can't figure it out)" @@ -201,26 +205,26 @@ if [ "$dest" == "" ]; then usage fi -if ([ $target_size -ne 0 ] || [ "$aspect" != "" ]) && [ $make_final_dest_comp -ne 1 ]; then - echo "-E- You can't specify a target_size, or aspect in non compressed file mode. You must specify '-x' when using '-b' or '-s' or '-a'" | tee -a $logfile - usage +if [ $make_final_dest_vob -eq 0 ] && [ $make_final_dest_iso -eq 0 ] && + [ $make_final_dest_folder -eq 0 ] && [ $make_final_dest_comp -eq 0 ] && [ $mirror_mode -eq 0 ]; then + # Make our default dest type a compressed movie if the user didn't ask for anything else to be done + make_final_dest_comp=1 fi -if [ $target_bitrate -eq 0 ] && [ $target_size -eq 0 ] && [ $make_final_dest_comp -eq 1 ]; then - echo "-E- You must specify a bitrate in compressed file mode. You must specify '-b' or '-s' when using '-x'" | tee -a $logfile +if ([ $target_size -ne 0 ] || [ "$aspect" != "" ]) && [ $make_final_dest_comp -ne 1 ]; then + echo "-E- You can't specify a target_size, or aspect in non compressed file mode. You must specify '-z' when using '-b' or '-s' or '-a'" | tee -a $logfile usage fi -if [ $make_final_dest_vob -eq 0 ] && [ $make_final_dest_iso -eq 0 ] && - [ $make_final_dest_folder -eq 0 ] && [ $make_final_dest_comp -eq 0 ] && [ $mirror_mode -eq 0 ]; then - echo "-E- You must specify what type of final destination you want: '-m' or '-v' or '-i' or '-f' or '-z'" | tee -a $logfile +if [ $target_bitrate -eq 0 ] && [ $target_size -eq 0 ] && [ $make_final_dest_comp -eq 1 ]; then + echo "-E- You must specify a bitrate in compressed file mode. You must specify '-b' or '-s' when using '-z'" | tee -a $logfile usage fi if [ $mirror_mode -eq 1 ]; then if [ $make_final_dest_vob -eq 1 ] || [ $make_final_dest_iso -eq 1 ] || [ $make_final_dest_folder -eq 1 ] || [ $make_final_dest_comp -eq 1 ]; then - echo "-E- You can't specify '-v' or '-i' or '-f' or '-x' when operating in mirror mode with '-m'" | tee -a $logfile + echo "-E- You can't specify '-v' or '-i' or '-f' or '-z' when operating in mirror mode with '-m'" | tee -a $logfile usage fi fi @@ -253,9 +257,15 @@ if [ "$aspect" != "" ]; then fi echo "$aspect" | grep -q ":" if [ $? != 0 ]; then - SCALE=",scale -zoom -sws 9 -xy $aspect" + [ "$encoder" == "mencoder" ] && SCALE=",scale -zoom -sws 9 -xy $aspect" + [ "$encoder" == "handbrake" ] && SCALE="-w $aspect" else - SCALE=",scale=$aspect" + [ "$encoder" == "mencoder" ] && SCALE=",scale=$aspect" + if [ "$encoder" == "handbrake" ]; then + WIDTH=`echo "$aspect" | awk -F ':' '{ print $1; }'` + HEIGHT=`echo "$aspect" | awk -F ':' '{ print $2; }'` + SCALE="-w $WIDTH -l $HEIGHT" + fi fi fi @@ -471,6 +481,9 @@ function encode_vob_file_handbrake { # It indicates which PASS numbers to loop over. PASSES="2" means just do pass 2 => single pass mode. PASSES="-2" + # Set our DRC option + DRC="-D $drc" + # Check the global force_onepass_mode. If it is set, change our variables appropriately # to force 1-pass encoding across all profiles. if [ $force_onepass_mode -eq 1 ]; then @@ -591,15 +604,21 @@ function encode_vob_file_handbrake { for OPTS in "${handbrake_opts[@]}"; do handbrake_cmd_line_opts="$handbrake_cmd_line_opts $OPTS" done - + + # Append "global" command line options + handbrake_cmd_line_opts="$handbrake_cmd_line_opts -v 1" + handbrake_cmd_line_opts="$handbrake_cmd_line_opts $PASSES" + handbrake_cmd_line_opts="$handbrake_cmd_line_opts $DRC" + handbrake_cmd_line_opts="$handbrake_cmd_line_opts $SCALE" + # Execute the handbrake command to encode the video if [ -n "$hb_profile" ]; then - echo -e "\n Encoding: $handbrake_cli -i \"$vobfile\" -o \"$final_output_file\" -Z \"$hb_profile\" $handbrake_cmd_line_opts $handbrake_audio_opts $handbrake_video_encoder_opts $PASSES >> $encodelog 2>&1" >> "$logfile" - $handbrake_cli -i "$vobfile" -o "$final_output_file" -Z "$hb_profile" $handbrake_cmd_line_opts $handbrake_audio_opts $handbrake_video_encoder_opts $PASSES >> $encodelog 2>&1 + echo -e "\n Encoding: $handbrake_cli -i \"$vobfile\" -o \"$final_output_file\" -Z \"$hb_profile\" $handbrake_cmd_line_opts $handbrake_audio_opts $handbrake_video_encoder_opts >> $encodelog 2>&1" >> "$logfile" + $handbrake_cli -i "$vobfile" -o "$final_output_file" -Z "$hb_profile" $handbrake_cmd_line_opts $handbrake_audio_opts $handbrake_video_encoder_opts >> $encodelog 2>&1 handbrake_retval=$? else - echo -e "\n Encoding: $handbrake_cli -i \"$vobfile\" -o \"$final_output_file\" $handbrake_cmd_line_opts $handbrake_audio_opts $handbrake_video_encoder_opts $PASSES >> $encodelog 2>&1" >> "$logfile" - $handbrake_cli -i "$vobfile" -o "$final_output_file" $handbrake_cmd_line_opts $handbrake_audio_opts $handbrake_video_encoder_opts $PASSES >> $encodelog 2>&1 + echo -e "\n Encoding: $handbrake_cli -i \"$vobfile\" -o \"$final_output_file\" $handbrake_cmd_line_opts $handbrake_audio_opts $handbrake_video_encoder_opts >> $encodelog 2>&1" >> "$logfile" + $handbrake_cli -i "$vobfile" -o "$final_output_file" $handbrake_cmd_line_opts $handbrake_audio_opts $handbrake_video_encoder_opts >> $encodelog 2>&1 handbrake_retval=$? fi if [ $handbrake_retval != 0 ]; then