Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
9ea08de4
Commit
9ea08de4
authored
Jul 25, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PulseAudio: do not alter format until successful probing
parent
8aebaee4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
7 deletions
+9
-7
modules/audio_output/pulse.c
modules/audio_output/pulse.c
+9
-7
No files found.
modules/audio_output/pulse.c
View file @
9ea08de4
...
...
@@ -493,21 +493,22 @@ static int Open(vlc_object_t *obj)
/* Sample format specification */
struct
pa_sample_spec
ss
;
vlc_fourcc_t
format
=
aout
->
format
.
i_format
;
switch
(
aout
->
format
.
i_
format
)
switch
(
format
)
{
case
VLC_CODEC_F64B
:
aout
->
format
.
i_
format
=
VLC_CODEC_F32B
;
format
=
VLC_CODEC_F32B
;
case
VLC_CODEC_F32B
:
ss
.
format
=
PA_SAMPLE_FLOAT32BE
;
break
;
case
VLC_CODEC_F64L
:
aout
->
format
.
i_
format
=
VLC_CODEC_F32L
;
format
=
VLC_CODEC_F32L
;
case
VLC_CODEC_F32L
:
ss
.
format
=
PA_SAMPLE_FLOAT32LE
;
break
;
case
VLC_CODEC_FI32
:
aout
->
format
.
i_
format
=
VLC_CODEC_FL32
;
format
=
VLC_CODEC_FL32
;
ss
.
format
=
PA_SAMPLE_FLOAT32NE
;
break
;
case
VLC_CODEC_S32B
:
...
...
@@ -529,19 +530,19 @@ static int Open(vlc_object_t *obj)
ss
.
format
=
PA_SAMPLE_S16LE
;
break
;
case
VLC_CODEC_S8
:
aout
->
format
.
i_
format
=
VLC_CODEC_U8
;
format
=
VLC_CODEC_U8
;
case
VLC_CODEC_U8
:
ss
.
format
=
PA_SAMPLE_U8
;
break
;
default:
if
(
HAVE_FPU
)
{
aout
->
format
.
i_
format
=
VLC_CODEC_FL32
;
format
=
VLC_CODEC_FL32
;
ss
.
format
=
PA_SAMPLE_FLOAT32NE
;
}
else
{
aout
->
format
.
i_
format
=
VLC_CODEC_S16N
;
format
=
VLC_CODEC_S16N
;
ss
.
format
=
PA_SAMPLE_S16NE
;
}
break
;
...
...
@@ -678,6 +679,7 @@ static int Open(vlc_object_t *obj)
stream_moved_cb
(
s
,
aout
);
vlc_pa_unlock
();
aout
->
format
.
i_format
=
format
;
aout
->
pf_play
=
Play
;
aout
->
pf_pause
=
Pause
;
aout
->
pf_volume_set
=
VolumeSet
;
...
...
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