- Something
- Saturday, February 16th, 2008 at 11:58:21am MST
- Index: macosx/Controller.mm
- ===================================================================
- --- macosx/Controller.mm (revision 1269)
- +++ macosx/Controller.mm (working copy)
- @@ -21,6 +21,7 @@
- static int FormatSettings[4][10] =
- { { HB_MUX_MP4 | HB_VCODEC_FFMPEG | HB_ACODEC_FAAC,
- HB_MUX_MP4 | HB_VCODEC_X264 | HB_ACODEC_FAAC,
- + HB_MUX_MP4 | HB_VCODEC_X264 | HB_ACODEC_FAAC,
- 0,
- 0 },
- { HB_MUX_MKV | HB_VCODEC_FFMPEG | HB_ACODEC_FAAC,
- @@ -2248,6 +2249,8 @@
- [fDstCodecsPopUp addItemWithTitle:_( @"MPEG-4 Video / AAC Audio" )];
- [fDstCodecsPopUp addItemWithTitle:_( @"AVC/H.264 Video / AAC Audio" )];
- + /* We add a new codecs entry which will allow the new aac/ ac3 hybrid */
- + [fDstCodecsPopUp addItemWithTitle:_( @"AVC/H.264 Video / AAC + AC3 Audio" )];
- /* We enable the create chapters checkbox here since we are .mp4*/
- [fCreateChapterMarkers setEnabled: YES];
- /* We show the Large File (64 bit formatting) checkbox since we are .mp4
- @@ -2827,7 +2830,17 @@
- int format = [fDstFormatPopUp indexOfSelectedItem];
- int codecs = [fDstCodecsPopUp indexOfSelectedItem];
- int acodec = FormatSettings[format][codecs] & HB_ACODEC_MASK;
- -
- +
- + /*HACK: Lets setup a convenience variable to decide whether or not to allow aac hybrid (aac + ac3 passthru )*/
- + bool mp4AacAc3;
- + if (format == 0 && codecs == 2) // if mp4 and aac + aac
- + {
- + mp4AacAc3 = 1;
- + }
- + else
- + {
- + mp4AacAc3 = 0;
- + }
- /* pointer to this track's mixdown NSPopUpButton */
- NSTextField * mixdownTextField;
- NSPopUpButton * mixdownPopUp;
- @@ -2891,7 +2904,7 @@
- int layout = audio->input_channel_layout & HB_INPUT_CH_LAYOUT_DISCRETE_NO_LFE_MASK;
- /* do we want to add a mono option? */
- - if (audioCodecsSupportMono == 1) {
- + if (!mp4AacAc3 && audioCodecsSupportMono == 1) {
- NSMenuItem *menuItem = [[mixdownPopUp menu] addItemWithTitle:
- [NSString stringWithCString: hb_audio_mixdowns[0].human_readable_name]
- action: NULL keyEquivalent: @""];
- @@ -2903,7 +2916,7 @@
- /* do we want to add a stereo option? */
- /* offer stereo if we have a mono source and non-mono-supporting codecs, as otherwise we won't have a mixdown at all */
- /* also offer stereo if we have a stereo-or-better source */
- - if ((layout == HB_INPUT_CH_LAYOUT_MONO && audioCodecsSupportMono == 0) || layout >= HB_INPUT_CH_LAYOUT_STEREO) {
- + if ((!mp4AacAc3 && ((layout == HB_INPUT_CH_LAYOUT_MONO && audioCodecsSupportMono == 0) || layout >= HB_INPUT_CH_LAYOUT_STEREO))) {
- NSMenuItem *menuItem = [[mixdownPopUp menu] addItemWithTitle:
- [NSString stringWithCString: hb_audio_mixdowns[1].human_readable_name]
- action: NULL keyEquivalent: @""];
- @@ -2913,7 +2926,7 @@
- }
- /* do we want to add a dolby surround (DPL1) option? */
- - if (layout == HB_INPUT_CH_LAYOUT_3F1R || layout == HB_INPUT_CH_LAYOUT_3F2R || layout == HB_INPUT_CH_LAYOUT_DOLBY) {
- + if (!mp4AacAc3 && (layout == HB_INPUT_CH_LAYOUT_3F1R || layout == HB_INPUT_CH_LAYOUT_3F2R || layout == HB_INPUT_CH_LAYOUT_DOLBY)) {
- NSMenuItem *menuItem = [[mixdownPopUp menu] addItemWithTitle:
- [NSString stringWithCString: hb_audio_mixdowns[2].human_readable_name]
- action: NULL keyEquivalent: @""];
- @@ -2923,7 +2936,7 @@
- }
- /* do we want to add a dolby pro logic 2 (DPL2) option? */
- - if (layout == HB_INPUT_CH_LAYOUT_3F2R) {
- + if (!mp4AacAc3 && layout == HB_INPUT_CH_LAYOUT_3F2R) {
- NSMenuItem *menuItem = [[mixdownPopUp menu] addItemWithTitle:
- [NSString stringWithCString: hb_audio_mixdowns[3].human_readable_name]
- action: NULL keyEquivalent: @""];
- @@ -2933,7 +2946,7 @@
- }
- /* do we want to add a 6-channel discrete option? */
- - if (audioCodecsSupport6Ch == 1 && layout == HB_INPUT_CH_LAYOUT_3F2R && (audio->input_channel_layout & HB_INPUT_CH_LAYOUT_HAS_LFE)) {
- + if (!mp4AacAc3 && (audioCodecsSupport6Ch == 1 && layout == HB_INPUT_CH_LAYOUT_3F2R && (audio->input_channel_layout & HB_INPUT_CH_LAYOUT_HAS_LFE))) {
- NSMenuItem *menuItem = [[mixdownPopUp menu] addItemWithTitle:
- [NSString stringWithCString: hb_audio_mixdowns[4].human_readable_name]
- action: NULL keyEquivalent: @""];
- @@ -2943,7 +2956,7 @@
- }
- /* do we want to add an AC-3 passthrough option? */
- - if (audio->codec == HB_ACODEC_AC3) {
- + if (mp4AacAc3 && audio->codec == HB_ACODEC_AC3) {
- NSMenuItem *menuItem = [[mixdownPopUp menu] addItemWithTitle:
- [NSString stringWithCString: hb_audio_mixdowns[5].human_readable_name]
- action: NULL keyEquivalent: @""];
- @@ -2953,7 +2966,7 @@
- }
- /* do we want to add the DPLII+AC3 passthrough option? */
- - if (audio->codec == HB_ACODEC_AC3) {
- + if (mp4AacAc3 && audio->codec == HB_ACODEC_AC3) {
- NSMenuItem *menuItem = [[mixdownPopUp menu] addItemWithTitle:
- [NSString stringWithCString: hb_audio_mixdowns[6].human_readable_name]
- action: NULL keyEquivalent: @""];
advertising
Update the Post
Either update this post and resubmit it with changes, or make a new post.
You may also comment on this post.
Please note that information posted here will expire by default in one month. If you do not want it to expire, please set the expiry time above. If it is set to expire, web search engines will not be allowed to index it prior to it expiring. Items that are not marked to expire will be indexable by search engines. Be careful with your passwords. All illegal activities will be reported and any information will be handed over to the authorities, so be good.