summaryrefslogtreecommitdiffstats
path: root/gtk/src
diff options
context:
space:
mode:
authorjstebbins <jstebbins.hb@gmail.com>2010-11-05 20:12:31 +0000
committerjstebbins <jstebbins.hb@gmail.com>2010-11-05 20:12:31 +0000
commit4f9afabcd99a47c9914768363c213346c8f56ecb (patch)
treeb65d1f379d5b32770e4d863b365dc6f88b223701 /gtk/src
parent8f8ef175e85add6408063a2a36a0531def2714de (diff)
Fix hb_get_best_mixdown to allow downmixing 7.1 to 5.1
Use hb_get_best_mixdown in places in the LinGui that were duplicating code. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3648 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src')
-rw-r--r--gtk/src/audiohandler.c1
-rw-r--r--gtk/src/hb-backend.c37
2 files changed, 15 insertions, 23 deletions
diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
index f36cf506d..27c511d8f 100644
--- a/gtk/src/audiohandler.c
+++ b/gtk/src/audiohandler.c
@@ -408,6 +408,7 @@ audio_codec_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
if (block_updates)
{
prev_acodec = acodec_code;
+ ghb_grey_combo_options (ud->builder);
return;
}
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index fc35adf20..59228778d 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -1596,17 +1596,12 @@ ghb_grey_combo_options(GtkBuilder *builder)
allow_6ch = acodec & ~HB_ACODEC_LAME;
if (aconfig)
{
- gint layout = aconfig->in.channel_layout & HB_INPUT_CH_LAYOUT_DISCRETE_NO_LFE_MASK;
- allow_stereo =
- ((layout == HB_INPUT_CH_LAYOUT_MONO && !allow_mono) || layout >= HB_INPUT_CH_LAYOUT_STEREO);
- allow_dolby =
- (layout == HB_INPUT_CH_LAYOUT_3F1R) ||
- (layout == HB_INPUT_CH_LAYOUT_3F2R) ||
- (layout == HB_INPUT_CH_LAYOUT_DOLBY);
- allow_dpl2 = (layout == HB_INPUT_CH_LAYOUT_3F2R);
- allow_6ch = allow_6ch &&
- (layout == HB_INPUT_CH_LAYOUT_3F2R) &&
- (aconfig->in.channel_layout & HB_INPUT_CH_LAYOUT_HAS_LFE);
+ gint best = hb_get_best_mixdown(acodec, aconfig->in.channel_layout, 0);
+
+ allow_stereo = best >= HB_AMIXDOWN_STEREO;
+ allow_dolby = best >= HB_AMIXDOWN_DOLBY;
+ allow_dpl2 = best >= HB_AMIXDOWN_DOLBYPLII;
+ allow_6ch = best >= HB_AMIXDOWN_6CH;
}
grey_combo_box_item(builder, "AudioMixdown", HB_AMIXDOWN_MONO, !allow_mono);
grey_combo_box_item(builder, "AudioMixdown", HB_AMIXDOWN_STEREO, !allow_stereo);
@@ -4244,6 +4239,7 @@ ghb_validate_audio(signal_user_data_t *ud)
value = ghb_lookup_acodec_value(codec);
ghb_settings_take_value(asettings, "AudioEncoder", value);
}
+
gint mix = ghb_settings_combo_int (asettings, "AudioMixdown");
gboolean allow_mono = TRUE;
gboolean allow_stereo = TRUE;
@@ -4251,18 +4247,13 @@ ghb_validate_audio(signal_user_data_t *ud)
gboolean allow_dpl2 = TRUE;
gboolean allow_6ch = TRUE;
allow_mono = TRUE;
- gint layout = aconfig->in.channel_layout & HB_INPUT_CH_LAYOUT_DISCRETE_NO_LFE_MASK;
- allow_stereo =
- ((layout == HB_INPUT_CH_LAYOUT_MONO && !allow_mono) || layout >= HB_INPUT_CH_LAYOUT_STEREO);
- allow_dolby =
- (layout == HB_INPUT_CH_LAYOUT_3F1R) ||
- (layout == HB_INPUT_CH_LAYOUT_3F2R) ||
- (layout == HB_INPUT_CH_LAYOUT_DOLBY);
- allow_dpl2 = (layout == HB_INPUT_CH_LAYOUT_3F2R);
- allow_6ch =
- (codec & ~HB_ACODEC_LAME) &&
- (layout == HB_INPUT_CH_LAYOUT_3F2R) &&
- (aconfig->in.channel_layout & HB_INPUT_CH_LAYOUT_HAS_LFE);
+
+ gint best = hb_get_best_mixdown(codec, aconfig->in.channel_layout, 0);
+
+ allow_stereo = best >= HB_AMIXDOWN_STEREO;
+ allow_dolby = best >= HB_AMIXDOWN_DOLBY;
+ allow_dpl2 = best >= HB_AMIXDOWN_DOLBYPLII;
+ allow_6ch = best >= HB_AMIXDOWN_6CH;
gchar *mix_unsup = NULL;
if (mix == HB_AMIXDOWN_MONO && !allow_mono)