Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
cf75b314
Commit
cf75b314
authored
Oct 01, 2002
by
Christophe Massiot
Browse files
Fixed a bug in the OSS output I introduced yesterday.
parent
2aac17a6
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/audio_output/oss.c
View file @
cf75b314
...
...
@@ -2,7 +2,7 @@
* oss.c : OSS /dev/dsp module for vlc
*****************************************************************************
* Copyright (C) 2000-2002 VideoLAN
* $Id: oss.c,v 1.2
7
2002/
09/30
2
1
:3
2:32
massiot Exp $
* $Id: oss.c,v 1.2
8
2002/
10/01
2
2
:3
4:43
massiot Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
...
...
@@ -160,7 +160,7 @@ static int Open( vlc_object_t *p_this )
/* Set the output format */
if
(
p_aout
->
output
.
output
.
i_format
==
VLC_FOURCC
(
's'
,
'p'
,
'd'
,
'i'
)
)
{
i_format
=
VLC_FOURCC
(
's'
,
'p'
,
'd'
,
'i'
)
;
i_format
=
AFMT_AC3
;
p_aout
->
output
.
i_nb_samples
=
A52_FRAME_NB
;
p_aout
->
output
.
output
.
i_bytes_per_frame
=
AOUT_SPDIF_SIZE
;
p_aout
->
output
.
output
.
i_frame_length
=
A52_FRAME_NB
;
...
...
@@ -169,7 +169,8 @@ static int Open( vlc_object_t *p_this )
}
else
{
p_aout
->
output
.
output
.
i_format
=
i_format
=
AOUT_FMT_S16_NE
;
p_aout
->
output
.
output
.
i_format
=
AOUT_FMT_S16_NE
;
i_format
=
AFMT_S16_NE
;
p_aout
->
output
.
i_nb_samples
=
FRAME_SIZE
;
aout_VolumeSoftInit
(
p_aout
);
...
...
@@ -178,11 +179,12 @@ static int Open( vlc_object_t *p_this )
if
(
ioctl
(
p_sys
->
i_fd
,
SNDCTL_DSP_SETFMT
,
&
i_format
)
<
0
||
i_format
!=
p_aout
->
output
.
output
.
i_format
)
{
if
(
i_format
==
VLC_FOURCC
(
's'
,
'p'
,
'd'
,
'i'
)
)
if
(
i_format
==
AFMT_AC3
)
{
/* Retry with S16 */
msg_Warn
(
p_aout
,
"cannot set audio output format (%i)"
,
i_format
);
p_aout
->
output
.
output
.
i_format
=
i_format
=
AOUT_FMT_S16_NE
;
p_aout
->
output
.
output
.
i_format
=
AOUT_FMT_S16_NE
;
i_format
=
AFMT_S16_NE
;
p_aout
->
output
.
i_nb_samples
=
FRAME_SIZE
;
if
(
ioctl
(
p_sys
->
i_fd
,
SNDCTL_DSP_SETFMT
,
&
i_format
)
<
0
||
i_format
!=
p_aout
->
output
.
output
.
i_format
)
...
...
Write
Preview
Supports
Markdown
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