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
9fef3403
Commit
9fef3403
authored
Aug 06, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use pi_vlc_chan_order_wg4
parent
12627b88
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
25 deletions
+6
-25
modules/audio_output/directx.c
modules/audio_output/directx.c
+2
-4
modules/audio_output/waveout.c
modules/audio_output/waveout.c
+2
-4
modules/audio_output/windows_audio_common.h
modules/audio_output/windows_audio_common.h
+0
-5
modules/mux/wav.c
modules/mux/wav.c
+2
-12
No files found.
modules/audio_output/directx.c
View file @
9fef3403
...
@@ -820,11 +820,9 @@ static int CreateDSBuffer( audio_output_t *p_aout, int i_format,
...
@@ -820,11 +820,9 @@ static int CreateDSBuffer( audio_output_t *p_aout, int i_format,
/* First set the sound buffer format */
/* First set the sound buffer format */
waveformat
.
dwChannelMask
=
0
;
waveformat
.
dwChannelMask
=
0
;
for
(
i
=
0
;
i
<
sizeof
(
pi_channels_src
)
/
sizeof
(
uint32_t
);
i
++
)
for
(
unsigned
i
=
0
;
pi_vlc_chan_order_wg4
[
i
];
i
++
)
{
if
(
i_channels
&
pi_vlc_chan_order_wg4
[
i
]
)
if
(
i_channels
&
pi_channels_src
[
i
]
)
waveformat
.
dwChannelMask
|=
pi_channels_in
[
i
];
waveformat
.
dwChannelMask
|=
pi_channels_in
[
i
];
}
switch
(
i_format
)
switch
(
i_format
)
{
{
...
...
modules/audio_output/waveout.c
View file @
9fef3403
...
@@ -603,11 +603,9 @@ static int OpenWaveOut( audio_output_t *p_aout, uint32_t i_device_id, int i_form
...
@@ -603,11 +603,9 @@ static int OpenWaveOut( audio_output_t *p_aout, uint32_t i_device_id, int i_form
#define waveformat p_aout->sys->waveformat
#define waveformat p_aout->sys->waveformat
waveformat
.
dwChannelMask
=
0
;
waveformat
.
dwChannelMask
=
0
;
for
(
unsigned
i
=
0
;
i
<
sizeof
(
pi_channels_src
)
/
sizeof
(
uint32_t
);
i
++
)
for
(
unsigned
i
=
0
;
pi_vlc_chan_order_wg4
[
i
];
i
++
)
{
if
(
i_channels
&
pi_vlc_chan_order_wg4
[
i
]
)
if
(
i_channels
&
pi_channels_src
[
i
]
)
waveformat
.
dwChannelMask
|=
pi_channels_in
[
i
];
waveformat
.
dwChannelMask
|=
pi_channels_in
[
i
];
}
switch
(
i_format
)
switch
(
i_format
)
{
{
...
...
modules/audio_output/windows_audio_common.h
View file @
9fef3403
...
@@ -128,11 +128,6 @@ typedef struct {
...
@@ -128,11 +128,6 @@ typedef struct {
# define DSSPEAKER_7POINT1_WIDE DSSPEAKER_7POINT1
# define DSSPEAKER_7POINT1_WIDE DSSPEAKER_7POINT1
#endif
#endif
static
const
uint32_t
pi_channels_src
[]
=
{
AOUT_CHAN_LEFT
,
AOUT_CHAN_RIGHT
,
AOUT_CHAN_MIDDLELEFT
,
AOUT_CHAN_MIDDLERIGHT
,
AOUT_CHAN_REARLEFT
,
AOUT_CHAN_REARRIGHT
,
AOUT_CHAN_REARCENTER
,
AOUT_CHAN_CENTER
,
AOUT_CHAN_LFE
,
0
};
static
const
uint32_t
pi_channels_in
[]
=
static
const
uint32_t
pi_channels_in
[]
=
{
SPEAKER_FRONT_LEFT
,
SPEAKER_FRONT_RIGHT
,
{
SPEAKER_FRONT_LEFT
,
SPEAKER_FRONT_RIGHT
,
SPEAKER_SIDE_LEFT
,
SPEAKER_SIDE_RIGHT
,
SPEAKER_SIDE_LEFT
,
SPEAKER_SIDE_RIGHT
,
...
...
modules/mux/wav.c
View file @
9fef3403
...
@@ -79,12 +79,6 @@ struct sout_mux_sys_t
...
@@ -79,12 +79,6 @@ struct sout_mux_sys_t
int
pi_chan_table
[
AOUT_CHAN_MAX
];
int
pi_chan_table
[
AOUT_CHAN_MAX
];
};
};
static
const
uint32_t
pi_channels_src
[]
=
{
AOUT_CHAN_LEFT
,
AOUT_CHAN_RIGHT
,
AOUT_CHAN_MIDDLELEFT
,
AOUT_CHAN_MIDDLERIGHT
,
AOUT_CHAN_REARLEFT
,
AOUT_CHAN_REARRIGHT
,
AOUT_CHAN_REARCENTER
,
AOUT_CHAN_CENTER
,
AOUT_CHAN_LFE
,
0
};
static
const
uint32_t
pi_channels_in
[]
=
static
const
uint32_t
pi_channels_in
[]
=
{
WAVE_SPEAKER_FRONT_LEFT
,
WAVE_SPEAKER_FRONT_RIGHT
,
{
WAVE_SPEAKER_FRONT_LEFT
,
WAVE_SPEAKER_FRONT_RIGHT
,
WAVE_SPEAKER_SIDE_LEFT
,
WAVE_SPEAKER_SIDE_RIGHT
,
WAVE_SPEAKER_SIDE_LEFT
,
WAVE_SPEAKER_SIDE_RIGHT
,
...
@@ -187,13 +181,9 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
...
@@ -187,13 +181,9 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
p_sys
->
i_channel_mask
=
0
;
p_sys
->
i_channel_mask
=
0
;
if
(
p_input
->
p_fmt
->
audio
.
i_physical_channels
)
if
(
p_input
->
p_fmt
->
audio
.
i_physical_channels
)
{
{
unsigned
int
i
;
for
(
unsigned
i
=
0
;
i
<
pi_vlc_chan_order_wg4
[
i
];
i
++
)
if
(
p_input
->
p_fmt
->
audio
.
i_physical_channels
&
pi_vlc_chan_order_wg4
[
i
])
for
(
i
=
0
;
i
<
sizeof
(
pi_channels_in
)
/
sizeof
(
uint32_t
);
i
++
)
{
if
(
p_input
->
p_fmt
->
audio
.
i_physical_channels
&
pi_channels_src
[
i
])
p_sys
->
i_channel_mask
|=
pi_channels_in
[
i
];
p_sys
->
i_channel_mask
|=
pi_channels_in
[
i
];
}
p_sys
->
b_chan_reorder
=
p_sys
->
b_chan_reorder
=
aout_CheckChannelReorder
(
pi_channels_in
,
pi_channels_out
,
aout_CheckChannelReorder
(
pi_channels_in
,
pi_channels_out
,
...
...
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