diff options
| author | jstebbins <[email protected]> | 2010-04-02 15:10:48 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2010-04-02 15:10:48 +0000 |
| commit | eb4ffde8a29cf9b77a84440fa6c404e94eb9b6a6 (patch) | |
| tree | ea5149118b167b07f4a33f4f0cf9f1a8ea7ee61f /gtk/src | |
| parent | 13eb2d6d5e7ad894d0dfe808dc3cb26a062d48b7 (diff) | |
downmix support for ffmpeg audio sources
now we can eat our own dogfood. i.e. aac 6ch discrete input now works,
along with any other multi-channel audio ffmpeg can toss at us.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3182 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src')
| -rw-r--r-- | gtk/src/hb-backend.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index 53b71fd2d..dbcb437a9 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -1397,8 +1397,6 @@ ghb_grey_combo_options(GtkBuilder *builder) allow_6ch = acodec & ~HB_ACODEC_LAME; if (audio) { - allow_mono = allow_mono && - (audio->in.codec & (HB_ACODEC_AC3|HB_ACODEC_DCA)); gint layout = audio->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); @@ -1408,7 +1406,6 @@ ghb_grey_combo_options(GtkBuilder *builder) (layout == HB_INPUT_CH_LAYOUT_DOLBY); allow_dpl2 = (layout == HB_INPUT_CH_LAYOUT_3F2R); allow_6ch = allow_6ch && - (audio->in.codec & (HB_ACODEC_AC3|HB_ACODEC_DCA)) && (layout == HB_INPUT_CH_LAYOUT_3F2R) && (audio->in.channel_layout & HB_INPUT_CH_LAYOUT_HAS_LFE); } @@ -1449,9 +1446,7 @@ ghb_get_best_mix(gint titleindex, gint track, gint acodec, gint mix) audio = get_hb_audio(titleindex, track); if (audio) { - allow_mono = - (audio->in.codec & (HB_ACODEC_AC3|HB_ACODEC_DCA)) && - (acodec & ~HB_ACODEC_LAME); + allow_mono = (acodec & ~HB_ACODEC_LAME); gint layout = audio->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); @@ -1461,7 +1456,6 @@ ghb_get_best_mix(gint titleindex, gint track, gint acodec, gint mix) (layout == HB_INPUT_CH_LAYOUT_DOLBY); allow_dpl2 = (layout == HB_INPUT_CH_LAYOUT_3F2R); allow_6ch = - (audio->in.codec & (HB_ACODEC_AC3|HB_ACODEC_DCA)) && (acodec & ~HB_ACODEC_LAME) && (layout == HB_INPUT_CH_LAYOUT_3F2R) && (audio->in.channel_layout & HB_INPUT_CH_LAYOUT_HAS_LFE); @@ -4096,9 +4090,7 @@ ghb_validate_audio(signal_user_data_t *ud) gboolean allow_dolby = TRUE; gboolean allow_dpl2 = TRUE; gboolean allow_6ch = TRUE; - allow_mono = - (taudio->in.codec & (HB_ACODEC_AC3|HB_ACODEC_DCA)) && - (codec & ~HB_ACODEC_LAME); + allow_mono = (codec & ~HB_ACODEC_LAME); gint layout = taudio->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); @@ -4108,7 +4100,6 @@ ghb_validate_audio(signal_user_data_t *ud) (layout == HB_INPUT_CH_LAYOUT_DOLBY); allow_dpl2 = (layout == HB_INPUT_CH_LAYOUT_3F2R); allow_6ch = - (taudio->in.codec & (HB_ACODEC_AC3|HB_ACODEC_DCA)) && (codec & ~HB_ACODEC_LAME) && (layout == HB_INPUT_CH_LAYOUT_3F2R) && (taudio->in.channel_layout & HB_INPUT_CH_LAYOUT_HAS_LFE); |