projects
/
rip_dvd
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b22417a
)
Added ability for bitrate and audio options to override handbrake preset values
author
Alan J. Pippin
<ajp@pippins.net>
Thu, 11 Feb 2010 06:28:47 +0000
(23:28 -0700)
committer
Alan J. Pippin
<ajp@pippins.net>
Thu, 11 Feb 2010 06:28:47 +0000
(23:28 -0700)
rip_dvd
patch
|
blob
|
history
diff --git
a/rip_dvd
b/rip_dvd
index 3696fe8b70d36bc96aa05071cc6cd1b535c8d1d9..94b96fc1290499d289da30a0f96aecc8609d6d59 100755
(executable)
--- a/
rip_dvd
+++ b/
rip_dvd
@@
-67,6
+67,9
@@
typeset -i audio_6ch=1
typeset -i invalid_feature_title=0
typeset -i feature_title_override=0
typeset -i mplayer_dumpstream_incompatibility=0
typeset -i invalid_feature_title=0
typeset -i feature_title_override=0
typeset -i mplayer_dumpstream_incompatibility=0
+typeset -i custom_bitrate=0
+typeset -i custom_audio_2ch=0
+typeset -i custom_audio_6ch=0
##############################################################################
# Local Machine Settings:
##############################################################################
# Local Machine Settings:
@@
-107,10
+110,10
@@
do
case $opt in
(n) dvdname=$OPTARG;;
(d) dest=$OPTARG;;
case $opt in
(n) dvdname=$OPTARG;;
(d) dest=$OPTARG;;
- (b) target_bitrate=$OPTARG;;
+ (b) target_bitrate=$OPTARG;
custom_bitrate=1;
;
(s) target_size=$OPTARG;;
(s) target_size=$OPTARG;;
- (2) audio_2ch=1;;
- (6) audio_6ch=1;;
+ (2) audio_2ch=1;
custom_audio_2ch=1;
;
+ (6) audio_6ch=1;
custom_audio_6ch=1;
;
(1) force_onepass_mode=1;;
(v) make_final_dest_vob=1;;
(i) make_final_dest_iso=1;;
(1) force_onepass_mode=1;;
(v) make_final_dest_vob=1;;
(i) make_final_dest_iso=1;;
@@
-533,6
+536,17
@@
function encode_vob_file_handbrake {
final_output_file="$dest/$dvdname.mp4"
PASSES=""
final_output_file="$dest/$dvdname.mp4"
PASSES=""
+ # Handle custom parameter overrides
+ if [ $custom_bitrate == 1 ]; then
+ handbrake_opts[0]="-b $target_bitrate"
+ fi
+ if [ $custom_audio_2ch == 0 ]; then
+ audio_2ch=0
+ fi
+ if [ $custom_audio_6ch == 0 ]; then
+ audio_6ch=0
+ fi
+
# Very High Quality
if [ "$profile" == "mp4vhq" ]; then
profile="hb_High_Profile"
# Very High Quality
if [ "$profile" == "mp4vhq" ]; then
profile="hb_High_Profile"
@@
-554,18
+568,26
@@
function encode_vob_file_handbrake {
final_output_file="$dest/$dvdname.mp4"
PASSES=""
final_output_file="$dest/$dvdname.mp4"
PASSES=""
- # Do not override the audio settings for these profiles
- audio_2ch=0
- audio_6ch=0
+ # Handle custom parameter overrides
+ if [ $custom_bitrate == 1 ]; then
+ handbrake_opts[0]="-b $target_bitrate"
+ fi
+ if [ $custom_audio_2ch == 0 ]; then
+ audio_2ch=0
+ fi
+ if [ $custom_audio_6ch == 0 ]; then
+ audio_6ch=0
+ fi
# iphone
if [ "$profile" == "iphone" ]; then
# iphone
if [ "$profile" == "iphone" ]; then
- profile="hb_iPhone"
+ profile="hb_iPhone
_&_iPod_Touch
"
fi
# ipod
if [ "$profile" == "ipod" ]; then
profile="hb_iPod"
fi
fi
# ipod
if [ "$profile" == "ipod" ]; then
profile="hb_iPod"
fi
+
fi
# Predefined Handbrake Profile Handling
fi
# Predefined Handbrake Profile Handling
@@
-574,6
+596,17
@@
function encode_vob_file_handbrake {
handbrake_cli="$handbrake_mp4"
final_output_file="$dest/$dvdname.mp4"
PASSES=""
handbrake_cli="$handbrake_mp4"
final_output_file="$dest/$dvdname.mp4"
PASSES=""
+
+ # Handle custom parameter overrides
+ if [ $custom_bitrate == 1 ]; then
+ handbrake_opts[0]="-b $target_bitrate"
+ fi
+ if [ $custom_audio_2ch == 0 ]; then
+ audio_2ch=0
+ fi
+ if [ $custom_audio_6ch == 0 ]; then
+ audio_6ch=0
+ fi
# extract the HandBrake Profile name from $profile
hb_profile=`echo "$profile" | sed 's/hb_//g' | sed 's/_/ /g'`
# extract the HandBrake Profile name from $profile
hb_profile=`echo "$profile" | sed 's/hb_//g' | sed 's/_/ /g'`