Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
fa396d19
Commit
fa396d19
authored
Jun 18, 2013
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
auhal: fix wrong analog 5.1 channel ordering (close #8589)
parent
3380e1d4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
modules/audio_output/auhal.c
modules/audio_output/auhal.c
+8
-5
No files found.
modules/audio_output/auhal.c
View file @
fa396d19
...
@@ -570,6 +570,7 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
...
@@ -570,6 +570,7 @@ 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
...
@@ -622,14 +623,16 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
...
@@ -622,14 +623,16 @@ 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
))
{
new_layout
.
mChannelLayoutTag
=
kAudioChannelLayoutTag_DVD_20
;
// L R Ls Rs C LFE
/* note: for some reason, kAudioChannelLayoutTag_DVD_20, which would not require channel reordering,
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_
REARLEFT
;
chans_out
[
2
]
=
AOUT_CHAN_
CENTER
;
chans_out
[
3
]
=
AOUT_CHAN_
REARRIGHT
;
chans_out
[
3
]
=
AOUT_CHAN_
LFE
;
chans_out
[
4
]
=
AOUT_CHAN_
CENTER
;
chans_out
[
4
]
=
AOUT_CHAN_
REARLEFT
;
chans_out
[
5
]
=
AOUT_CHAN_
LFE
;
chans_out
[
5
]
=
AOUT_CHAN_
REARRIGHT
;
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment