Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
72610fff
Commit
72610fff
authored
Jan 02, 2003
by
Jon Lech Johansen
Browse files
* ./modules/gui/macosx/aout.m: added support for 4 Channel PCM.
parent
2216d29e
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/gui/macosx/aout.m
View file @
72610fff
...
...
@@ -2,7 +2,7 @@
* aout.m: CoreAudio output plugin
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: aout.m,v 1.1
7
2003/01/0
1 11:14:50
jlj Exp $
* $Id: aout.m,v 1.1
8
2003/01/0
2 22:49:19
jlj Exp $
*
* Authors: Colin Delacroix
<colin
@
zoy.org
>
* Jon Lech Johansen
<jon-vl
@
nanocrew.net
>
...
...
@@ -48,7 +48,8 @@ enum AudioDeviceClass
{
AudioDeviceClassA52 = 1
<
<
0,
AudioDeviceClassPCM2 =
1
<<
1,
AudioDeviceClassPCM6 =
1
<<
2
AudioDeviceClassPCM4 =
1
<<
2,
AudioDeviceClassPCM6 =
1
<<
3
};
static
struct
aout_class_t
...
...
@@ -81,6 +82,13 @@ aout_classes[] =
"
Stereo
PCM
"
},
{
kAudioFormatLinearPCM
,
4,
AudioDeviceClassPCM4
,
"4
Channel
PCM
"
},
{
kAudioFormatLinearPCM
,
6,
...
...
@@ -288,17 +296,23 @@ int E_(OpenAudio)( vlc_object_t * p_this )
case kAudioFormatLinearPCM:
p_aout->output.output.i_format = VLC_FOURCC('f','l','3','2');
if( p_sys->stream_format.mChannelsPerFrame
<
6
)
if( p_sys->stream_format.mChannelsPerFrame
==
6 )
{
p_aout->output.output.i_physical_channels =
AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
AOUT_CHAN_CENTER | AOUT_CHAN_REARRIGHT |
AOUT_CHAN_REARLEFT | AOUT_CHAN_LFE;
}
else
else
if( p_sys->stream_format.mChannelsPerFrame == 4 )
{
p_aout->output.output.i_physical_channels =
AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
AOUT_CHAN_CENTER | AOUT_CHAN_REARRIGHT |
AOUT_CHAN_REARLEFT | AOUT_CHAN_LFE;
AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
}
else
{
p_aout->output.output.i_physical_channels =
AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
}
p_aout->output.i_nb_samples = (int)( p_sys->i_buffer_size /
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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