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
76d02025
Commit
76d02025
authored
Jan 15, 2008
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Patch by Jilles Tjoelker: Fix ALSA thread deadlock if trying to kill it before start time is known.
parent
765078f3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
modules/audio_output/alsa.c
modules/audio_output/alsa.c
+5
-1
No files found.
modules/audio_output/alsa.c
View file @
76d02025
...
...
@@ -762,10 +762,13 @@ static int ALSAThread( aout_instance_t * p_aout )
/* Wait for the exact time to start playing (avoids resampling) */
vlc_mutex_lock
(
&
p_sys
->
lock
);
while
(
!
p_sys
->
start_date
)
while
(
!
p_sys
->
start_date
&&
!
p_aout
->
b_die
)
vlc_cond_wait
(
&
p_sys
->
wait
,
&
p_sys
->
lock
);
vlc_mutex_unlock
(
&
p_sys
->
lock
);
if
(
p_aout
->
b_die
)
goto
cleanup
;
mwait
(
p_sys
->
start_date
-
AOUT_PTS_TOLERANCE
/
4
);
while
(
!
p_aout
->
b_die
)
...
...
@@ -773,6 +776,7 @@ static int ALSAThread( aout_instance_t * p_aout )
ALSAFill
(
p_aout
);
}
cleanup:
snd_pcm_drop
(
p_sys
->
p_snd_pcm
);
free
(
p_aout
->
output
.
p_sys
->
p_status
);
return
0
;
...
...
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