mirror of
https://github.com/mpv-player/mpv
synced 2024-12-25 00:02:13 +00:00
d89eb74cb7
Before this change, Cocoa state was accessed from both the VO and the Cocoa main thread. This was probably not a good idea. There was some locking as well as implicit synchronization using the dispatch mechanism, but it wasn't watertight. Change this completely. Now Cocoa things are always accessed from the main thread only. The old mutex falls away, as well as the vo_cocoa_set_current_context() function, which implicitly used the lock to coordinate VO accesses. With the new code, the VO thread generally has to wait for the main thread, while the main thread never waits for the VO and rarely accesses it. Fortunately, this is rather straight forward, and most of this is achieved by making vo_cocoa_control() run on the main thread. The logic of the code does generally not change. Some aspects are trickier. Apparently we can't access the NSOpenGLContext from the VO thread, because this object is not thread- safe. We use some CGLContextObj functions instead, such as for making the context current and swapping the buffers.
41 lines
1.2 KiB
C
41 lines
1.2 KiB
C
/*
|
|
* Cocoa OpenGL Backend
|
|
*
|
|
* This file is part of mpv.
|
|
*
|
|
* mpv is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* mpv is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with mpv. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef MPLAYER_COCOA_COMMON_H
|
|
#define MPLAYER_COCOA_COMMON_H
|
|
|
|
#include <stdbool.h>
|
|
#include <stdint.h>
|
|
#include <OpenGL/OpenGL.h>
|
|
|
|
struct vo;
|
|
struct vo_cocoa_state;
|
|
|
|
int vo_cocoa_init(struct vo *vo);
|
|
void vo_cocoa_uninit(struct vo *vo);
|
|
|
|
int vo_cocoa_config_window(struct vo *vo, uint32_t flags);
|
|
|
|
int vo_cocoa_control(struct vo *vo, int *events, int request, void *arg);
|
|
|
|
void vo_cocoa_swap_buffers(struct vo *vo);
|
|
void vo_cocoa_set_opengl_ctx(struct vo *vo, CGLContextObj ctx);
|
|
|
|
#endif /* MPLAYER_COCOA_COMMON_H */
|