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
bcd01c48
Commit
bcd01c48
authored
Dec 19, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aout: use S16N rather than S16L in audio outputs
(In practice, all of these were only used in little endian anyway.)
parent
dbbb4fad
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
15 deletions
+15
-15
modules/audio_output/audioqueue.c
modules/audio_output/audioqueue.c
+1
-1
modules/audio_output/audiotrack.c
modules/audio_output/audiotrack.c
+4
-4
modules/audio_output/directx.c
modules/audio_output/directx.c
+3
-3
modules/audio_output/kai.c
modules/audio_output/kai.c
+2
-2
modules/audio_output/opensles_android.c
modules/audio_output/opensles_android.c
+2
-2
modules/audio_output/waveout.c
modules/audio_output/waveout.c
+3
-3
No files found.
modules/audio_output/audioqueue.c
View file @
bcd01c48
...
...
@@ -108,7 +108,7 @@ static int Start(audio_output_t *p_aout, audio_sample_format_t *restrict fmt)
if
(
status
!=
noErr
)
return
VLC_EGENERIC
;
fmt
->
i_format
=
VLC_CODEC_S16
L
;
fmt
->
i_format
=
VLC_CODEC_S16
N
;
fmt
->
i_physical_channels
=
AOUT_CHANS_STEREO
;
fmt
->
i_rate
=
44100
;
aout_FormatPrepare
(
fmt
);
...
...
modules/audio_output/audiotrack.c
View file @
bcd01c48
...
...
@@ -239,10 +239,10 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
stream_type
=
MUSIC
;
/* We can only accept U8 and S16
L
*/
if
(
fmt
->
i_format
!=
VLC_CODEC_U8
&&
fmt
->
i_format
!=
VLC_CODEC_S16
L
)
fmt
->
i_format
=
VLC_CODEC_S16
L
;
format
=
(
fmt
->
i_format
==
VLC_CODEC_S16
L
)
?
PCM_16_BIT
:
PCM_8_BIT
;
/* We can only accept U8 and S16
N
*/
if
(
fmt
->
i_format
!=
VLC_CODEC_U8
&&
fmt
->
i_format
!=
VLC_CODEC_S16
N
)
fmt
->
i_format
=
VLC_CODEC_S16
N
;
format
=
(
fmt
->
i_format
==
VLC_CODEC_S16
N
)
?
PCM_16_BIT
:
PCM_8_BIT
;
/* TODO: android supports more channels */
fmt
->
i_original_channels
=
fmt
->
i_physical_channels
;
...
...
modules/audio_output/directx.c
View file @
bcd01c48
...
...
@@ -708,7 +708,7 @@ static int CreateDSBuffer( audio_output_t *p_aout, int i_format,
waveformat
.
SubFormat
=
_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT
;
break
;
case
VLC_CODEC_S16
L
:
case
VLC_CODEC_S16
N
:
waveformat
.
Format
.
wBitsPerSample
=
16
;
waveformat
.
Samples
.
wValidBitsPerSample
=
waveformat
.
Format
.
wBitsPerSample
;
...
...
@@ -816,7 +816,7 @@ static int CreateDSBufferPCM( audio_output_t *p_aout, vlc_fourcc_t *i_format,
(
i_rate
/
20
)
*
4
*
i_nb_channels
,
b_probe
)
!=
VLC_SUCCESS
)
{
if
(
CreateDSBuffer
(
p_aout
,
VLC_CODEC_S16
L
,
if
(
CreateDSBuffer
(
p_aout
,
VLC_CODEC_S16
N
,
i_channels
,
i_nb_channels
,
i_rate
,
(
i_rate
/
20
)
*
2
*
i_nb_channels
,
b_probe
)
!=
VLC_SUCCESS
)
...
...
@@ -825,7 +825,7 @@ static int CreateDSBufferPCM( audio_output_t *p_aout, vlc_fourcc_t *i_format,
}
else
{
*
i_format
=
VLC_CODEC_S16
L
;
*
i_format
=
VLC_CODEC_S16
N
;
return
VLC_SUCCESS
;
}
}
...
...
modules/audio_output/kai.c
View file @
bcd01c48
...
...
@@ -149,8 +149,8 @@ static int Start ( audio_output_t *p_aout, audio_sample_format_t *fmt )
=
AOUT_CHAN_LEFT
|
AOUT_CHAN_RIGHT
;
}
/* Support
s16l
only */
format
.
i_format
=
VLC_CODEC_S16
L
;
/* Support
S16
only */
format
.
i_format
=
VLC_CODEC_S16
N
;
aout_FormatPrepare
(
&
format
);
...
...
modules/audio_output/opensles_android.c
View file @
bcd01c48
...
...
@@ -448,8 +448,8 @@ static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )
p_sys
->
p_buffer_chain
=
NULL
;
p_sys
->
pp_buffer_last
=
&
p_sys
->
p_buffer_chain
;
// we want 16bit signed data
littl
e endian.
fmt
->
i_format
=
VLC_CODEC_S16
L
;
// we want 16bit signed data
nativ
e endian.
fmt
->
i_format
=
VLC_CODEC_S16
N
;
fmt
->
i_physical_channels
=
AOUT_CHAN_LEFT
|
AOUT_CHAN_RIGHT
;
p_aout
->
play
=
Play
;
p_aout
->
pause
=
Pause
;
...
...
modules/audio_output/waveout.c
View file @
bcd01c48
...
...
@@ -575,7 +575,7 @@ static int OpenWaveOut( audio_output_t *p_aout, uint32_t i_device_id, int i_form
waveformat
.
SubFormat
=
__KSDATAFORMAT_SUBTYPE_IEEE_FLOAT
;
break
;
case
VLC_CODEC_S16
L
:
case
VLC_CODEC_S16
N
:
waveformat
.
Format
.
wBitsPerSample
=
16
;
waveformat
.
Samples
.
wValidBitsPerSample
=
waveformat
.
Format
.
wBitsPerSample
;
...
...
@@ -675,7 +675,7 @@ static int OpenWaveOutPCM( audio_output_t *p_aout, uint32_t i_device_id,
i_channels
,
i_nb_channels
,
i_rate
,
b_probe
)
!=
VLC_SUCCESS
)
{
if
(
OpenWaveOut
(
p_aout
,
i_device_id
,
VLC_CODEC_S16
L
,
if
(
OpenWaveOut
(
p_aout
,
i_device_id
,
VLC_CODEC_S16
N
,
i_channels
,
i_nb_channels
,
i_rate
,
b_probe
)
!=
VLC_SUCCESS
)
{
...
...
@@ -683,7 +683,7 @@ static int OpenWaveOutPCM( audio_output_t *p_aout, uint32_t i_device_id,
}
else
{
*
i_format
=
VLC_CODEC_S16
L
;
*
i_format
=
VLC_CODEC_S16
N
;
return
VLC_SUCCESS
;
}
}
...
...
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