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
2e497105
Commit
2e497105
authored
Mar 22, 2014
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
auhal: always do a final format check in stream change function
parent
2e4af369
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
modules/audio_output/auhal.c
modules/audio_output/auhal.c
+6
-3
No files found.
modules/audio_output/auhal.c
View file @
2e497105
...
...
@@ -1899,6 +1899,12 @@ static int AudioStreamChangeFormat(audio_output_t *p_aout, AudioStreamID i_strea
UInt32
i_param_size
=
sizeof
(
AudioStreamBasicDescription
);
for
(
int
i
=
0
;
i
<
5
;
i
++
)
{
/* Callback is not always invoked. So first check if format is already set. */
if
(
i
>
0
)
{
mtime_t
timeout
=
mdate
()
+
500000
;
if
(
vlc_cond_timedwait
(
&
w
.
cond
,
&
w
.
lock
,
timeout
))
msg_Dbg
(
p_aout
,
"reached timeout"
);
}
err
=
AudioObjectGetPropertyData
(
i_stream_id
,
&
physicalFormatAddress
,
0
,
NULL
,
&
i_param_size
,
&
actual_format
);
msg_Dbg
(
p_aout
,
STREAM_FORMAT_MSG
(
"actual format in use: "
,
actual_format
));
...
...
@@ -1910,9 +1916,6 @@ static int AudioStreamChangeFormat(audio_output_t *p_aout, AudioStreamID i_strea
}
/* We need to check again */
mtime_t
timeout
=
mdate
()
+
500000
;
if
(
vlc_cond_timedwait
(
&
w
.
cond
,
&
w
.
lock
,
timeout
))
msg_Dbg
(
p_aout
,
"reached timeout"
);
}
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