mirror of https://github.com/mpv-player/mpv
OSX, input: implement wakeup in response to Cocoa events
Add code to wake up the select() call in input.c when an OSX event is
available and a Cocoa OpenGL backend is initialized.
Fixes the slow response to input or other events in Cocoa-based VOs
during long select() sleeps (e.g., when mplayer2 is paused) introduced
by commit 7040968
.
This commit is contained in:
parent
9646208cc6
commit
86790494d3
1
Makefile
1
Makefile
|
@ -100,6 +100,7 @@ SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \
|
||||||
libmpdemux/demux_rtp_codec.cpp \
|
libmpdemux/demux_rtp_codec.cpp \
|
||||||
stream/stream_live555.c
|
stream/stream_live555.c
|
||||||
SRCS_COMMON-$(MACOSX_FINDER) += osdep/macosx_finder_args.m
|
SRCS_COMMON-$(MACOSX_FINDER) += osdep/macosx_finder_args.m
|
||||||
|
SRCS_COMMON-$(COCOA) += osdep/cocoa_events.m
|
||||||
SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c
|
SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c
|
||||||
SRCS_COMMON-$(MPG123) += libmpcodecs/ad_mpg123.c
|
SRCS_COMMON-$(MPG123) += libmpcodecs/ad_mpg123.c
|
||||||
|
|
||||||
|
|
|
@ -4205,6 +4205,9 @@ EOF
|
||||||
fi
|
fi
|
||||||
if test "$_cocoa" = yes ; then
|
if test "$_cocoa" = yes ; then
|
||||||
libs_mplayer="$libs_mplayer -framework Cocoa -framework OpenGL"
|
libs_mplayer="$libs_mplayer -framework Cocoa -framework OpenGL"
|
||||||
|
def_cocoa='#define CONFIG_COCOA 1'
|
||||||
|
else
|
||||||
|
def_cocoa='#undef CONFIG_COCOA'
|
||||||
fi
|
fi
|
||||||
echores "$_cocoa"
|
echores "$_cocoa"
|
||||||
|
|
||||||
|
@ -6383,6 +6386,7 @@ BL = $_bl
|
||||||
CACA = $_caca
|
CACA = $_caca
|
||||||
CDDA = $_cdda
|
CDDA = $_cdda
|
||||||
CDDB = $_cddb
|
CDDB = $_cddb
|
||||||
|
COCOA = $_cocoa
|
||||||
COREAUDIO = $_coreaudio
|
COREAUDIO = $_coreaudio
|
||||||
COREVIDEO = $_corevideo
|
COREVIDEO = $_corevideo
|
||||||
SHAREDBUFFER = $_sharedbuffer
|
SHAREDBUFFER = $_sharedbuffer
|
||||||
|
@ -6785,6 +6789,7 @@ $def_aa
|
||||||
$def_bl
|
$def_bl
|
||||||
$def_caca
|
$def_caca
|
||||||
$def_corevideo
|
$def_corevideo
|
||||||
|
$def_cocoa
|
||||||
$def_sharedbuffer
|
$def_sharedbuffer
|
||||||
$def_dga
|
$def_dga
|
||||||
$def_dga1
|
$def_dga1
|
||||||
|
|
|
@ -59,6 +59,10 @@
|
||||||
|
|
||||||
#include "ar.h"
|
#include "ar.h"
|
||||||
|
|
||||||
|
#ifdef CONFIG_COCOA
|
||||||
|
#include "osdep/cocoa_events.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#define MP_MAX_KEY_DOWN 32
|
#define MP_MAX_KEY_DOWN 32
|
||||||
|
|
||||||
struct cmd_bind {
|
struct cmd_bind {
|
||||||
|
@ -1436,7 +1440,7 @@ static void read_events(struct input_ctx *ictx, int time)
|
||||||
* every source until it's known to be empty. Instead we use this wrapper
|
* every source until it's known to be empty. Instead we use this wrapper
|
||||||
* to run select() again.
|
* to run select() again.
|
||||||
*/
|
*/
|
||||||
static void read_all_events(struct input_ctx *ictx, int time)
|
static void read_all_fd_events(struct input_ctx *ictx, int time)
|
||||||
{
|
{
|
||||||
while (1) {
|
while (1) {
|
||||||
read_events(ictx, time);
|
read_events(ictx, time);
|
||||||
|
@ -1446,6 +1450,15 @@ static void read_all_events(struct input_ctx *ictx, int time)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void read_all_events(struct input_ctx *ictx, int time)
|
||||||
|
{
|
||||||
|
#ifdef CONFIG_COCOA
|
||||||
|
cocoa_events_read_all_events(ictx, time);
|
||||||
|
#else
|
||||||
|
read_all_fd_events(ictx, time);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
int mp_input_queue_cmd(struct input_ctx *ictx, mp_cmd_t *cmd)
|
int mp_input_queue_cmd(struct input_ctx *ictx, mp_cmd_t *cmd)
|
||||||
{
|
{
|
||||||
ictx->got_new_events = true;
|
ictx->got_new_events = true;
|
||||||
|
@ -1743,6 +1756,10 @@ struct input_ctx *mp_input_init(struct input_conf *input_conf)
|
||||||
.wakeup_pipe = {-1, -1},
|
.wakeup_pipe = {-1, -1},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#ifdef CONFIG_COCOA
|
||||||
|
cocoa_events_init(ictx, read_all_fd_events);
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef __MINGW32__
|
#ifndef __MINGW32__
|
||||||
long ret = pipe(ictx->wakeup_pipe);
|
long ret = pipe(ictx->wakeup_pipe);
|
||||||
for (int i = 0; i < 2 && ret >= 0; i++) {
|
for (int i = 0; i < 2 && ret >= 0; i++) {
|
||||||
|
@ -1848,11 +1865,16 @@ struct input_ctx *mp_input_init(struct input_conf *input_conf)
|
||||||
mp_tmsg(MSGT_INPUT, MSGL_ERR, "Can't open %s: %s\n",
|
mp_tmsg(MSGT_INPUT, MSGL_ERR, "Can't open %s: %s\n",
|
||||||
input_conf->in_file, strerror(errno));
|
input_conf->in_file, strerror(errno));
|
||||||
}
|
}
|
||||||
|
|
||||||
return ictx;
|
return ictx;
|
||||||
}
|
}
|
||||||
|
|
||||||
void mp_input_uninit(struct input_ctx *ictx)
|
void mp_input_uninit(struct input_ctx *ictx)
|
||||||
{
|
{
|
||||||
|
#ifdef CONFIG_COCOA
|
||||||
|
cocoa_events_uninit();
|
||||||
|
#endif
|
||||||
|
|
||||||
if (!ictx)
|
if (!ictx)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,8 @@
|
||||||
|
|
||||||
#include "video_out.h"
|
#include "video_out.h"
|
||||||
|
|
||||||
|
bool vo_cocoa_gui_running(void);
|
||||||
|
|
||||||
int vo_cocoa_init(struct vo *vo);
|
int vo_cocoa_init(struct vo *vo);
|
||||||
void vo_cocoa_uninit(struct vo *vo);
|
void vo_cocoa_uninit(struct vo *vo);
|
||||||
|
|
||||||
|
|
|
@ -112,6 +112,11 @@ struct vo_cocoa_state *vo_cocoa_init_state(void)
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool vo_cocoa_gui_running(void)
|
||||||
|
{
|
||||||
|
return !!s;
|
||||||
|
}
|
||||||
|
|
||||||
int vo_cocoa_init(struct vo *vo)
|
int vo_cocoa_init(struct vo *vo)
|
||||||
{
|
{
|
||||||
s = vo_cocoa_init_state();
|
s = vo_cocoa_init_state();
|
||||||
|
@ -137,6 +142,7 @@ void vo_cocoa_uninit(struct vo *vo)
|
||||||
s->pool = nil;
|
s->pool = nil;
|
||||||
|
|
||||||
talloc_free(s);
|
talloc_free(s);
|
||||||
|
s = nil;
|
||||||
}
|
}
|
||||||
|
|
||||||
void update_screen_info(void)
|
void update_screen_info(void)
|
||||||
|
|
|
@ -0,0 +1,30 @@
|
||||||
|
/*
|
||||||
|
* Cocoa Event Handling
|
||||||
|
*
|
||||||
|
* This file is part of mplayer2.
|
||||||
|
*
|
||||||
|
* mplayer2 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.
|
||||||
|
*
|
||||||
|
* mplayer2 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 mplayer2. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef MPLAYER_COCOA_EVENTS_H
|
||||||
|
#define MPLAYER_COCOA_EVENTS_H
|
||||||
|
|
||||||
|
#include "input/input.h"
|
||||||
|
|
||||||
|
void cocoa_events_init(struct input_ctx *ictx,
|
||||||
|
void (*read_all_fd_events)(struct input_ctx *ictx, int time));
|
||||||
|
void cocoa_events_uninit(void);
|
||||||
|
void cocoa_events_read_all_events(struct input_ctx *ictx, int time);
|
||||||
|
|
||||||
|
#endif /* MPLAYER_COCOA_EVENTS_H */
|
|
@ -0,0 +1,137 @@
|
||||||
|
/*
|
||||||
|
* Cocoa Event Handling
|
||||||
|
*
|
||||||
|
* This file is part of mplayer2.
|
||||||
|
*
|
||||||
|
* mplayer2 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.
|
||||||
|
*
|
||||||
|
* mplayer2 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 mplayer2. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Implementation details:
|
||||||
|
* This file deals with custom event polling on MacOSX. When mplayer2 is paused
|
||||||
|
* it will asynchronously poll for events using select. This works correctly on
|
||||||
|
* Linux with X11 since the events are notified through the file descriptors
|
||||||
|
* where mplayer2 is listening on. On the other hand, the OSX window server
|
||||||
|
* notifies the processes for events using mach ports.
|
||||||
|
*
|
||||||
|
* The code below uses functionality from Cocoa that abstracts the async polling
|
||||||
|
* of events from the window server. When a Cocoa event comes in, the polling is
|
||||||
|
* interrupted and the event is dealt with in the next vo_check_events.
|
||||||
|
*
|
||||||
|
* To keep the select fd polling code working, that functionality is executed
|
||||||
|
* from another thread. Whoever finishes polling before the given time, be it
|
||||||
|
* Cocoa or the original select code, notifies the other for an immediate wake.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "cocoa_events.h"
|
||||||
|
#include "libvo/cocoa_common.h"
|
||||||
|
#include "talloc.h"
|
||||||
|
|
||||||
|
#import <Cocoa/Cocoa.h>
|
||||||
|
#include <dispatch/dispatch.h>
|
||||||
|
|
||||||
|
// Bogus event subtype to wake the Cocoa code from polling state
|
||||||
|
#define MP_EVENT_SUBTYPE_WAKE_EVENTLOOP 100
|
||||||
|
|
||||||
|
// This is the threshold in milliseconds below which the Cocoa polling is not
|
||||||
|
// executed. There is some overhead caused by the synchronization between
|
||||||
|
// threads. Even if in practice it isn't noticeable, we try to avoid the useless
|
||||||
|
// waste of resources.
|
||||||
|
#define MP_ASYNC_THRESHOLD 50
|
||||||
|
|
||||||
|
struct priv {
|
||||||
|
dispatch_queue_t select_queue;
|
||||||
|
bool is_runloop_polling;
|
||||||
|
void (*read_all_fd_events)(struct input_ctx *ictx, int time);
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct priv *p;
|
||||||
|
|
||||||
|
static void cocoa_wait_events(int mssleeptime)
|
||||||
|
{
|
||||||
|
NSTimeInterval sleeptime = mssleeptime / 1000.0;
|
||||||
|
NSEvent *event;
|
||||||
|
p->is_runloop_polling = YES;
|
||||||
|
event = [NSApp nextEventMatchingMask:NSAnyEventMask
|
||||||
|
untilDate:[NSDate dateWithTimeIntervalSinceNow:sleeptime]
|
||||||
|
inMode:NSEventTrackingRunLoopMode dequeue:NO];
|
||||||
|
|
||||||
|
// dequeue the next event if it is a fake to wake the cocoa polling
|
||||||
|
if (event && [event type] == NSApplicationDefined &&
|
||||||
|
[event subtype] == MP_EVENT_SUBTYPE_WAKE_EVENTLOOP) {
|
||||||
|
[NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil
|
||||||
|
inMode:NSEventTrackingRunLoopMode dequeue:YES];
|
||||||
|
}
|
||||||
|
p->is_runloop_polling = NO;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void cocoa_wake_runloop()
|
||||||
|
{
|
||||||
|
if (p->is_runloop_polling) {
|
||||||
|
NSAutoreleasePool *pool = [NSAutoreleasePool new];
|
||||||
|
NSEvent *event;
|
||||||
|
|
||||||
|
/* Post an event so we'll wake the run loop that is async polling */
|
||||||
|
event = [NSEvent otherEventWithType: NSApplicationDefined
|
||||||
|
location: NSZeroPoint
|
||||||
|
modifierFlags: 0
|
||||||
|
timestamp: 0
|
||||||
|
windowNumber: 0
|
||||||
|
context: nil
|
||||||
|
subtype: MP_EVENT_SUBTYPE_WAKE_EVENTLOOP
|
||||||
|
data1: 0
|
||||||
|
data2: 0];
|
||||||
|
|
||||||
|
[NSApp postEvent:event atStart:NO];
|
||||||
|
[pool release];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void cocoa_events_init(struct input_ctx *ictx,
|
||||||
|
void (*read_all_fd_events)(struct input_ctx *ictx, int time))
|
||||||
|
{
|
||||||
|
NSApplicationLoad();
|
||||||
|
p = talloc_ptrtype(NULL, p);
|
||||||
|
*p = (struct priv){
|
||||||
|
.is_runloop_polling = NO,
|
||||||
|
.read_all_fd_events = read_all_fd_events,
|
||||||
|
.select_queue = dispatch_queue_create("org.mplayer2.select_queue",
|
||||||
|
NULL),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
void cocoa_events_uninit(void)
|
||||||
|
{
|
||||||
|
talloc_free(p);
|
||||||
|
}
|
||||||
|
|
||||||
|
void cocoa_events_read_all_events(struct input_ctx *ictx, int time)
|
||||||
|
{
|
||||||
|
// don't bother delegating the select to the async queue if the blocking
|
||||||
|
// time is really low or if we are not running a GUI
|
||||||
|
if (time > MP_ASYNC_THRESHOLD && vo_cocoa_gui_running()) {
|
||||||
|
dispatch_async(p->select_queue, ^{
|
||||||
|
p->read_all_fd_events(ictx, time);
|
||||||
|
cocoa_wake_runloop();
|
||||||
|
});
|
||||||
|
|
||||||
|
cocoa_wait_events(time);
|
||||||
|
mp_input_wakeup(ictx);
|
||||||
|
|
||||||
|
// wait for the async queue to get empty.
|
||||||
|
dispatch_sync(p->select_queue, ^{});
|
||||||
|
} else {
|
||||||
|
p->read_all_fd_events(ictx, time);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue