RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

cocoa_common: fix deadlock 

After rebasing my dev branch it turned out that  the code deadlocked on
recursive calls of `vo_control`. Make the locking code a little bit smarter
by making always skip locking/unlocking if we are executing a chunck of
code that is already synchronized with `dispatch_sync`.
This commit is contained in:
Stefano Pigozzi 2013-09-28 14:53:55 +02:00
parent 67d87d36d5
commit 73808cd8f0
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
video/out/cocoa_common.m
View File

@ -353,8 +353,7 @@ static void vo_cocoa_resize_redraw(struct vo *vo, int width, int height)
if (!s->resize_redraw)
return;
if (!s->inside_sync_section)
vo_cocoa_set_current_context(vo, true);
vo_cocoa_set_current_context(vo, true);
[s->gl_ctx update];
@ -367,9 +366,7 @@ static void vo_cocoa_resize_redraw(struct vo *vo, int width, int height)
}
[s->gl_ctx flushBuffer];
if (!s->inside_sync_section)
vo_cocoa_set_current_context(vo, false);
vo_cocoa_set_current_context(vo, false);
}
int vo_cocoa_config_window(struct vo *vo, uint32_t d_width,
@ -428,6 +425,11 @@ int vo_cocoa_config_window(struct vo *vo, uint32_t d_width,
void vo_cocoa_set_current_context(struct vo *vo, bool current)
{
struct vo_cocoa_state *s = vo->cocoa;
if (s->inside_sync_section) {
return;
}
if (current) {
[s->lock lock];
[s->gl_ctx makeCurrentContext];