Commit 1fa04037 authored by David Fuhrmann's avatar David Fuhrmann

Revert "auhal: fix wrong analog 5.1 channel ordering (close #8589)"

This is superseded by a proper fix.
This reverts commit fa396d19.
parent 12430404
...@@ -605,7 +605,6 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt) ...@@ -605,7 +605,6 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
memset (&new_layout, 0, sizeof(new_layout)); memset (&new_layout, 0, sizeof(new_layout));
uint32_t chans_out[AOUT_CHAN_MAX]; uint32_t chans_out[AOUT_CHAN_MAX];
memset(&chans_out, 0, sizeof(chans_out));
/* Some channel abbreviations used below: /* Some channel abbreviations used below:
* L - left * L - left
...@@ -658,16 +657,14 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt) ...@@ -658,16 +657,14 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
break; break;
case 6: case 6:
if (fmt->i_physical_channels & (AOUT_CHAN_LFE)) { if (fmt->i_physical_channels & (AOUT_CHAN_LFE)) {
/* note: for some reason, kAudioChannelLayoutTag_DVD_20, which would not require channel reordering, new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_DVD_20; // L R Ls Rs C LFE
does not work anymore */
new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_AudioUnit_5_1; // L R C LFE Ls Rs
chans_out[0] = AOUT_CHAN_LEFT; chans_out[0] = AOUT_CHAN_LEFT;
chans_out[1] = AOUT_CHAN_RIGHT; chans_out[1] = AOUT_CHAN_RIGHT;
chans_out[2] = AOUT_CHAN_CENTER; chans_out[2] = AOUT_CHAN_REARLEFT;
chans_out[3] = AOUT_CHAN_LFE; chans_out[3] = AOUT_CHAN_REARRIGHT;
chans_out[4] = AOUT_CHAN_REARLEFT; chans_out[4] = AOUT_CHAN_CENTER;
chans_out[5] = AOUT_CHAN_REARRIGHT; chans_out[5] = AOUT_CHAN_LFE;
p_aout->sys->chans_to_reorder = aout_CheckChannelReorder(NULL, chans_out, fmt->i_physical_channels, p_aout->sys->chan_table); p_aout->sys->chans_to_reorder = aout_CheckChannelReorder(NULL, chans_out, fmt->i_physical_channels, p_aout->sys->chan_table);
if (p_aout->sys->chans_to_reorder) if (p_aout->sys->chans_to_reorder)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment