summaryrefslogtreecommitdiffstats
path: root/gtk/src/audiohandler.c
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2010-10-05 22:51:50 +0000
committerjstebbins <[email protected]>2010-10-05 22:51:50 +0000
commit7622dc8c73084d98e22ca6a7c44fec91962c492d (patch)
tree2b0de2fda50880e5fda100e741f365200296e7d1 /gtk/src/audiohandler.c
parent5b37d5479392e6112d72b9156af2865db3d6f575 (diff)
LinGui: fix a problem where I used the wrong aac bitrate cap
wasn't allowing higher bitrate for aac 6ch in some cases. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3574 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src/audiohandler.c')
-rw-r--r--gtk/src/audiohandler.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
index e4bc6b86d..82273e2af 100644
--- a/gtk/src/audiohandler.c
+++ b/gtk/src/audiohandler.c
@@ -109,7 +109,7 @@ ghb_adjust_audio_rate_combos(signal_user_data_t *ud)
ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(bitrate));
if (select_acodec == HB_ACODEC_FAAC)
{
- gint br, last = 320, first = 0;
+ gint last = 320, first = 0;
if (mix == HB_AMIXDOWN_6CH)
{
@@ -426,12 +426,13 @@ audio_codec_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
titleindex = ghb_settings_combo_int(ud->settings, "title");
track = ghb_settings_combo_int(ud->settings, "AudioTrack");
- br = ghb_find_closest_audio_bitrate(acodec_code, br);
+ mix_code = ghb_get_best_mix( titleindex, track, acodec_code, mix_code);
+ int channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(mix_code);
+ br = ghb_get_best_audio_bitrate(acodec_code, br, channels);
ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(br));
sr = ghb_find_closest_audio_rate(sr);
ghb_ui_update(ud, "AudioSamplerate", ghb_int64_value(sr));
- mix_code = ghb_get_best_mix( titleindex, track, acodec_code, mix_code);
ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(mix_code));
}
ghb_adjust_audio_rate_combos(ud);