2014-02-10 20:01:35 +00:00
|
|
|
/* Permission to use, copy, modify, and/or distribute this software for any
|
|
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
|
|
* copyright notice and this permission notice appear in all copies.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stddef.h>
|
2014-04-05 21:54:21 +00:00
|
|
|
#include <stdint.h>
|
2014-02-10 20:01:35 +00:00
|
|
|
#include <stdlib.h>
|
2014-04-12 18:13:07 +00:00
|
|
|
#include <unistd.h>
|
|
|
|
#include <fcntl.h>
|
2014-02-28 23:38:17 +00:00
|
|
|
#include <errno.h>
|
2014-02-10 20:01:35 +00:00
|
|
|
#include <assert.h>
|
|
|
|
|
|
|
|
#include "common/common.h"
|
|
|
|
#include "common/msg.h"
|
|
|
|
#include "common/msg_control.h"
|
|
|
|
#include "input/input.h"
|
2014-09-13 14:52:42 +00:00
|
|
|
#include "input/cmd_list.h"
|
2014-11-23 12:40:52 +00:00
|
|
|
#include "misc/ctype.h"
|
2014-04-23 18:37:57 +00:00
|
|
|
#include "misc/dispatch.h"
|
2014-02-10 20:01:35 +00:00
|
|
|
#include "options/m_config.h"
|
|
|
|
#include "options/m_option.h"
|
|
|
|
#include "options/m_property.h"
|
2014-05-18 16:58:36 +00:00
|
|
|
#include "options/path.h"
|
|
|
|
#include "options/parse_configfile.h"
|
2014-02-10 20:01:35 +00:00
|
|
|
#include "osdep/threads.h"
|
2014-02-24 20:59:20 +00:00
|
|
|
#include "osdep/timer.h"
|
2014-04-12 18:13:07 +00:00
|
|
|
#include "osdep/io.h"
|
2014-09-13 14:52:42 +00:00
|
|
|
#include "stream/stream.h"
|
2014-02-10 20:01:35 +00:00
|
|
|
|
|
|
|
#include "command.h"
|
|
|
|
#include "core.h"
|
|
|
|
#include "client.h"
|
|
|
|
|
2014-04-12 18:13:07 +00:00
|
|
|
#include "config.h"
|
|
|
|
|
2014-04-05 21:54:21 +00:00
|
|
|
/*
|
|
|
|
* Locking hierarchy:
|
|
|
|
*
|
2014-06-08 14:11:39 +00:00
|
|
|
* MPContext > mp_client_api.lock > mpv_handle.lock > * > mpv_handle.wakeup_lock
|
2014-04-05 21:54:21 +00:00
|
|
|
*
|
2014-06-08 14:11:39 +00:00
|
|
|
* MPContext strictly speaking has no locks, and instead is implicitly managed
|
2014-04-05 21:54:21 +00:00
|
|
|
* by MPContext.dispatch, which basically stops the playback thread at defined
|
|
|
|
* points in order to let clients access it in a synchronized manner. Since
|
|
|
|
* MPContext code accesses the client API, it's on top of the lock hierarchy.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
struct mp_client_api {
|
|
|
|
struct MPContext *mpctx;
|
|
|
|
|
|
|
|
pthread_mutex_t lock;
|
|
|
|
|
|
|
|
// -- protected by lock
|
|
|
|
struct mpv_handle **clients;
|
|
|
|
int num_clients;
|
2014-08-28 15:35:50 +00:00
|
|
|
uint64_t event_masks; // combined events of all clients, or 0 if unknown
|
2014-02-10 20:01:35 +00:00
|
|
|
};
|
|
|
|
|
2014-04-05 21:54:21 +00:00
|
|
|
struct observe_property {
|
|
|
|
char *name;
|
2014-08-01 23:39:28 +00:00
|
|
|
int id; // ==mp_get_property_id(name)
|
|
|
|
uint64_t event_mask; // ==mp_get_property_event_mask(name)
|
2014-04-05 21:54:21 +00:00
|
|
|
int64_t reply_id;
|
|
|
|
mpv_format format;
|
|
|
|
bool changed; // property change should be signaled to user
|
|
|
|
bool need_new_value; // a new value should be retrieved
|
|
|
|
bool updating; // a new value is being retrieved
|
|
|
|
bool dead; // property unobserved while retrieving value
|
2014-05-17 21:59:27 +00:00
|
|
|
bool new_value_valid, user_value_valid;
|
|
|
|
union m_option_value new_value, user_value;
|
2014-04-05 21:54:21 +00:00
|
|
|
struct mpv_handle *client;
|
|
|
|
};
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
struct mpv_handle {
|
|
|
|
// -- immmutable
|
2014-11-23 12:40:52 +00:00
|
|
|
char name[MAX_CLIENT_NAME];
|
2014-06-07 13:08:45 +00:00
|
|
|
bool owner;
|
2014-02-10 20:01:35 +00:00
|
|
|
struct mp_log *log;
|
|
|
|
struct MPContext *mpctx;
|
|
|
|
struct mp_client_api *clients;
|
|
|
|
|
|
|
|
// -- not thread-safe
|
|
|
|
struct mpv_event *cur_event;
|
2014-04-05 21:54:21 +00:00
|
|
|
struct mpv_event_property cur_property_event;
|
2014-02-10 20:01:35 +00:00
|
|
|
|
|
|
|
pthread_mutex_t lock;
|
client API: restructure waiting, do log msg wakeup properly
Until now, availability of new log messages (through the mechanism
associated with mpv_request_log_messages()) did not wakeup the client
API properly. Commit 3b7402b5 was basically a hack to improve that
somewhat, but it wasn't a solution.
The main problem is that the client API itself is producing messages, so
the message callback would attempt to lock the client API lock,
resulting in a deadlock. Even if the lock was recursive, we'd run into
lock-order issues.
Solve this by using a separate lock for waiting and wakeup. Also, since
it's a natural addition, avoid redundant wakeups. This means the wakeup
callback as well as the wakeup pipe will be triggered only once until
the next mpv_wait_event() call happens.
This might make the wakeup callback be invoked in a reentrant way for
the first time, for example if a mpv_* function prints to a log. Adjust
the docs accordingly. (Note that non-reentrant beheavior was never
guaranteed - basically the wakeup callback is somewhat dangerous and
inconvenient.)
Also remove some traces of unneeded code. ctx->shutdown for one was
never set, and probably a leftover of an abandoned idea.
2014-06-07 21:15:07 +00:00
|
|
|
|
|
|
|
pthread_mutex_t wakeup_lock;
|
2014-02-10 20:01:35 +00:00
|
|
|
pthread_cond_t wakeup;
|
|
|
|
|
client API: restructure waiting, do log msg wakeup properly
Until now, availability of new log messages (through the mechanism
associated with mpv_request_log_messages()) did not wakeup the client
API properly. Commit 3b7402b5 was basically a hack to improve that
somewhat, but it wasn't a solution.
The main problem is that the client API itself is producing messages, so
the message callback would attempt to lock the client API lock,
resulting in a deadlock. Even if the lock was recursive, we'd run into
lock-order issues.
Solve this by using a separate lock for waiting and wakeup. Also, since
it's a natural addition, avoid redundant wakeups. This means the wakeup
callback as well as the wakeup pipe will be triggered only once until
the next mpv_wait_event() call happens.
This might make the wakeup callback be invoked in a reentrant way for
the first time, for example if a mpv_* function prints to a log. Adjust
the docs accordingly. (Note that non-reentrant beheavior was never
guaranteed - basically the wakeup callback is somewhat dangerous and
inconvenient.)
Also remove some traces of unneeded code. ctx->shutdown for one was
never set, and probably a leftover of an abandoned idea.
2014-06-07 21:15:07 +00:00
|
|
|
// -- protected by wakeup_lock
|
|
|
|
bool need_wakeup;
|
|
|
|
void (*wakeup_cb)(void *d);
|
|
|
|
void *wakeup_cb_ctx;
|
|
|
|
int wakeup_pipe[2];
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
// -- protected by lock
|
|
|
|
|
|
|
|
uint64_t event_mask;
|
|
|
|
bool queued_wakeup;
|
|
|
|
bool choke_warning;
|
2014-12-15 13:44:25 +00:00
|
|
|
int suspend_count;
|
2014-02-10 20:01:35 +00:00
|
|
|
|
2014-04-05 21:20:30 +00:00
|
|
|
mpv_event *events; // ringbuffer of max_events entries
|
|
|
|
int max_events; // allocated number of entries in events
|
|
|
|
int first_event; // events[first_event] is the first readable event
|
|
|
|
int num_events; // number of readable events
|
|
|
|
int reserved_events; // number of entries reserved for replies
|
2014-02-10 20:01:35 +00:00
|
|
|
|
2014-04-05 21:54:21 +00:00
|
|
|
struct observe_property **properties;
|
|
|
|
int num_properties;
|
2014-08-01 23:39:28 +00:00
|
|
|
int lowest_changed; // attempt at making change processing incremental
|
2014-04-05 21:54:21 +00:00
|
|
|
int properties_updating;
|
2014-08-01 23:39:28 +00:00
|
|
|
uint64_t property_event_masks; // or-ed together event masks of all properties
|
2014-04-05 21:54:21 +00:00
|
|
|
|
2014-10-09 19:23:46 +00:00
|
|
|
bool fuzzy_initialized; // see scripting.c wait_loaded()
|
2014-02-10 20:01:35 +00:00
|
|
|
struct mp_log_buffer *messages;
|
|
|
|
};
|
|
|
|
|
2014-04-05 21:54:21 +00:00
|
|
|
static bool gen_property_change_event(struct mpv_handle *ctx);
|
2014-08-01 23:39:28 +00:00
|
|
|
static void notify_property_events(struct mpv_handle *ctx, uint64_t event_mask);
|
2014-04-05 21:54:21 +00:00
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
void mp_clients_init(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
mpctx->clients = talloc_ptrtype(NULL, mpctx->clients);
|
|
|
|
*mpctx->clients = (struct mp_client_api) {
|
|
|
|
.mpctx = mpctx,
|
|
|
|
};
|
|
|
|
pthread_mutex_init(&mpctx->clients->lock, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
void mp_clients_destroy(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
if (!mpctx->clients)
|
|
|
|
return;
|
|
|
|
assert(mpctx->clients->num_clients == 0);
|
|
|
|
pthread_mutex_destroy(&mpctx->clients->lock);
|
|
|
|
talloc_free(mpctx->clients);
|
|
|
|
mpctx->clients = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
int mp_clients_num(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
pthread_mutex_lock(&mpctx->clients->lock);
|
|
|
|
int num_clients = mpctx->clients->num_clients;
|
|
|
|
pthread_mutex_unlock(&mpctx->clients->lock);
|
|
|
|
return num_clients;
|
|
|
|
}
|
|
|
|
|
2014-09-06 15:02:47 +00:00
|
|
|
// Test for "fuzzy" initialization of all clients. That is, all clients have
|
|
|
|
// at least called mpv_wait_event() at least once since creation (or exited).
|
|
|
|
bool mp_clients_all_initialized(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
bool all_ok = true;
|
|
|
|
pthread_mutex_lock(&mpctx->clients->lock);
|
|
|
|
for (int n = 0; n < mpctx->clients->num_clients; n++) {
|
|
|
|
struct mpv_handle *ctx = mpctx->clients->clients[n];
|
|
|
|
pthread_mutex_lock(&ctx->lock);
|
|
|
|
all_ok &= ctx->fuzzy_initialized;
|
|
|
|
pthread_mutex_unlock(&ctx->lock);
|
|
|
|
}
|
|
|
|
pthread_mutex_unlock(&mpctx->clients->lock);
|
|
|
|
return all_ok;
|
|
|
|
}
|
|
|
|
|
2014-08-28 15:35:50 +00:00
|
|
|
static void invalidate_global_event_mask(struct mpv_handle *ctx)
|
|
|
|
{
|
|
|
|
pthread_mutex_lock(&ctx->clients->lock);
|
|
|
|
ctx->clients->event_masks = 0;
|
|
|
|
pthread_mutex_unlock(&ctx->clients->lock);
|
|
|
|
}
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
static struct mpv_handle *find_client(struct mp_client_api *clients,
|
|
|
|
const char *name)
|
|
|
|
{
|
|
|
|
for (int n = 0; n < clients->num_clients; n++) {
|
|
|
|
if (strcmp(clients->clients[n]->name, name) == 0)
|
|
|
|
return clients->clients[n];
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-10-24 19:52:16 +00:00
|
|
|
bool mp_client_exists(struct MPContext *mpctx, const char *client_name)
|
|
|
|
{
|
|
|
|
pthread_mutex_lock(&mpctx->clients->lock);
|
|
|
|
bool r = find_client(mpctx->clients, client_name);
|
|
|
|
pthread_mutex_unlock(&mpctx->clients->lock);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
struct mpv_handle *mp_new_client(struct mp_client_api *clients, const char *name)
|
|
|
|
{
|
2014-11-23 12:40:52 +00:00
|
|
|
char nname[MAX_CLIENT_NAME];
|
|
|
|
for (int n = 1; n < 1000; n++) {
|
2014-12-31 19:32:35 +00:00
|
|
|
if (!name)
|
|
|
|
name = "client";
|
2014-11-23 12:40:52 +00:00
|
|
|
snprintf(nname, sizeof(nname) - 3, "%s", name); // - space for number
|
|
|
|
for (int i = 0; nname[i]; i++)
|
|
|
|
nname[i] = mp_isalnum(nname[i]) ? nname[i] : '_';
|
|
|
|
if (n > 1)
|
|
|
|
mp_snprintf_cat(nname, sizeof(nname), "%d", n);
|
|
|
|
if (!find_client(clients, nname))
|
|
|
|
break;
|
|
|
|
nname[0] = '\0';
|
2014-02-10 20:01:35 +00:00
|
|
|
}
|
2014-11-23 12:40:52 +00:00
|
|
|
|
|
|
|
if (!nname[0])
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
pthread_mutex_lock(&clients->lock);
|
2014-02-10 20:01:35 +00:00
|
|
|
|
|
|
|
int num_events = 1000;
|
|
|
|
|
|
|
|
struct mpv_handle *client = talloc_ptrtype(NULL, client);
|
|
|
|
*client = (struct mpv_handle){
|
2014-11-23 12:40:52 +00:00
|
|
|
.log = mp_log_new(client, clients->mpctx->log, nname),
|
2014-02-10 20:01:35 +00:00
|
|
|
.mpctx = clients->mpctx,
|
|
|
|
.clients = clients,
|
|
|
|
.cur_event = talloc_zero(client, struct mpv_event),
|
2014-04-05 21:20:30 +00:00
|
|
|
.events = talloc_array(client, mpv_event, num_events),
|
2014-02-10 20:01:35 +00:00
|
|
|
.max_events = num_events,
|
2014-08-01 23:39:28 +00:00
|
|
|
.event_mask = (1ULL << INTERNAL_EVENT_BASE) - 1, // exclude internal events
|
2014-04-12 18:13:07 +00:00
|
|
|
.wakeup_pipe = {-1, -1},
|
2014-02-10 20:01:35 +00:00
|
|
|
};
|
|
|
|
pthread_mutex_init(&client->lock, NULL);
|
client API: restructure waiting, do log msg wakeup properly
Until now, availability of new log messages (through the mechanism
associated with mpv_request_log_messages()) did not wakeup the client
API properly. Commit 3b7402b5 was basically a hack to improve that
somewhat, but it wasn't a solution.
The main problem is that the client API itself is producing messages, so
the message callback would attempt to lock the client API lock,
resulting in a deadlock. Even if the lock was recursive, we'd run into
lock-order issues.
Solve this by using a separate lock for waiting and wakeup. Also, since
it's a natural addition, avoid redundant wakeups. This means the wakeup
callback as well as the wakeup pipe will be triggered only once until
the next mpv_wait_event() call happens.
This might make the wakeup callback be invoked in a reentrant way for
the first time, for example if a mpv_* function prints to a log. Adjust
the docs accordingly. (Note that non-reentrant beheavior was never
guaranteed - basically the wakeup callback is somewhat dangerous and
inconvenient.)
Also remove some traces of unneeded code. ctx->shutdown for one was
never set, and probably a leftover of an abandoned idea.
2014-06-07 21:15:07 +00:00
|
|
|
pthread_mutex_init(&client->wakeup_lock, NULL);
|
2014-02-10 20:01:35 +00:00
|
|
|
pthread_cond_init(&client->wakeup, NULL);
|
|
|
|
|
2014-11-23 12:40:52 +00:00
|
|
|
snprintf(client->name, sizeof(client->name), "%s", nname);
|
2014-08-01 23:39:28 +00:00
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
MP_TARRAY_APPEND(clients, clients->clients, clients->num_clients, client);
|
|
|
|
|
2014-08-28 15:35:50 +00:00
|
|
|
clients->event_masks = 0;
|
2014-02-10 20:01:35 +00:00
|
|
|
pthread_mutex_unlock(&clients->lock);
|
|
|
|
|
2014-08-28 15:35:50 +00:00
|
|
|
mpv_request_event(client, MPV_EVENT_TICK, 0);
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
return client;
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *mpv_client_name(mpv_handle *ctx)
|
|
|
|
{
|
|
|
|
return ctx->name;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct mp_log *mp_client_get_log(struct mpv_handle *ctx)
|
|
|
|
{
|
|
|
|
return ctx->log;
|
|
|
|
}
|
|
|
|
|
2014-05-12 23:14:07 +00:00
|
|
|
struct MPContext *mp_client_get_core(struct mpv_handle *ctx)
|
|
|
|
{
|
|
|
|
return ctx->mpctx;
|
|
|
|
}
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
static void wakeup_client(struct mpv_handle *ctx)
|
|
|
|
{
|
client API: restructure waiting, do log msg wakeup properly
Until now, availability of new log messages (through the mechanism
associated with mpv_request_log_messages()) did not wakeup the client
API properly. Commit 3b7402b5 was basically a hack to improve that
somewhat, but it wasn't a solution.
The main problem is that the client API itself is producing messages, so
the message callback would attempt to lock the client API lock,
resulting in a deadlock. Even if the lock was recursive, we'd run into
lock-order issues.
Solve this by using a separate lock for waiting and wakeup. Also, since
it's a natural addition, avoid redundant wakeups. This means the wakeup
callback as well as the wakeup pipe will be triggered only once until
the next mpv_wait_event() call happens.
This might make the wakeup callback be invoked in a reentrant way for
the first time, for example if a mpv_* function prints to a log. Adjust
the docs accordingly. (Note that non-reentrant beheavior was never
guaranteed - basically the wakeup callback is somewhat dangerous and
inconvenient.)
Also remove some traces of unneeded code. ctx->shutdown for one was
never set, and probably a leftover of an abandoned idea.
2014-06-07 21:15:07 +00:00
|
|
|
pthread_mutex_lock(&ctx->wakeup_lock);
|
|
|
|
if (!ctx->need_wakeup) {
|
|
|
|
ctx->need_wakeup = true;
|
|
|
|
pthread_cond_signal(&ctx->wakeup);
|
|
|
|
if (ctx->wakeup_cb)
|
|
|
|
ctx->wakeup_cb(ctx->wakeup_cb_ctx);
|
|
|
|
if (ctx->wakeup_pipe[0] != -1)
|
|
|
|
write(ctx->wakeup_pipe[1], &(char){0}, 1);
|
|
|
|
}
|
|
|
|
pthread_mutex_unlock(&ctx->wakeup_lock);
|
2014-02-10 20:01:35 +00:00
|
|
|
}
|
|
|
|
|
client API: restructure waiting, do log msg wakeup properly
Until now, availability of new log messages (through the mechanism
associated with mpv_request_log_messages()) did not wakeup the client
API properly. Commit 3b7402b5 was basically a hack to improve that
somewhat, but it wasn't a solution.
The main problem is that the client API itself is producing messages, so
the message callback would attempt to lock the client API lock,
resulting in a deadlock. Even if the lock was recursive, we'd run into
lock-order issues.
Solve this by using a separate lock for waiting and wakeup. Also, since
it's a natural addition, avoid redundant wakeups. This means the wakeup
callback as well as the wakeup pipe will be triggered only once until
the next mpv_wait_event() call happens.
This might make the wakeup callback be invoked in a reentrant way for
the first time, for example if a mpv_* function prints to a log. Adjust
the docs accordingly. (Note that non-reentrant beheavior was never
guaranteed - basically the wakeup callback is somewhat dangerous and
inconvenient.)
Also remove some traces of unneeded code. ctx->shutdown for one was
never set, and probably a leftover of an abandoned idea.
2014-06-07 21:15:07 +00:00
|
|
|
// Note: the caller has to deal with sporadic wakeups.
|
|
|
|
static int wait_wakeup(struct mpv_handle *ctx, int64_t end)
|
2014-02-10 20:01:35 +00:00
|
|
|
{
|
client API: restructure waiting, do log msg wakeup properly
Until now, availability of new log messages (through the mechanism
associated with mpv_request_log_messages()) did not wakeup the client
API properly. Commit 3b7402b5 was basically a hack to improve that
somewhat, but it wasn't a solution.
The main problem is that the client API itself is producing messages, so
the message callback would attempt to lock the client API lock,
resulting in a deadlock. Even if the lock was recursive, we'd run into
lock-order issues.
Solve this by using a separate lock for waiting and wakeup. Also, since
it's a natural addition, avoid redundant wakeups. This means the wakeup
callback as well as the wakeup pipe will be triggered only once until
the next mpv_wait_event() call happens.
This might make the wakeup callback be invoked in a reentrant way for
the first time, for example if a mpv_* function prints to a log. Adjust
the docs accordingly. (Note that non-reentrant beheavior was never
guaranteed - basically the wakeup callback is somewhat dangerous and
inconvenient.)
Also remove some traces of unneeded code. ctx->shutdown for one was
never set, and probably a leftover of an abandoned idea.
2014-06-07 21:15:07 +00:00
|
|
|
int r = 0;
|
|
|
|
pthread_mutex_unlock(&ctx->lock);
|
|
|
|
pthread_mutex_lock(&ctx->wakeup_lock);
|
|
|
|
if (!ctx->need_wakeup)
|
|
|
|
r = mpthread_cond_timedwait(&ctx->wakeup, &ctx->wakeup_lock, end);
|
|
|
|
if (r == 0)
|
|
|
|
ctx->need_wakeup = false;
|
|
|
|
pthread_mutex_unlock(&ctx->wakeup_lock);
|
2014-02-10 20:01:35 +00:00
|
|
|
pthread_mutex_lock(&ctx->lock);
|
client API: restructure waiting, do log msg wakeup properly
Until now, availability of new log messages (through the mechanism
associated with mpv_request_log_messages()) did not wakeup the client
API properly. Commit 3b7402b5 was basically a hack to improve that
somewhat, but it wasn't a solution.
The main problem is that the client API itself is producing messages, so
the message callback would attempt to lock the client API lock,
resulting in a deadlock. Even if the lock was recursive, we'd run into
lock-order issues.
Solve this by using a separate lock for waiting and wakeup. Also, since
it's a natural addition, avoid redundant wakeups. This means the wakeup
callback as well as the wakeup pipe will be triggered only once until
the next mpv_wait_event() call happens.
This might make the wakeup callback be invoked in a reentrant way for
the first time, for example if a mpv_* function prints to a log. Adjust
the docs accordingly. (Note that non-reentrant beheavior was never
guaranteed - basically the wakeup callback is somewhat dangerous and
inconvenient.)
Also remove some traces of unneeded code. ctx->shutdown for one was
never set, and probably a leftover of an abandoned idea.
2014-06-07 21:15:07 +00:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
void mpv_set_wakeup_callback(mpv_handle *ctx, void (*cb)(void *d), void *d)
|
|
|
|
{
|
|
|
|
pthread_mutex_lock(&ctx->wakeup_lock);
|
2014-02-10 20:01:35 +00:00
|
|
|
ctx->wakeup_cb = cb;
|
|
|
|
ctx->wakeup_cb_ctx = d;
|
2014-06-08 14:11:11 +00:00
|
|
|
if (ctx->wakeup_cb)
|
|
|
|
ctx->wakeup_cb(ctx->wakeup_cb_ctx);
|
client API: restructure waiting, do log msg wakeup properly
Until now, availability of new log messages (through the mechanism
associated with mpv_request_log_messages()) did not wakeup the client
API properly. Commit 3b7402b5 was basically a hack to improve that
somewhat, but it wasn't a solution.
The main problem is that the client API itself is producing messages, so
the message callback would attempt to lock the client API lock,
resulting in a deadlock. Even if the lock was recursive, we'd run into
lock-order issues.
Solve this by using a separate lock for waiting and wakeup. Also, since
it's a natural addition, avoid redundant wakeups. This means the wakeup
callback as well as the wakeup pipe will be triggered only once until
the next mpv_wait_event() call happens.
This might make the wakeup callback be invoked in a reentrant way for
the first time, for example if a mpv_* function prints to a log. Adjust
the docs accordingly. (Note that non-reentrant beheavior was never
guaranteed - basically the wakeup callback is somewhat dangerous and
inconvenient.)
Also remove some traces of unneeded code. ctx->shutdown for one was
never set, and probably a leftover of an abandoned idea.
2014-06-07 21:15:07 +00:00
|
|
|
pthread_mutex_unlock(&ctx->wakeup_lock);
|
2014-02-10 20:01:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void mpv_suspend(mpv_handle *ctx)
|
|
|
|
{
|
2014-12-15 13:44:25 +00:00
|
|
|
bool do_suspend = false;
|
|
|
|
|
|
|
|
pthread_mutex_lock(&ctx->lock);
|
|
|
|
if (ctx->suspend_count == INT_MAX) {
|
|
|
|
MP_ERR(ctx, "suspend counter overflow");
|
|
|
|
} else {
|
|
|
|
do_suspend = ctx->suspend_count == 0;
|
|
|
|
ctx->suspend_count++;
|
|
|
|
}
|
|
|
|
pthread_mutex_unlock(&ctx->lock);
|
|
|
|
|
|
|
|
if (do_suspend)
|
|
|
|
mp_dispatch_suspend(ctx->mpctx->dispatch);
|
2014-02-10 20:01:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void mpv_resume(mpv_handle *ctx)
|
|
|
|
{
|
2014-12-15 13:44:25 +00:00
|
|
|
bool do_resume = false;
|
|
|
|
|
|
|
|
pthread_mutex_lock(&ctx->lock);
|
|
|
|
if (ctx->suspend_count == 0) {
|
|
|
|
MP_ERR(ctx, "suspend counter underflow");
|
|
|
|
} else {
|
|
|
|
do_resume = ctx->suspend_count == 1;
|
|
|
|
ctx->suspend_count--;
|
|
|
|
}
|
|
|
|
pthread_mutex_unlock(&ctx->lock);
|
|
|
|
|
|
|
|
if (do_resume)
|
|
|
|
mp_dispatch_resume(ctx->mpctx->dispatch);
|
|
|
|
}
|
|
|
|
|
|
|
|
void mp_resume_all(mpv_handle *ctx)
|
|
|
|
{
|
|
|
|
pthread_mutex_lock(&ctx->lock);
|
|
|
|
bool do_resume = ctx->suspend_count > 0;
|
|
|
|
ctx->suspend_count = 0;
|
|
|
|
pthread_mutex_unlock(&ctx->lock);
|
|
|
|
|
|
|
|
if (do_resume)
|
|
|
|
mp_dispatch_resume(ctx->mpctx->dispatch);
|
2014-02-10 20:01:35 +00:00
|
|
|
}
|
|
|
|
|
2014-05-18 16:57:02 +00:00
|
|
|
static void lock_core(mpv_handle *ctx)
|
|
|
|
{
|
|
|
|
if (ctx->mpctx->initialized)
|
|
|
|
mp_dispatch_lock(ctx->mpctx->dispatch);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void unlock_core(mpv_handle *ctx)
|
|
|
|
{
|
|
|
|
if (ctx->mpctx->initialized)
|
|
|
|
mp_dispatch_unlock(ctx->mpctx->dispatch);
|
|
|
|
}
|
|
|
|
|
2014-06-07 18:25:48 +00:00
|
|
|
void mpv_detach_destroy(mpv_handle *ctx)
|
2014-02-10 20:01:35 +00:00
|
|
|
{
|
2014-02-26 19:40:50 +00:00
|
|
|
if (!ctx)
|
|
|
|
return;
|
|
|
|
|
2014-12-15 13:44:25 +00:00
|
|
|
mp_resume_all(ctx);
|
|
|
|
|
2014-02-28 00:03:37 +00:00
|
|
|
pthread_mutex_lock(&ctx->lock);
|
|
|
|
// reserved_events equals the number of asynchronous requests that weren't
|
2014-04-05 21:20:30 +00:00
|
|
|
// yet replied. In order to avoid that trying to reply to a removed client
|
2014-02-28 00:03:37 +00:00
|
|
|
// causes a crash, block until all asynchronous requests were served.
|
|
|
|
ctx->event_mask = 0;
|
2014-04-05 21:54:21 +00:00
|
|
|
while (ctx->reserved_events || ctx->properties_updating)
|
client API: restructure waiting, do log msg wakeup properly
Until now, availability of new log messages (through the mechanism
associated with mpv_request_log_messages()) did not wakeup the client
API properly. Commit 3b7402b5 was basically a hack to improve that
somewhat, but it wasn't a solution.
The main problem is that the client API itself is producing messages, so
the message callback would attempt to lock the client API lock,
resulting in a deadlock. Even if the lock was recursive, we'd run into
lock-order issues.
Solve this by using a separate lock for waiting and wakeup. Also, since
it's a natural addition, avoid redundant wakeups. This means the wakeup
callback as well as the wakeup pipe will be triggered only once until
the next mpv_wait_event() call happens.
This might make the wakeup callback be invoked in a reentrant way for
the first time, for example if a mpv_* function prints to a log. Adjust
the docs accordingly. (Note that non-reentrant beheavior was never
guaranteed - basically the wakeup callback is somewhat dangerous and
inconvenient.)
Also remove some traces of unneeded code. ctx->shutdown for one was
never set, and probably a leftover of an abandoned idea.
2014-06-07 21:15:07 +00:00
|
|
|
wait_wakeup(ctx, INT64_MAX);
|
2014-02-28 00:03:37 +00:00
|
|
|
pthread_mutex_unlock(&ctx->lock);
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
struct mp_client_api *clients = ctx->clients;
|
|
|
|
|
|
|
|
pthread_mutex_lock(&clients->lock);
|
|
|
|
for (int n = 0; n < clients->num_clients; n++) {
|
|
|
|
if (clients->clients[n] == ctx) {
|
|
|
|
MP_TARRAY_REMOVE_AT(clients->clients, clients->num_clients, n);
|
2014-04-05 21:20:30 +00:00
|
|
|
while (ctx->num_events) {
|
|
|
|
talloc_free(ctx->events[ctx->first_event].data);
|
|
|
|
ctx->first_event = (ctx->first_event + 1) % ctx->max_events;
|
|
|
|
ctx->num_events--;
|
2014-02-10 20:01:35 +00:00
|
|
|
}
|
|
|
|
mp_msg_log_buffer_destroy(ctx->messages);
|
|
|
|
pthread_cond_destroy(&ctx->wakeup);
|
client API: restructure waiting, do log msg wakeup properly
Until now, availability of new log messages (through the mechanism
associated with mpv_request_log_messages()) did not wakeup the client
API properly. Commit 3b7402b5 was basically a hack to improve that
somewhat, but it wasn't a solution.
The main problem is that the client API itself is producing messages, so
the message callback would attempt to lock the client API lock,
resulting in a deadlock. Even if the lock was recursive, we'd run into
lock-order issues.
Solve this by using a separate lock for waiting and wakeup. Also, since
it's a natural addition, avoid redundant wakeups. This means the wakeup
callback as well as the wakeup pipe will be triggered only once until
the next mpv_wait_event() call happens.
This might make the wakeup callback be invoked in a reentrant way for
the first time, for example if a mpv_* function prints to a log. Adjust
the docs accordingly. (Note that non-reentrant beheavior was never
guaranteed - basically the wakeup callback is somewhat dangerous and
inconvenient.)
Also remove some traces of unneeded code. ctx->shutdown for one was
never set, and probably a leftover of an abandoned idea.
2014-06-07 21:15:07 +00:00
|
|
|
pthread_mutex_destroy(&ctx->wakeup_lock);
|
2014-02-10 20:01:35 +00:00
|
|
|
pthread_mutex_destroy(&ctx->lock);
|
2014-04-12 18:13:07 +00:00
|
|
|
if (ctx->wakeup_pipe[0] != -1) {
|
|
|
|
close(ctx->wakeup_pipe[0]);
|
|
|
|
close(ctx->wakeup_pipe[1]);
|
|
|
|
}
|
2014-02-10 20:01:35 +00:00
|
|
|
talloc_free(ctx);
|
|
|
|
ctx = NULL;
|
2014-10-24 19:52:16 +00:00
|
|
|
// shutdown_clients() sleeps to avoid wasting CPU.
|
|
|
|
// mp_hook_test_completion() also relies on this a bit.
|
2014-02-26 19:41:14 +00:00
|
|
|
if (clients->mpctx->input)
|
|
|
|
mp_input_wakeup(clients->mpctx->input);
|
2014-02-10 20:01:35 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
pthread_mutex_unlock(&clients->lock);
|
|
|
|
assert(!ctx);
|
|
|
|
}
|
|
|
|
|
2014-06-07 13:08:45 +00:00
|
|
|
static void get_thread(void *ptr)
|
|
|
|
{
|
|
|
|
*(pthread_t *)ptr = pthread_self();
|
|
|
|
}
|
|
|
|
|
|
|
|
void mpv_terminate_destroy(mpv_handle *ctx)
|
|
|
|
{
|
2014-07-04 00:20:18 +00:00
|
|
|
if (!ctx)
|
|
|
|
return;
|
|
|
|
|
2014-06-07 13:08:45 +00:00
|
|
|
mpv_command(ctx, (const char*[]){"quit", NULL});
|
|
|
|
|
2014-07-31 01:12:18 +00:00
|
|
|
if (!ctx->owner || !ctx->mpctx->initialized) {
|
2014-06-07 18:25:48 +00:00
|
|
|
mpv_detach_destroy(ctx);
|
2014-06-07 13:08:45 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
mp_dispatch_lock(ctx->mpctx->dispatch);
|
|
|
|
assert(ctx->mpctx->autodetach);
|
|
|
|
ctx->mpctx->autodetach = false;
|
|
|
|
mp_dispatch_unlock(ctx->mpctx->dispatch);
|
|
|
|
|
|
|
|
pthread_t playthread;
|
|
|
|
mp_dispatch_run(ctx->mpctx->dispatch, get_thread, &playthread);
|
|
|
|
|
2014-06-07 18:25:48 +00:00
|
|
|
mpv_detach_destroy(ctx);
|
2014-06-07 13:08:45 +00:00
|
|
|
|
|
|
|
// And this is also the reason why we only allow 1 thread (the owner) to
|
|
|
|
// call this function.
|
|
|
|
pthread_join(playthread, NULL);
|
|
|
|
}
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
mpv_handle *mpv_create(void)
|
|
|
|
{
|
|
|
|
struct MPContext *mpctx = mp_create();
|
|
|
|
mpv_handle *ctx = mp_new_client(mpctx->clients, "main");
|
|
|
|
if (ctx) {
|
2014-06-07 13:08:45 +00:00
|
|
|
ctx->owner = true;
|
2014-09-06 15:02:47 +00:00
|
|
|
ctx->fuzzy_initialized = true;
|
2014-02-10 20:01:35 +00:00
|
|
|
// Set some defaults.
|
2014-06-06 15:26:01 +00:00
|
|
|
mpv_set_option_string(ctx, "config", "no");
|
2014-02-10 20:01:35 +00:00
|
|
|
mpv_set_option_string(ctx, "idle", "yes");
|
|
|
|
mpv_set_option_string(ctx, "terminal", "no");
|
2014-12-02 19:35:18 +00:00
|
|
|
mpv_set_option_string(ctx, "input-terminal", "no");
|
2014-02-10 20:01:35 +00:00
|
|
|
mpv_set_option_string(ctx, "osc", "no");
|
2014-11-25 15:47:32 +00:00
|
|
|
mpv_set_option_string(ctx, "ytdl", "no");
|
2014-02-10 20:01:35 +00:00
|
|
|
mpv_set_option_string(ctx, "input-default-bindings", "no");
|
2014-10-09 16:28:37 +00:00
|
|
|
mpv_set_option_string(ctx, "input-vo-keyboard", "no");
|
2014-06-08 21:58:40 +00:00
|
|
|
mpv_set_option_string(ctx, "input-lirc", "no");
|
2014-10-09 19:02:47 +00:00
|
|
|
mpv_set_option_string(ctx, "input-appleremote", "no");
|
2014-10-09 19:23:54 +00:00
|
|
|
mpv_set_option_string(ctx, "input-media-keys", "no");
|
|
|
|
mpv_set_option_string(ctx, "input-app-events", "no");
|
2014-10-28 18:51:44 +00:00
|
|
|
mpv_set_option_string(ctx, "stop-playback-on-init-failure", "yes");
|
2014-02-10 20:01:35 +00:00
|
|
|
} else {
|
|
|
|
mp_destroy(mpctx);
|
|
|
|
}
|
|
|
|
return ctx;
|
|
|
|
}
|
|
|
|
|
2014-12-31 19:32:35 +00:00
|
|
|
mpv_handle *mpv_create_client(mpv_handle *ctx, const char *name)
|
|
|
|
{
|
|
|
|
if (!ctx)
|
|
|
|
return mpv_create();
|
|
|
|
if (!ctx->mpctx->initialized)
|
|
|
|
return NULL;
|
|
|
|
mpv_handle *new = mp_new_client(ctx->mpctx->clients, name);
|
|
|
|
if (new)
|
|
|
|
mpv_wait_event(new, 0); // set fuzzy_initialized
|
|
|
|
return new;
|
|
|
|
}
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
static void *playback_thread(void *p)
|
|
|
|
{
|
|
|
|
struct MPContext *mpctx = p;
|
2014-06-07 13:08:45 +00:00
|
|
|
mpctx->autodetach = true;
|
2014-02-10 20:01:35 +00:00
|
|
|
|
2014-10-19 21:32:34 +00:00
|
|
|
mpthread_set_name("playback core");
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
mp_play_files(mpctx);
|
|
|
|
|
|
|
|
// This actually waits until all clients are gone before actually
|
|
|
|
// destroying mpctx.
|
|
|
|
mp_destroy(mpctx);
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
int mpv_initialize(mpv_handle *ctx)
|
|
|
|
{
|
|
|
|
if (mp_initialize(ctx->mpctx) < 0)
|
|
|
|
return MPV_ERROR_INVALID_PARAMETER;
|
|
|
|
|
2014-12-02 18:26:36 +00:00
|
|
|
mp_print_version(ctx->mpctx->log, false);
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
pthread_t thread;
|
|
|
|
if (pthread_create(&thread, NULL, playback_thread, ctx->mpctx) != 0)
|
|
|
|
return MPV_ERROR_NOMEM;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-08-31 17:51:41 +00:00
|
|
|
// set ev->data to a new copy of the original data
|
|
|
|
// (done only for message types that are broadcast)
|
|
|
|
static void dup_event_data(struct mpv_event *ev)
|
|
|
|
{
|
|
|
|
switch (ev->event_id) {
|
|
|
|
case MPV_EVENT_CLIENT_MESSAGE: {
|
|
|
|
struct mpv_event_client_message *src = ev->data;
|
|
|
|
struct mpv_event_client_message *msg =
|
|
|
|
talloc_zero(NULL, struct mpv_event_client_message);
|
|
|
|
for (int n = 0; n < src->num_args; n++) {
|
|
|
|
MP_TARRAY_APPEND(msg, msg->args, msg->num_args,
|
|
|
|
talloc_strdup(msg, src->args[n]));
|
|
|
|
}
|
|
|
|
ev->data = msg;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case MPV_EVENT_END_FILE:
|
|
|
|
ev->data = talloc_memdup(NULL, ev->data, sizeof(mpv_event_end_file));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
// Doesn't use events with memory allocation.
|
|
|
|
if (ev->data)
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
// Reserve an entry in the ring buffer. This can be used to guarantee that the
|
|
|
|
// reply can be made, even if the buffer becomes congested _after_ sending
|
|
|
|
// the request.
|
|
|
|
// Returns an error code if the buffer is full.
|
|
|
|
static int reserve_reply(struct mpv_handle *ctx)
|
|
|
|
{
|
|
|
|
int res = MPV_ERROR_EVENT_QUEUE_FULL;
|
|
|
|
pthread_mutex_lock(&ctx->lock);
|
2014-04-05 21:20:30 +00:00
|
|
|
if (ctx->reserved_events + ctx->num_events < ctx->max_events) {
|
2014-02-10 20:01:35 +00:00
|
|
|
ctx->reserved_events++;
|
|
|
|
res = 0;
|
|
|
|
}
|
|
|
|
pthread_mutex_unlock(&ctx->lock);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2014-08-31 17:51:41 +00:00
|
|
|
static int append_event(struct mpv_handle *ctx, struct mpv_event event, bool copy)
|
2014-04-05 21:20:30 +00:00
|
|
|
{
|
|
|
|
if (ctx->num_events + ctx->reserved_events >= ctx->max_events)
|
|
|
|
return -1;
|
2014-08-31 17:51:41 +00:00
|
|
|
if (copy)
|
|
|
|
dup_event_data(&event);
|
|
|
|
ctx->events[(ctx->first_event + ctx->num_events) % ctx->max_events] = event;
|
2014-04-05 21:20:30 +00:00
|
|
|
ctx->num_events++;
|
|
|
|
wakeup_client(ctx);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-08-31 17:51:41 +00:00
|
|
|
static int send_event(struct mpv_handle *ctx, struct mpv_event *event, bool copy)
|
2014-02-10 20:01:35 +00:00
|
|
|
{
|
|
|
|
pthread_mutex_lock(&ctx->lock);
|
2014-08-01 23:39:28 +00:00
|
|
|
uint64_t mask = 1ULL << event->event_id;
|
|
|
|
if (ctx->property_event_masks & mask)
|
|
|
|
notify_property_events(ctx, mask);
|
|
|
|
if (!(ctx->event_mask & mask)) {
|
2014-02-10 20:01:35 +00:00
|
|
|
pthread_mutex_unlock(&ctx->lock);
|
|
|
|
return 0;
|
|
|
|
}
|
2014-08-31 17:51:41 +00:00
|
|
|
int r = append_event(ctx, *event, copy);
|
2014-04-05 21:20:30 +00:00
|
|
|
if (r < 0 && !ctx->choke_warning) {
|
2014-02-10 20:01:35 +00:00
|
|
|
mp_err(ctx->log, "Too many events queued.\n");
|
|
|
|
ctx->choke_warning = true;
|
|
|
|
}
|
|
|
|
pthread_mutex_unlock(&ctx->lock);
|
2014-04-05 21:20:30 +00:00
|
|
|
return r;
|
2014-02-10 20:01:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Send a reply; the reply must have been previously reserved with
|
|
|
|
// reserve_reply (otherwise, use send_event()).
|
|
|
|
static void send_reply(struct mpv_handle *ctx, uint64_t userdata,
|
|
|
|
struct mpv_event *event)
|
|
|
|
{
|
|
|
|
event->reply_userdata = userdata;
|
|
|
|
pthread_mutex_lock(&ctx->lock);
|
2014-04-05 21:20:30 +00:00
|
|
|
// If this fails, reserve_reply() probably wasn't called.
|
2014-02-10 20:01:35 +00:00
|
|
|
assert(ctx->reserved_events > 0);
|
|
|
|
ctx->reserved_events--;
|
2014-08-31 17:51:41 +00:00
|
|
|
if (append_event(ctx, *event, false) < 0)
|
|
|
|
abort(); // not reached
|
2014-02-10 20:01:35 +00:00
|
|
|
pthread_mutex_unlock(&ctx->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void status_reply(struct mpv_handle *ctx, int event,
|
|
|
|
uint64_t userdata, int status)
|
|
|
|
{
|
|
|
|
struct mpv_event reply = {
|
|
|
|
.event_id = event,
|
|
|
|
.error = status,
|
|
|
|
};
|
|
|
|
send_reply(ctx, userdata, &reply);
|
|
|
|
}
|
|
|
|
|
2014-08-28 15:35:50 +00:00
|
|
|
// Return whether there's any client listening to this event.
|
|
|
|
// If false is returned, the core doesn't need to send it.
|
|
|
|
bool mp_client_event_is_registered(struct MPContext *mpctx, int event)
|
|
|
|
{
|
|
|
|
struct mp_client_api *clients = mpctx->clients;
|
|
|
|
|
|
|
|
pthread_mutex_lock(&clients->lock);
|
|
|
|
|
|
|
|
if (!clients->event_masks) { // lazy update
|
|
|
|
for (int n = 0; n < clients->num_clients; n++) {
|
|
|
|
struct mpv_handle *ctx = clients->clients[n];
|
|
|
|
pthread_mutex_lock(&ctx->lock);
|
|
|
|
clients->event_masks |= ctx->event_mask | ctx->property_event_masks;
|
|
|
|
pthread_mutex_unlock(&ctx->lock);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
bool r = clients->event_masks & (1ULL << event);
|
|
|
|
|
|
|
|
pthread_mutex_unlock(&clients->lock);
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
void mp_client_broadcast_event(struct MPContext *mpctx, int event, void *data)
|
|
|
|
{
|
|
|
|
struct mp_client_api *clients = mpctx->clients;
|
|
|
|
|
|
|
|
pthread_mutex_lock(&clients->lock);
|
|
|
|
|
2014-02-24 21:49:07 +00:00
|
|
|
for (int n = 0; n < clients->num_clients; n++) {
|
|
|
|
struct mpv_event event_data = {
|
|
|
|
.event_id = event,
|
|
|
|
.data = data,
|
|
|
|
};
|
2014-08-31 17:51:41 +00:00
|
|
|
send_event(clients->clients[n], &event_data, true);
|
2014-02-24 21:49:07 +00:00
|
|
|
}
|
2014-02-10 20:01:35 +00:00
|
|
|
|
|
|
|
pthread_mutex_unlock(&clients->lock);
|
|
|
|
}
|
|
|
|
|
2014-11-23 14:08:49 +00:00
|
|
|
// If client_name == NULL, then broadcast and free the event.
|
2014-02-10 20:01:35 +00:00
|
|
|
int mp_client_send_event(struct MPContext *mpctx, const char *client_name,
|
|
|
|
int event, void *data)
|
|
|
|
{
|
2014-11-23 14:08:49 +00:00
|
|
|
if (!client_name) {
|
|
|
|
mp_client_broadcast_event(mpctx, event, data);
|
|
|
|
talloc_free(data);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
struct mp_client_api *clients = mpctx->clients;
|
|
|
|
int r = 0;
|
|
|
|
|
|
|
|
struct mpv_event event_data = {
|
|
|
|
.event_id = event,
|
|
|
|
.data = data,
|
|
|
|
};
|
|
|
|
|
|
|
|
pthread_mutex_lock(&clients->lock);
|
|
|
|
|
|
|
|
struct mpv_handle *ctx = find_client(clients, client_name);
|
|
|
|
if (ctx) {
|
2014-08-31 17:51:41 +00:00
|
|
|
r = send_event(ctx, &event_data, false);
|
2014-02-10 20:01:35 +00:00
|
|
|
} else {
|
|
|
|
r = -1;
|
|
|
|
talloc_free(data);
|
|
|
|
}
|
|
|
|
|
|
|
|
pthread_mutex_unlock(&clients->lock);
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2014-11-23 14:08:49 +00:00
|
|
|
int mp_client_send_event_dup(struct MPContext *mpctx, const char *client_name,
|
|
|
|
int event, void *data)
|
|
|
|
{
|
|
|
|
if (!client_name) {
|
|
|
|
mp_client_broadcast_event(mpctx, event, data);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct mpv_event event_data = {
|
|
|
|
.event_id = event,
|
|
|
|
.data = data,
|
|
|
|
};
|
|
|
|
|
|
|
|
dup_event_data(&event_data);
|
|
|
|
return mp_client_send_event(mpctx, client_name, event, event_data.data);
|
|
|
|
}
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
int mpv_request_event(mpv_handle *ctx, mpv_event_id event, int enable)
|
|
|
|
{
|
|
|
|
if (!mpv_event_name(event) || enable < 0 || enable > 1)
|
|
|
|
return MPV_ERROR_INVALID_PARAMETER;
|
2014-11-02 19:26:51 +00:00
|
|
|
assert(event < (int)INTERNAL_EVENT_BASE); // excluded above; they have no name
|
2014-02-10 20:01:35 +00:00
|
|
|
pthread_mutex_lock(&ctx->lock);
|
2014-08-01 23:39:28 +00:00
|
|
|
uint64_t bit = 1ULL << event;
|
2014-02-10 20:01:35 +00:00
|
|
|
ctx->event_mask = enable ? ctx->event_mask | bit : ctx->event_mask & ~bit;
|
|
|
|
pthread_mutex_unlock(&ctx->lock);
|
2014-08-28 15:35:50 +00:00
|
|
|
invalidate_global_event_mask(ctx);
|
2014-02-10 20:01:35 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
mpv_event *mpv_wait_event(mpv_handle *ctx, double timeout)
|
|
|
|
{
|
|
|
|
mpv_event *event = ctx->cur_event;
|
|
|
|
|
client API: restructure waiting, do log msg wakeup properly
Until now, availability of new log messages (through the mechanism
associated with mpv_request_log_messages()) did not wakeup the client
API properly. Commit 3b7402b5 was basically a hack to improve that
somewhat, but it wasn't a solution.
The main problem is that the client API itself is producing messages, so
the message callback would attempt to lock the client API lock,
resulting in a deadlock. Even if the lock was recursive, we'd run into
lock-order issues.
Solve this by using a separate lock for waiting and wakeup. Also, since
it's a natural addition, avoid redundant wakeups. This means the wakeup
callback as well as the wakeup pipe will be triggered only once until
the next mpv_wait_event() call happens.
This might make the wakeup callback be invoked in a reentrant way for
the first time, for example if a mpv_* function prints to a log. Adjust
the docs accordingly. (Note that non-reentrant beheavior was never
guaranteed - basically the wakeup callback is somewhat dangerous and
inconvenient.)
Also remove some traces of unneeded code. ctx->shutdown for one was
never set, and probably a leftover of an abandoned idea.
2014-06-07 21:15:07 +00:00
|
|
|
pthread_mutex_lock(&ctx->lock);
|
|
|
|
|
2014-09-06 15:02:47 +00:00
|
|
|
if (!ctx->fuzzy_initialized && ctx->clients->mpctx->input)
|
|
|
|
mp_input_wakeup(ctx->clients->mpctx->input);
|
|
|
|
ctx->fuzzy_initialized = true;
|
|
|
|
|
2014-06-07 08:44:21 +00:00
|
|
|
if (timeout < 0)
|
|
|
|
timeout = 1e20;
|
|
|
|
|
2014-05-18 14:36:08 +00:00
|
|
|
int64_t deadline = mp_add_timeout(mp_time_us(), timeout);
|
2014-02-10 20:01:35 +00:00
|
|
|
|
|
|
|
*event = (mpv_event){0};
|
|
|
|
talloc_free_children(event);
|
|
|
|
|
|
|
|
while (1) {
|
2014-12-22 00:53:39 +00:00
|
|
|
if (ctx->queued_wakeup)
|
|
|
|
deadline = 0;
|
2014-12-15 13:44:25 +00:00
|
|
|
// This will almost surely lead to a deadlock. (Polling is still ok.)
|
|
|
|
if (ctx->suspend_count && timeout > 0) {
|
|
|
|
MP_ERR(ctx, "attempting to wait while core is suspended");
|
|
|
|
break;
|
|
|
|
}
|
2014-04-05 21:20:30 +00:00
|
|
|
if (ctx->num_events) {
|
|
|
|
*event = ctx->events[ctx->first_event];
|
|
|
|
ctx->first_event = (ctx->first_event + 1) % ctx->max_events;
|
|
|
|
ctx->num_events--;
|
2014-02-10 20:01:35 +00:00
|
|
|
talloc_steal(event, event->data);
|
|
|
|
break;
|
|
|
|
}
|
2014-04-05 21:54:21 +00:00
|
|
|
if (gen_property_change_event(ctx))
|
|
|
|
break;
|
2014-02-10 20:01:35 +00:00
|
|
|
if (ctx->messages) {
|
|
|
|
// Poll the log message queue. Currently we can't/don't do better.
|
|
|
|
struct mp_log_buffer_entry *msg =
|
|
|
|
mp_msg_log_buffer_read(ctx->messages);
|
|
|
|
if (msg) {
|
|
|
|
event->event_id = MPV_EVENT_LOG_MESSAGE;
|
|
|
|
struct mpv_event_log_message *cmsg = talloc_ptrtype(event, cmsg);
|
|
|
|
*cmsg = (struct mpv_event_log_message){
|
|
|
|
.prefix = talloc_steal(event, msg->prefix),
|
|
|
|
.level = mp_log_levels[msg->level],
|
2014-10-08 12:15:14 +00:00
|
|
|
.log_level = mp_mpv_log_levels[msg->level],
|
2014-02-10 20:01:35 +00:00
|
|
|
.text = talloc_steal(event, msg->text),
|
|
|
|
};
|
|
|
|
event->data = cmsg;
|
|
|
|
talloc_free(msg);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
client API: restructure waiting, do log msg wakeup properly
Until now, availability of new log messages (through the mechanism
associated with mpv_request_log_messages()) did not wakeup the client
API properly. Commit 3b7402b5 was basically a hack to improve that
somewhat, but it wasn't a solution.
The main problem is that the client API itself is producing messages, so
the message callback would attempt to lock the client API lock,
resulting in a deadlock. Even if the lock was recursive, we'd run into
lock-order issues.
Solve this by using a separate lock for waiting and wakeup. Also, since
it's a natural addition, avoid redundant wakeups. This means the wakeup
callback as well as the wakeup pipe will be triggered only once until
the next mpv_wait_event() call happens.
This might make the wakeup callback be invoked in a reentrant way for
the first time, for example if a mpv_* function prints to a log. Adjust
the docs accordingly. (Note that non-reentrant beheavior was never
guaranteed - basically the wakeup callback is somewhat dangerous and
inconvenient.)
Also remove some traces of unneeded code. ctx->shutdown for one was
never set, and probably a leftover of an abandoned idea.
2014-06-07 21:15:07 +00:00
|
|
|
int r = wait_wakeup(ctx, deadline);
|
2014-02-28 23:38:17 +00:00
|
|
|
if (r == ETIMEDOUT)
|
|
|
|
break;
|
2014-02-10 20:01:35 +00:00
|
|
|
}
|
|
|
|
ctx->queued_wakeup = false;
|
|
|
|
|
|
|
|
pthread_mutex_unlock(&ctx->lock);
|
|
|
|
|
|
|
|
return event;
|
|
|
|
}
|
|
|
|
|
|
|
|
void mpv_wakeup(mpv_handle *ctx)
|
|
|
|
{
|
|
|
|
pthread_mutex_lock(&ctx->lock);
|
|
|
|
ctx->queued_wakeup = true;
|
|
|
|
wakeup_client(ctx);
|
|
|
|
pthread_mutex_unlock(&ctx->lock);
|
|
|
|
}
|
|
|
|
|
2014-02-24 19:16:22 +00:00
|
|
|
// map client API types to internal types
|
|
|
|
static const struct m_option type_conv[] = {
|
|
|
|
[MPV_FORMAT_STRING] = { .type = CONF_TYPE_STRING },
|
|
|
|
[MPV_FORMAT_FLAG] = { .type = CONF_TYPE_FLAG },
|
|
|
|
[MPV_FORMAT_INT64] = { .type = CONF_TYPE_INT64 },
|
|
|
|
[MPV_FORMAT_DOUBLE] = { .type = CONF_TYPE_DOUBLE },
|
|
|
|
[MPV_FORMAT_NODE] = { .type = CONF_TYPE_NODE },
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct m_option *get_mp_type(mpv_format format)
|
|
|
|
{
|
2014-11-07 14:58:51 +00:00
|
|
|
if ((unsigned)format >= MP_ARRAY_SIZE(type_conv))
|
2014-02-24 19:16:22 +00:00
|
|
|
return NULL;
|
|
|
|
if (!type_conv[format].type)
|
|
|
|
return NULL;
|
|
|
|
return &type_conv[format];
|
|
|
|
}
|
|
|
|
|
|
|
|
// for read requests - MPV_FORMAT_OSD_STRING special handling
|
|
|
|
static const struct m_option *get_mp_type_get(mpv_format format)
|
|
|
|
{
|
|
|
|
if (format == MPV_FORMAT_OSD_STRING)
|
|
|
|
format = MPV_FORMAT_STRING; // it's string data, just other semantics
|
|
|
|
return get_mp_type(format);
|
|
|
|
}
|
|
|
|
|
|
|
|
// move src->dst, and do implicit conversion if possible (conversions to or
|
|
|
|
// from strings are handled otherwise)
|
|
|
|
static bool conv_node_to_format(void *dst, mpv_format dst_fmt, mpv_node *src)
|
|
|
|
{
|
|
|
|
if (dst_fmt == src->format) {
|
|
|
|
const struct m_option *type = get_mp_type(dst_fmt);
|
|
|
|
memcpy(dst, &src->u, type->type->size);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
if (dst_fmt == MPV_FORMAT_DOUBLE && src->format == MPV_FORMAT_INT64) {
|
|
|
|
*(double *)dst = src->u.int64;
|
|
|
|
return true;
|
|
|
|
}
|
2014-10-14 13:54:03 +00:00
|
|
|
if (dst_fmt == MPV_FORMAT_INT64 && src->format == MPV_FORMAT_DOUBLE) {
|
|
|
|
if (src->u.double_ >= INT64_MIN && src->u.double_ <= INT64_MAX)
|
|
|
|
*(int64_t *)dst = src->u.double_;
|
|
|
|
}
|
2014-02-24 19:16:22 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2014-04-09 17:27:28 +00:00
|
|
|
// Note: for MPV_FORMAT_NODE_MAP, this (incorrectly) takes the order into
|
|
|
|
// account, instead of treating it as set.
|
2014-04-08 20:06:39 +00:00
|
|
|
static bool compare_value(void *a, void *b, mpv_format format)
|
|
|
|
{
|
|
|
|
switch (format) {
|
|
|
|
case MPV_FORMAT_NONE:
|
2014-04-09 18:27:26 +00:00
|
|
|
return true;
|
2014-04-08 20:06:39 +00:00
|
|
|
case MPV_FORMAT_STRING:
|
|
|
|
case MPV_FORMAT_OSD_STRING:
|
|
|
|
return strcmp(*(char **)a, *(char **)b) == 0;
|
|
|
|
case MPV_FORMAT_FLAG:
|
|
|
|
return *(int *)a == *(int *)b;
|
|
|
|
case MPV_FORMAT_INT64:
|
|
|
|
return *(int64_t *)a == *(int64_t *)b;
|
|
|
|
case MPV_FORMAT_DOUBLE:
|
|
|
|
return *(double *)a == *(double *)b;
|
|
|
|
case MPV_FORMAT_NODE: {
|
|
|
|
struct mpv_node *a_n = a, *b_n = b;
|
|
|
|
if (a_n->format != b_n->format)
|
|
|
|
return false;
|
|
|
|
return compare_value(&a_n->u, &b_n->u, a_n->format);
|
|
|
|
}
|
|
|
|
case MPV_FORMAT_NODE_ARRAY:
|
|
|
|
case MPV_FORMAT_NODE_MAP:
|
|
|
|
{
|
|
|
|
mpv_node_list *l_a = *(mpv_node_list **)a, *l_b = *(mpv_node_list **)b;
|
|
|
|
if (l_a->num != l_b->num)
|
|
|
|
return false;
|
|
|
|
for (int n = 0; n < l_a->num; n++) {
|
|
|
|
if (!compare_value(&l_a->values[n], &l_b->values[n], MPV_FORMAT_NODE))
|
|
|
|
return false;
|
|
|
|
if (format == MPV_FORMAT_NODE_MAP) {
|
|
|
|
if (strcmp(l_a->keys[n], l_b->keys[n]) != 0)
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
|
2014-02-24 19:16:22 +00:00
|
|
|
void mpv_free_node_contents(mpv_node *node)
|
|
|
|
{
|
|
|
|
static const struct m_option type = { .type = CONF_TYPE_NODE };
|
|
|
|
m_option_free(&type, node);
|
|
|
|
}
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
int mpv_set_option(mpv_handle *ctx, const char *name, mpv_format format,
|
|
|
|
void *data)
|
|
|
|
{
|
2014-05-18 16:57:02 +00:00
|
|
|
int flags = ctx->mpctx->initialized ? M_SETOPT_RUNTIME : 0;
|
|
|
|
const struct m_option *type = get_mp_type(format);
|
|
|
|
if (!type)
|
|
|
|
return MPV_ERROR_OPTION_FORMAT;
|
|
|
|
struct mpv_node tmp;
|
|
|
|
if (format != MPV_FORMAT_NODE) {
|
|
|
|
tmp.format = format;
|
|
|
|
memcpy(&tmp.u, data, type->type->size);
|
|
|
|
format = MPV_FORMAT_NODE;
|
|
|
|
data = &tmp;
|
|
|
|
}
|
|
|
|
lock_core(ctx);
|
|
|
|
int err = m_config_set_option_node(ctx->mpctx->mconfig, bstr0(name),
|
|
|
|
data, flags);
|
|
|
|
unlock_core(ctx);
|
|
|
|
switch (err) {
|
|
|
|
case M_OPT_MISSING_PARAM:
|
|
|
|
case M_OPT_INVALID:
|
|
|
|
return MPV_ERROR_OPTION_ERROR;
|
|
|
|
case M_OPT_OUT_OF_RANGE:
|
|
|
|
return MPV_ERROR_OPTION_FORMAT;
|
|
|
|
case M_OPT_UNKNOWN:
|
|
|
|
return MPV_ERROR_OPTION_NOT_FOUND;
|
|
|
|
default:
|
|
|
|
if (err >= 0)
|
|
|
|
return 0;
|
|
|
|
return MPV_ERROR_OPTION_ERROR;
|
2014-02-10 20:01:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int mpv_set_option_string(mpv_handle *ctx, const char *name, const char *data)
|
|
|
|
{
|
2014-02-24 18:35:06 +00:00
|
|
|
return mpv_set_option(ctx, name, MPV_FORMAT_STRING, &data);
|
2014-02-10 20:01:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Run a command in the playback thread.
|
|
|
|
static void run_locked(mpv_handle *ctx, void (*fn)(void *fn_data), void *fn_data)
|
|
|
|
{
|
2014-08-14 17:34:53 +00:00
|
|
|
mp_dispatch_lock(ctx->mpctx->dispatch);
|
|
|
|
fn(fn_data);
|
|
|
|
mp_dispatch_unlock(ctx->mpctx->dispatch);
|
2014-02-10 20:01:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Run a command asynchronously. It's the responsibility of the caller to
|
|
|
|
// actually send the reply. This helper merely saves a small part of the
|
|
|
|
// required boilerplate to do so.
|
|
|
|
// fn: callback to execute the request
|
|
|
|
// fn_data: opaque caller-defined argument for fn. This will be automatically
|
|
|
|
// freed with talloc_free(fn_data).
|
|
|
|
static int run_async(mpv_handle *ctx, void (*fn)(void *fn_data), void *fn_data)
|
|
|
|
{
|
|
|
|
int err = reserve_reply(ctx);
|
|
|
|
if (err < 0) {
|
|
|
|
talloc_free(fn_data);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
mp_dispatch_enqueue_autofree(ctx->mpctx->dispatch, fn, fn_data);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct cmd_request {
|
|
|
|
struct MPContext *mpctx;
|
|
|
|
struct mp_cmd *cmd;
|
|
|
|
int status;
|
|
|
|
struct mpv_handle *reply_ctx;
|
|
|
|
uint64_t userdata;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void cmd_fn(void *data)
|
|
|
|
{
|
|
|
|
struct cmd_request *req = data;
|
2014-06-01 01:41:46 +00:00
|
|
|
int r = run_command(req->mpctx, req->cmd);
|
|
|
|
req->status = r >= 0 ? 0 : MPV_ERROR_COMMAND;
|
2014-02-10 20:01:35 +00:00
|
|
|
talloc_free(req->cmd);
|
|
|
|
if (req->reply_ctx) {
|
|
|
|
status_reply(req->reply_ctx, MPV_EVENT_COMMAND_REPLY,
|
|
|
|
req->userdata, req->status);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int run_client_command(mpv_handle *ctx, struct mp_cmd *cmd)
|
|
|
|
{
|
|
|
|
if (!ctx->mpctx->initialized)
|
|
|
|
return MPV_ERROR_UNINITIALIZED;
|
|
|
|
if (!cmd)
|
|
|
|
return MPV_ERROR_INVALID_PARAMETER;
|
|
|
|
|
2014-09-13 14:52:42 +00:00
|
|
|
if (mp_input_is_abort_cmd(cmd))
|
|
|
|
mp_cancel_trigger(ctx->mpctx->playback_abort);
|
|
|
|
|
command: add a mechanism to allow scripts to intercept file loads
A vague idea to get something similar what libquvi did.
Undocumented because it might change a lot, or even be removed. To give
an idea what it does, a Lua script could do the following:
-- type ID priority
mp.commandv("hook_add", "on_load", 0, 0)
mp.register_script_message("hook_run", function(param, param2)
-- param is "0", the user-chosen ID from the hook_add command
-- param2 is the magic value that has to be passed to finish
-- the hook
mp.resume_all()
-- do something, maybe set options that are reset on end:
mp.set_property("file-local-options/name", "value")
-- or change the URL that's being opened:
local url = mp.get_property("stream-open-filename")
mp.set_property("stream-open-filename", url .. ".png")
-- let the player (or the next script) continue
mp.commandv("hook_ack", param2)
end)
2014-10-15 21:09:53 +00:00
|
|
|
cmd->sender = ctx->name;
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
struct cmd_request req = {
|
|
|
|
.mpctx = ctx->mpctx,
|
|
|
|
.cmd = cmd,
|
|
|
|
};
|
|
|
|
run_locked(ctx, cmd_fn, &req);
|
|
|
|
return req.status;
|
|
|
|
}
|
|
|
|
|
|
|
|
int mpv_command(mpv_handle *ctx, const char **args)
|
|
|
|
{
|
2014-10-10 20:58:28 +00:00
|
|
|
return run_client_command(ctx, mp_input_parse_cmd_strv(ctx->log, args));
|
2014-02-10 20:01:35 +00:00
|
|
|
}
|
|
|
|
|
2014-10-10 21:58:59 +00:00
|
|
|
int mpv_command_node(mpv_handle *ctx, mpv_node *args, mpv_node *result)
|
|
|
|
{
|
|
|
|
int r = run_client_command(ctx, mp_input_parse_cmd_node(ctx->log, args));
|
2014-10-11 05:16:56 +00:00
|
|
|
if (result && r >= 0)
|
2014-10-10 21:58:59 +00:00
|
|
|
*result = (mpv_node){.format = MPV_FORMAT_NONE};
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
int mpv_command_string(mpv_handle *ctx, const char *args)
|
|
|
|
{
|
|
|
|
return run_client_command(ctx,
|
|
|
|
mp_input_parse_cmd(ctx->mpctx->input, bstr0((char*)args), ctx->name));
|
|
|
|
}
|
|
|
|
|
2014-10-10 21:58:59 +00:00
|
|
|
static int run_cmd_async(mpv_handle *ctx, uint64_t ud, struct mp_cmd *cmd)
|
2014-02-10 20:01:35 +00:00
|
|
|
{
|
|
|
|
if (!ctx->mpctx->initialized)
|
|
|
|
return MPV_ERROR_UNINITIALIZED;
|
|
|
|
if (!cmd)
|
|
|
|
return MPV_ERROR_INVALID_PARAMETER;
|
|
|
|
|
command: add a mechanism to allow scripts to intercept file loads
A vague idea to get something similar what libquvi did.
Undocumented because it might change a lot, or even be removed. To give
an idea what it does, a Lua script could do the following:
-- type ID priority
mp.commandv("hook_add", "on_load", 0, 0)
mp.register_script_message("hook_run", function(param, param2)
-- param is "0", the user-chosen ID from the hook_add command
-- param2 is the magic value that has to be passed to finish
-- the hook
mp.resume_all()
-- do something, maybe set options that are reset on end:
mp.set_property("file-local-options/name", "value")
-- or change the URL that's being opened:
local url = mp.get_property("stream-open-filename")
mp.set_property("stream-open-filename", url .. ".png")
-- let the player (or the next script) continue
mp.commandv("hook_ack", param2)
end)
2014-10-15 21:09:53 +00:00
|
|
|
cmd->sender = ctx->name;
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
struct cmd_request *req = talloc_ptrtype(NULL, req);
|
|
|
|
*req = (struct cmd_request){
|
|
|
|
.mpctx = ctx->mpctx,
|
|
|
|
.cmd = cmd,
|
|
|
|
.reply_ctx = ctx,
|
|
|
|
.userdata = ud,
|
|
|
|
};
|
|
|
|
return run_async(ctx, cmd_fn, req);
|
|
|
|
}
|
|
|
|
|
2014-10-10 21:58:59 +00:00
|
|
|
int mpv_command_async(mpv_handle *ctx, uint64_t ud, const char **args)
|
|
|
|
{
|
|
|
|
return run_cmd_async(ctx, ud, mp_input_parse_cmd_strv(ctx->log, args));
|
|
|
|
}
|
|
|
|
|
|
|
|
int mpv_command_node_async(mpv_handle *ctx, uint64_t ud, mpv_node *args)
|
|
|
|
{
|
|
|
|
return run_cmd_async(ctx, ud, mp_input_parse_cmd_node(ctx->log, args));
|
|
|
|
}
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
static int translate_property_error(int errc)
|
|
|
|
{
|
|
|
|
switch (errc) {
|
|
|
|
case M_PROPERTY_OK: return 0;
|
|
|
|
case M_PROPERTY_ERROR: return MPV_ERROR_PROPERTY_ERROR;
|
|
|
|
case M_PROPERTY_UNAVAILABLE: return MPV_ERROR_PROPERTY_UNAVAILABLE;
|
|
|
|
case M_PROPERTY_NOT_IMPLEMENTED: return MPV_ERROR_PROPERTY_ERROR;
|
|
|
|
case M_PROPERTY_UNKNOWN: return MPV_ERROR_PROPERTY_NOT_FOUND;
|
2014-02-24 19:16:22 +00:00
|
|
|
case M_PROPERTY_INVALID_FORMAT: return MPV_ERROR_PROPERTY_FORMAT;
|
2014-02-10 20:01:35 +00:00
|
|
|
// shouldn't happen
|
|
|
|
default: return MPV_ERROR_PROPERTY_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
struct setproperty_request {
|
|
|
|
struct MPContext *mpctx;
|
|
|
|
const char *name;
|
|
|
|
int format;
|
|
|
|
void *data;
|
|
|
|
int status;
|
|
|
|
struct mpv_handle *reply_ctx;
|
|
|
|
uint64_t userdata;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void setproperty_fn(void *arg)
|
|
|
|
{
|
|
|
|
struct setproperty_request *req = arg;
|
2014-02-24 19:16:22 +00:00
|
|
|
const struct m_option *type = get_mp_type(req->format);
|
2014-02-10 20:01:35 +00:00
|
|
|
|
2014-02-26 19:39:15 +00:00
|
|
|
int err;
|
2014-02-24 19:16:22 +00:00
|
|
|
switch (req->format) {
|
2014-02-26 19:39:15 +00:00
|
|
|
case MPV_FORMAT_STRING: {
|
|
|
|
// Go through explicit string conversion. M_PROPERTY_SET_NODE doesn't
|
|
|
|
// do this, because it tries to be somewhat type-strict. But the client
|
|
|
|
// needs a way to set everything by string.
|
|
|
|
char *s = *(char **)req->data;
|
2014-10-23 12:55:58 +00:00
|
|
|
MP_VERBOSE(req->mpctx, "Set property string: %s='%s'\n", req->name, s);
|
2014-02-26 19:39:15 +00:00
|
|
|
err = mp_property_do(req->name, M_PROPERTY_SET_STRING, s, req->mpctx);
|
2014-02-24 19:16:22 +00:00
|
|
|
break;
|
2014-02-26 19:39:15 +00:00
|
|
|
}
|
|
|
|
case MPV_FORMAT_NODE:
|
2014-02-24 19:16:22 +00:00
|
|
|
case MPV_FORMAT_FLAG:
|
|
|
|
case MPV_FORMAT_INT64:
|
2014-02-26 19:39:15 +00:00
|
|
|
case MPV_FORMAT_DOUBLE: {
|
|
|
|
struct mpv_node node;
|
|
|
|
if (req->format == MPV_FORMAT_NODE) {
|
|
|
|
node = *(struct mpv_node *)req->data;
|
|
|
|
} else {
|
|
|
|
// These are basically emulated via mpv_node.
|
|
|
|
node.format = req->format;
|
|
|
|
memcpy(&node.u, req->data, type->type->size);
|
|
|
|
}
|
2014-10-23 12:55:58 +00:00
|
|
|
if (mp_msg_test(req->mpctx->log, MSGL_V)) {
|
|
|
|
struct m_option ot = {.type = &m_option_type_node};
|
|
|
|
char *t = m_option_print(&ot, &node);
|
|
|
|
MP_VERBOSE(req->mpctx, "Set property: %s=%s\n", req->name, t ? t : "?");
|
|
|
|
talloc_free(t);
|
|
|
|
}
|
2014-02-26 19:39:15 +00:00
|
|
|
err = mp_property_do(req->name, M_PROPERTY_SET_NODE, &node, req->mpctx);
|
2014-02-24 19:16:22 +00:00
|
|
|
break;
|
2014-02-26 19:39:15 +00:00
|
|
|
}
|
2014-02-24 19:16:22 +00:00
|
|
|
default:
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
|
|
|
|
req->status = translate_property_error(err);
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
if (req->reply_ctx) {
|
|
|
|
status_reply(req->reply_ctx, MPV_EVENT_SET_PROPERTY_REPLY,
|
|
|
|
req->userdata, req->status);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int mpv_set_property(mpv_handle *ctx, const char *name, mpv_format format,
|
|
|
|
void *data)
|
|
|
|
{
|
|
|
|
if (!ctx->mpctx->initialized)
|
|
|
|
return MPV_ERROR_UNINITIALIZED;
|
2014-02-24 19:16:22 +00:00
|
|
|
if (!get_mp_type(format))
|
|
|
|
return MPV_ERROR_PROPERTY_FORMAT;
|
2014-02-10 20:01:35 +00:00
|
|
|
|
|
|
|
struct setproperty_request req = {
|
|
|
|
.mpctx = ctx->mpctx,
|
|
|
|
.name = name,
|
|
|
|
.format = format,
|
2014-02-26 13:05:17 +00:00
|
|
|
.data = data,
|
2014-02-10 20:01:35 +00:00
|
|
|
};
|
|
|
|
run_locked(ctx, setproperty_fn, &req);
|
|
|
|
return req.status;
|
|
|
|
}
|
|
|
|
|
|
|
|
int mpv_set_property_string(mpv_handle *ctx, const char *name, const char *data)
|
|
|
|
{
|
2014-02-24 18:35:06 +00:00
|
|
|
return mpv_set_property(ctx, name, MPV_FORMAT_STRING, &data);
|
2014-02-10 20:01:35 +00:00
|
|
|
}
|
|
|
|
|
2014-02-24 19:16:22 +00:00
|
|
|
static void free_prop_set_req(void *ptr)
|
|
|
|
{
|
|
|
|
struct setproperty_request *req = ptr;
|
|
|
|
const struct m_option *type = get_mp_type(req->format);
|
|
|
|
m_option_free(type, req->data);
|
|
|
|
}
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
int mpv_set_property_async(mpv_handle *ctx, uint64_t ud, const char *name,
|
|
|
|
mpv_format format, void *data)
|
|
|
|
{
|
2014-02-24 19:16:22 +00:00
|
|
|
const struct m_option *type = get_mp_type(format);
|
2014-02-10 20:01:35 +00:00
|
|
|
if (!ctx->mpctx->initialized)
|
|
|
|
return MPV_ERROR_UNINITIALIZED;
|
2014-02-24 19:16:22 +00:00
|
|
|
if (!type)
|
|
|
|
return MPV_ERROR_PROPERTY_FORMAT;
|
2014-02-10 20:01:35 +00:00
|
|
|
|
|
|
|
struct setproperty_request *req = talloc_ptrtype(NULL, req);
|
|
|
|
*req = (struct setproperty_request){
|
|
|
|
.mpctx = ctx->mpctx,
|
|
|
|
.name = talloc_strdup(req, name),
|
2014-02-24 19:16:22 +00:00
|
|
|
.format = format,
|
|
|
|
.data = talloc_zero_size(req, type->type->size),
|
2014-02-10 20:01:35 +00:00
|
|
|
.reply_ctx = ctx,
|
|
|
|
.userdata = ud,
|
|
|
|
};
|
|
|
|
|
2014-02-24 19:16:22 +00:00
|
|
|
m_option_copy(type, req->data, data);
|
|
|
|
talloc_set_destructor(req, free_prop_set_req);
|
|
|
|
|
|
|
|
return run_async(ctx, setproperty_fn, req);
|
2014-02-10 20:01:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
struct getproperty_request {
|
|
|
|
struct MPContext *mpctx;
|
|
|
|
const char *name;
|
|
|
|
mpv_format format;
|
|
|
|
void *data;
|
|
|
|
int status;
|
|
|
|
struct mpv_handle *reply_ctx;
|
|
|
|
uint64_t userdata;
|
|
|
|
};
|
|
|
|
|
2014-02-24 19:16:22 +00:00
|
|
|
static void free_prop_data(void *ptr)
|
|
|
|
{
|
|
|
|
struct mpv_event_property *prop = ptr;
|
|
|
|
const struct m_option *type = get_mp_type_get(prop->format);
|
|
|
|
m_option_free(type, prop->data);
|
|
|
|
}
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
static void getproperty_fn(void *arg)
|
|
|
|
{
|
|
|
|
struct getproperty_request *req = arg;
|
2014-02-24 19:16:22 +00:00
|
|
|
const struct m_option *type = get_mp_type_get(req->format);
|
2014-02-10 20:01:35 +00:00
|
|
|
|
2014-02-24 19:16:22 +00:00
|
|
|
union m_option_value xdata = {0};
|
2014-02-10 20:01:35 +00:00
|
|
|
void *data = req->data ? req->data : &xdata;
|
|
|
|
|
2014-02-24 19:16:22 +00:00
|
|
|
int err = -1;
|
|
|
|
switch (req->format) {
|
|
|
|
case MPV_FORMAT_OSD_STRING:
|
|
|
|
err = mp_property_do(req->name, M_PROPERTY_PRINT, data, req->mpctx);
|
|
|
|
break;
|
|
|
|
case MPV_FORMAT_STRING: {
|
|
|
|
char *s = NULL;
|
|
|
|
err = mp_property_do(req->name, M_PROPERTY_GET_STRING, &s, req->mpctx);
|
|
|
|
if (err == M_PROPERTY_OK)
|
|
|
|
*(char **)req->data = s;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case MPV_FORMAT_NODE:
|
|
|
|
case MPV_FORMAT_FLAG:
|
|
|
|
case MPV_FORMAT_INT64:
|
|
|
|
case MPV_FORMAT_DOUBLE: {
|
|
|
|
struct mpv_node node = {{0}};
|
|
|
|
err = mp_property_do(req->name, M_PROPERTY_GET_NODE, &node, req->mpctx);
|
|
|
|
if (err == M_PROPERTY_NOT_IMPLEMENTED) {
|
|
|
|
// Go through explicit string conversion. Same reasoning as on the
|
|
|
|
// GET code path.
|
|
|
|
char *s = NULL;
|
|
|
|
err = mp_property_do(req->name, M_PROPERTY_GET_STRING, &s,
|
|
|
|
req->mpctx);
|
|
|
|
if (err != M_PROPERTY_OK)
|
|
|
|
break;
|
|
|
|
node.format = MPV_FORMAT_STRING;
|
|
|
|
node.u.string = s;
|
2014-02-26 13:05:17 +00:00
|
|
|
} else if (err <= 0)
|
|
|
|
break;
|
2014-02-24 19:16:22 +00:00
|
|
|
if (req->format == MPV_FORMAT_NODE) {
|
|
|
|
*(struct mpv_node *)data = node;
|
|
|
|
} else {
|
|
|
|
if (!conv_node_to_format(data, req->format, &node)) {
|
|
|
|
err = M_PROPERTY_INVALID_FORMAT;
|
|
|
|
mpv_free_node_contents(&node);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
abort();
|
2014-02-10 20:01:35 +00:00
|
|
|
}
|
|
|
|
|
2014-02-24 19:16:22 +00:00
|
|
|
req->status = translate_property_error(err);
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
if (req->reply_ctx) {
|
|
|
|
struct mpv_event_property *prop = talloc_ptrtype(NULL, prop);
|
|
|
|
*prop = (struct mpv_event_property){
|
|
|
|
.name = talloc_steal(prop, (char *)req->name),
|
|
|
|
.format = req->format,
|
2014-02-24 19:16:22 +00:00
|
|
|
.data = talloc_size(prop, type->type->size),
|
2014-02-10 20:01:35 +00:00
|
|
|
};
|
2014-02-24 19:16:22 +00:00
|
|
|
// move data
|
|
|
|
memcpy(prop->data, &xdata, type->type->size);
|
|
|
|
talloc_set_destructor(prop, free_prop_data);
|
2014-02-10 20:01:35 +00:00
|
|
|
struct mpv_event reply = {
|
|
|
|
.event_id = MPV_EVENT_GET_PROPERTY_REPLY,
|
|
|
|
.data = prop,
|
|
|
|
.error = req->status,
|
|
|
|
};
|
|
|
|
send_reply(req->reply_ctx, req->userdata, &reply);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int mpv_get_property(mpv_handle *ctx, const char *name, mpv_format format,
|
|
|
|
void *data)
|
|
|
|
{
|
|
|
|
if (!ctx->mpctx->initialized)
|
|
|
|
return MPV_ERROR_UNINITIALIZED;
|
2014-02-24 19:16:22 +00:00
|
|
|
if (!data)
|
|
|
|
return MPV_ERROR_INVALID_PARAMETER;
|
|
|
|
if (!get_mp_type_get(format))
|
|
|
|
return MPV_ERROR_PROPERTY_FORMAT;
|
2014-02-10 20:01:35 +00:00
|
|
|
|
|
|
|
struct getproperty_request req = {
|
|
|
|
.mpctx = ctx->mpctx,
|
|
|
|
.name = name,
|
|
|
|
.format = format,
|
|
|
|
.data = data,
|
|
|
|
};
|
|
|
|
run_locked(ctx, getproperty_fn, &req);
|
|
|
|
return req.status;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *mpv_get_property_string(mpv_handle *ctx, const char *name)
|
|
|
|
{
|
|
|
|
char *str = NULL;
|
|
|
|
mpv_get_property(ctx, name, MPV_FORMAT_STRING, &str);
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *mpv_get_property_osd_string(mpv_handle *ctx, const char *name)
|
|
|
|
{
|
|
|
|
char *str = NULL;
|
|
|
|
mpv_get_property(ctx, name, MPV_FORMAT_OSD_STRING, &str);
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
|
|
|
int mpv_get_property_async(mpv_handle *ctx, uint64_t ud, const char *name,
|
|
|
|
mpv_format format)
|
|
|
|
{
|
|
|
|
if (!ctx->mpctx->initialized)
|
|
|
|
return MPV_ERROR_UNINITIALIZED;
|
2014-02-24 19:16:22 +00:00
|
|
|
if (!get_mp_type_get(format))
|
|
|
|
return MPV_ERROR_PROPERTY_FORMAT;
|
2014-02-10 20:01:35 +00:00
|
|
|
|
|
|
|
struct getproperty_request *req = talloc_ptrtype(NULL, req);
|
|
|
|
*req = (struct getproperty_request){
|
|
|
|
.mpctx = ctx->mpctx,
|
|
|
|
.name = talloc_strdup(req, name),
|
|
|
|
.format = format,
|
|
|
|
.reply_ctx = ctx,
|
|
|
|
.userdata = ud,
|
|
|
|
};
|
|
|
|
return run_async(ctx, getproperty_fn, req);
|
|
|
|
}
|
|
|
|
|
2014-04-05 21:54:21 +00:00
|
|
|
static void property_free(void *p)
|
|
|
|
{
|
|
|
|
struct observe_property *prop = p;
|
|
|
|
const struct m_option *type = get_mp_type_get(prop->format);
|
2014-05-17 21:59:27 +00:00
|
|
|
if (type) {
|
|
|
|
m_option_free(type, &prop->new_value);
|
|
|
|
m_option_free(type, &prop->user_value);
|
|
|
|
}
|
2014-04-05 21:54:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int mpv_observe_property(mpv_handle *ctx, uint64_t userdata,
|
|
|
|
const char *name, mpv_format format)
|
|
|
|
{
|
|
|
|
if (format != MPV_FORMAT_NONE && !get_mp_type_get(format))
|
|
|
|
return MPV_ERROR_PROPERTY_FORMAT;
|
|
|
|
// Explicitly disallow this, because it would require a special code path.
|
|
|
|
if (format == MPV_FORMAT_OSD_STRING)
|
|
|
|
return MPV_ERROR_PROPERTY_FORMAT;
|
|
|
|
|
|
|
|
pthread_mutex_lock(&ctx->lock);
|
|
|
|
struct observe_property *prop = talloc_ptrtype(ctx, prop);
|
|
|
|
talloc_set_destructor(prop, property_free);
|
|
|
|
*prop = (struct observe_property){
|
|
|
|
.client = ctx,
|
|
|
|
.name = talloc_strdup(prop, name),
|
2014-08-01 23:39:28 +00:00
|
|
|
.id = mp_get_property_id(name),
|
|
|
|
.event_mask = mp_get_property_event_mask(name),
|
2014-04-05 21:54:21 +00:00
|
|
|
.reply_id = userdata,
|
|
|
|
.format = format,
|
|
|
|
.changed = true,
|
|
|
|
.need_new_value = true,
|
|
|
|
};
|
|
|
|
MP_TARRAY_APPEND(ctx, ctx->properties, ctx->num_properties, prop);
|
2014-08-01 23:39:28 +00:00
|
|
|
ctx->property_event_masks |= prop->event_mask;
|
2014-04-05 21:54:21 +00:00
|
|
|
ctx->lowest_changed = 0;
|
|
|
|
pthread_mutex_unlock(&ctx->lock);
|
2014-08-28 15:35:50 +00:00
|
|
|
invalidate_global_event_mask(ctx);
|
2014-04-05 21:54:21 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int mpv_unobserve_property(mpv_handle *ctx, uint64_t userdata)
|
|
|
|
{
|
|
|
|
pthread_mutex_lock(&ctx->lock);
|
2014-08-01 23:39:28 +00:00
|
|
|
ctx->property_event_masks = 0;
|
2014-04-05 21:54:21 +00:00
|
|
|
int count = 0;
|
|
|
|
for (int n = ctx->num_properties - 1; n >= 0; n--) {
|
|
|
|
struct observe_property *prop = ctx->properties[n];
|
|
|
|
if (prop->reply_id == userdata) {
|
|
|
|
if (prop->updating) {
|
|
|
|
prop->dead = true;
|
|
|
|
} else {
|
|
|
|
// In case mpv_unobserve_property() is called after mpv_wait_event()
|
|
|
|
// returned, and the mpv_event still references the name somehow,
|
|
|
|
// make sure it's not freed while in use. The same can happen
|
|
|
|
// with the value update mechanism.
|
|
|
|
talloc_steal(ctx->cur_event, prop);
|
|
|
|
}
|
|
|
|
MP_TARRAY_REMOVE_AT(ctx->properties, ctx->num_properties, n);
|
|
|
|
count++;
|
|
|
|
}
|
2014-08-01 23:39:28 +00:00
|
|
|
if (!prop->dead)
|
|
|
|
ctx->property_event_masks |= prop->event_mask;
|
2014-04-05 21:54:21 +00:00
|
|
|
}
|
|
|
|
ctx->lowest_changed = 0;
|
|
|
|
pthread_mutex_unlock(&ctx->lock);
|
2014-08-28 15:35:50 +00:00
|
|
|
invalidate_global_event_mask(ctx);
|
2014-04-05 21:54:21 +00:00
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
2014-08-01 23:39:28 +00:00
|
|
|
static void mark_property_changed(struct mpv_handle *client, int index)
|
2014-04-05 21:54:21 +00:00
|
|
|
{
|
2014-08-01 23:39:28 +00:00
|
|
|
struct observe_property *prop = client->properties[index];
|
|
|
|
if (!prop->changed && !prop->need_new_value) {
|
|
|
|
prop->changed = true;
|
|
|
|
prop->need_new_value = prop->format != 0;
|
|
|
|
client->lowest_changed = MPMIN(client->lowest_changed, index);
|
|
|
|
}
|
2014-04-05 21:54:21 +00:00
|
|
|
}
|
|
|
|
|
2014-08-01 23:39:28 +00:00
|
|
|
// Broadcast that a property has changed.
|
|
|
|
void mp_client_property_change(struct MPContext *mpctx, const char *name)
|
2014-04-05 21:54:21 +00:00
|
|
|
{
|
|
|
|
struct mp_client_api *clients = mpctx->clients;
|
2014-08-01 23:39:28 +00:00
|
|
|
int id = mp_get_property_id(name);
|
2014-04-05 21:54:21 +00:00
|
|
|
|
|
|
|
pthread_mutex_lock(&clients->lock);
|
|
|
|
|
|
|
|
for (int n = 0; n < clients->num_clients; n++) {
|
|
|
|
struct mpv_handle *client = clients->clients[n];
|
|
|
|
pthread_mutex_lock(&client->lock);
|
|
|
|
for (int i = 0; i < client->num_properties; i++) {
|
2014-08-01 23:39:28 +00:00
|
|
|
if (client->properties[i]->id == id)
|
|
|
|
mark_property_changed(client, i);
|
2014-04-05 21:54:21 +00:00
|
|
|
}
|
|
|
|
if (client->lowest_changed < client->num_properties)
|
|
|
|
wakeup_client(client);
|
|
|
|
pthread_mutex_unlock(&client->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
pthread_mutex_unlock(&clients->lock);
|
|
|
|
}
|
|
|
|
|
2014-08-01 23:39:28 +00:00
|
|
|
// Mark properties as changed in reaction to specific events.
|
|
|
|
// Called with ctx->lock held.
|
|
|
|
static void notify_property_events(struct mpv_handle *ctx, uint64_t event_mask)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < ctx->num_properties; i++) {
|
|
|
|
if (ctx->properties[i]->event_mask & event_mask)
|
|
|
|
mark_property_changed(ctx, i);
|
|
|
|
}
|
|
|
|
if (ctx->lowest_changed < ctx->num_properties)
|
|
|
|
wakeup_client(ctx);
|
|
|
|
}
|
|
|
|
|
2014-04-05 21:54:21 +00:00
|
|
|
static void update_prop(void *p)
|
|
|
|
{
|
|
|
|
struct observe_property *prop = p;
|
|
|
|
struct mpv_handle *ctx = prop->client;
|
|
|
|
|
|
|
|
const struct m_option *type = get_mp_type_get(prop->format);
|
|
|
|
union m_option_value val = {0};
|
|
|
|
|
|
|
|
struct getproperty_request req = {
|
|
|
|
.mpctx = ctx->mpctx,
|
|
|
|
.name = prop->name,
|
|
|
|
.format = prop->format,
|
|
|
|
.data = &val,
|
|
|
|
};
|
|
|
|
|
|
|
|
getproperty_fn(&req);
|
|
|
|
|
|
|
|
pthread_mutex_lock(&ctx->lock);
|
|
|
|
ctx->properties_updating--;
|
|
|
|
prop->updating = false;
|
2014-05-17 21:59:27 +00:00
|
|
|
m_option_free(type, &prop->new_value);
|
|
|
|
prop->new_value_valid = req.status >= 0;
|
|
|
|
if (prop->new_value_valid)
|
|
|
|
memcpy(&prop->new_value, &val, type->type->size);
|
|
|
|
if (prop->user_value_valid != prop->new_value_valid) {
|
2014-04-08 20:06:39 +00:00
|
|
|
prop->changed = true;
|
2014-05-17 21:59:27 +00:00
|
|
|
} else if (prop->user_value_valid && prop->new_value_valid) {
|
|
|
|
if (!compare_value(&prop->user_value, &prop->new_value, prop->format))
|
2014-04-08 20:06:39 +00:00
|
|
|
prop->changed = true;
|
2014-04-05 21:54:21 +00:00
|
|
|
}
|
|
|
|
if (prop->dead)
|
|
|
|
talloc_steal(ctx->cur_event, prop);
|
|
|
|
wakeup_client(ctx);
|
|
|
|
pthread_mutex_unlock(&ctx->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set ctx->cur_event to a generated property change event, if there is any
|
|
|
|
// outstanding property.
|
|
|
|
static bool gen_property_change_event(struct mpv_handle *ctx)
|
|
|
|
{
|
2014-06-06 15:27:05 +00:00
|
|
|
if (!ctx->mpctx->initialized)
|
|
|
|
return false;
|
2014-04-05 21:54:21 +00:00
|
|
|
int start = ctx->lowest_changed;
|
|
|
|
ctx->lowest_changed = ctx->num_properties;
|
|
|
|
for (int n = start; n < ctx->num_properties; n++) {
|
|
|
|
struct observe_property *prop = ctx->properties[n];
|
|
|
|
if ((prop->changed || prop->updating) && n < ctx->lowest_changed)
|
|
|
|
ctx->lowest_changed = n;
|
|
|
|
if (prop->changed) {
|
2014-05-24 14:16:06 +00:00
|
|
|
bool get_value = prop->need_new_value;
|
|
|
|
prop->need_new_value = false;
|
2014-05-17 21:59:27 +00:00
|
|
|
prop->changed = false;
|
2014-05-24 14:16:06 +00:00
|
|
|
if (prop->format && get_value) {
|
2014-04-05 21:54:21 +00:00
|
|
|
ctx->properties_updating++;
|
|
|
|
prop->updating = true;
|
|
|
|
mp_dispatch_enqueue(ctx->mpctx->dispatch, update_prop, prop);
|
|
|
|
} else {
|
2014-05-17 21:59:27 +00:00
|
|
|
const struct m_option *type = get_mp_type_get(prop->format);
|
|
|
|
prop->user_value_valid = prop->new_value_valid;
|
|
|
|
if (prop->new_value_valid)
|
|
|
|
m_option_copy(type, &prop->user_value, &prop->new_value);
|
2014-04-05 21:54:21 +00:00
|
|
|
ctx->cur_property_event = (struct mpv_event_property){
|
|
|
|
.name = prop->name,
|
2014-05-17 21:59:27 +00:00
|
|
|
.format = prop->user_value_valid ? prop->format : 0,
|
2014-04-05 21:54:21 +00:00
|
|
|
};
|
2014-05-17 21:59:27 +00:00
|
|
|
if (prop->user_value_valid)
|
|
|
|
ctx->cur_property_event.data = &prop->user_value;
|
2014-04-05 21:54:21 +00:00
|
|
|
*ctx->cur_event = (struct mpv_event){
|
|
|
|
.event_id = MPV_EVENT_PROPERTY_CHANGE,
|
|
|
|
.reply_userdata = prop->reply_id,
|
|
|
|
.data = &ctx->cur_property_event,
|
|
|
|
};
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2014-05-18 16:58:36 +00:00
|
|
|
int mpv_load_config_file(mpv_handle *ctx, const char *filename)
|
|
|
|
{
|
|
|
|
int flags = ctx->mpctx->initialized ? M_SETOPT_RUNTIME : 0;
|
|
|
|
lock_core(ctx);
|
|
|
|
int r = m_config_parse_config_file(ctx->mpctx->mconfig, filename, NULL, flags);
|
|
|
|
unlock_core(ctx);
|
|
|
|
if (r == 0)
|
|
|
|
return MPV_ERROR_INVALID_PARAMETER;
|
|
|
|
if (r < 0)
|
|
|
|
return MPV_ERROR_OPTION_ERROR;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
client API: restructure waiting, do log msg wakeup properly
Until now, availability of new log messages (through the mechanism
associated with mpv_request_log_messages()) did not wakeup the client
API properly. Commit 3b7402b5 was basically a hack to improve that
somewhat, but it wasn't a solution.
The main problem is that the client API itself is producing messages, so
the message callback would attempt to lock the client API lock,
resulting in a deadlock. Even if the lock was recursive, we'd run into
lock-order issues.
Solve this by using a separate lock for waiting and wakeup. Also, since
it's a natural addition, avoid redundant wakeups. This means the wakeup
callback as well as the wakeup pipe will be triggered only once until
the next mpv_wait_event() call happens.
This might make the wakeup callback be invoked in a reentrant way for
the first time, for example if a mpv_* function prints to a log. Adjust
the docs accordingly. (Note that non-reentrant beheavior was never
guaranteed - basically the wakeup callback is somewhat dangerous and
inconvenient.)
Also remove some traces of unneeded code. ctx->shutdown for one was
never set, and probably a leftover of an abandoned idea.
2014-06-07 21:15:07 +00:00
|
|
|
static void msg_wakeup(void *p)
|
2014-06-06 17:24:30 +00:00
|
|
|
{
|
client API: restructure waiting, do log msg wakeup properly
Until now, availability of new log messages (through the mechanism
associated with mpv_request_log_messages()) did not wakeup the client
API properly. Commit 3b7402b5 was basically a hack to improve that
somewhat, but it wasn't a solution.
The main problem is that the client API itself is producing messages, so
the message callback would attempt to lock the client API lock,
resulting in a deadlock. Even if the lock was recursive, we'd run into
lock-order issues.
Solve this by using a separate lock for waiting and wakeup. Also, since
it's a natural addition, avoid redundant wakeups. This means the wakeup
callback as well as the wakeup pipe will be triggered only once until
the next mpv_wait_event() call happens.
This might make the wakeup callback be invoked in a reentrant way for
the first time, for example if a mpv_* function prints to a log. Adjust
the docs accordingly. (Note that non-reentrant beheavior was never
guaranteed - basically the wakeup callback is somewhat dangerous and
inconvenient.)
Also remove some traces of unneeded code. ctx->shutdown for one was
never set, and probably a leftover of an abandoned idea.
2014-06-07 21:15:07 +00:00
|
|
|
mpv_handle *ctx = p;
|
|
|
|
wakeup_client(ctx);
|
2014-06-06 17:24:30 +00:00
|
|
|
}
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
int mpv_request_log_messages(mpv_handle *ctx, const char *min_level)
|
|
|
|
{
|
|
|
|
int level = -1;
|
|
|
|
for (int n = 0; n < MSGL_MAX + 1; n++) {
|
|
|
|
if (mp_log_levels[n] && strcmp(min_level, mp_log_levels[n]) == 0) {
|
|
|
|
level = n;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (level < 0 && strcmp(min_level, "no") != 0)
|
|
|
|
return MPV_ERROR_INVALID_PARAMETER;
|
|
|
|
|
|
|
|
pthread_mutex_lock(&ctx->lock);
|
client API: restructure waiting, do log msg wakeup properly
Until now, availability of new log messages (through the mechanism
associated with mpv_request_log_messages()) did not wakeup the client
API properly. Commit 3b7402b5 was basically a hack to improve that
somewhat, but it wasn't a solution.
The main problem is that the client API itself is producing messages, so
the message callback would attempt to lock the client API lock,
resulting in a deadlock. Even if the lock was recursive, we'd run into
lock-order issues.
Solve this by using a separate lock for waiting and wakeup. Also, since
it's a natural addition, avoid redundant wakeups. This means the wakeup
callback as well as the wakeup pipe will be triggered only once until
the next mpv_wait_event() call happens.
This might make the wakeup callback be invoked in a reentrant way for
the first time, for example if a mpv_* function prints to a log. Adjust
the docs accordingly. (Note that non-reentrant beheavior was never
guaranteed - basically the wakeup callback is somewhat dangerous and
inconvenient.)
Also remove some traces of unneeded code. ctx->shutdown for one was
never set, and probably a leftover of an abandoned idea.
2014-06-07 21:15:07 +00:00
|
|
|
mp_msg_log_buffer_destroy(ctx->messages);
|
|
|
|
ctx->messages = NULL;
|
|
|
|
if (level >= 0) {
|
|
|
|
int size = level >= MSGL_V ? 10000 : 1000;
|
|
|
|
ctx->messages = mp_msg_log_buffer_new(ctx->mpctx->global, size, level,
|
|
|
|
msg_wakeup, ctx);
|
|
|
|
}
|
2014-02-10 20:01:35 +00:00
|
|
|
pthread_mutex_unlock(&ctx->lock);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-04-12 18:13:07 +00:00
|
|
|
int mpv_get_wakeup_pipe(mpv_handle *ctx)
|
|
|
|
{
|
client API: restructure waiting, do log msg wakeup properly
Until now, availability of new log messages (through the mechanism
associated with mpv_request_log_messages()) did not wakeup the client
API properly. Commit 3b7402b5 was basically a hack to improve that
somewhat, but it wasn't a solution.
The main problem is that the client API itself is producing messages, so
the message callback would attempt to lock the client API lock,
resulting in a deadlock. Even if the lock was recursive, we'd run into
lock-order issues.
Solve this by using a separate lock for waiting and wakeup. Also, since
it's a natural addition, avoid redundant wakeups. This means the wakeup
callback as well as the wakeup pipe will be triggered only once until
the next mpv_wait_event() call happens.
This might make the wakeup callback be invoked in a reentrant way for
the first time, for example if a mpv_* function prints to a log. Adjust
the docs accordingly. (Note that non-reentrant beheavior was never
guaranteed - basically the wakeup callback is somewhat dangerous and
inconvenient.)
Also remove some traces of unneeded code. ctx->shutdown for one was
never set, and probably a leftover of an abandoned idea.
2014-06-07 21:15:07 +00:00
|
|
|
pthread_mutex_lock(&ctx->wakeup_lock);
|
2014-06-08 14:11:11 +00:00
|
|
|
if (ctx->wakeup_pipe[0] == -1) {
|
2014-07-25 12:30:59 +00:00
|
|
|
if (mp_make_wakeup_pipe(ctx->wakeup_pipe) >= 0)
|
|
|
|
write(ctx->wakeup_pipe[1], &(char){0}, 1);
|
2014-06-08 14:11:11 +00:00
|
|
|
}
|
2014-07-25 12:30:59 +00:00
|
|
|
int fd = ctx->wakeup_pipe[0];
|
client API: restructure waiting, do log msg wakeup properly
Until now, availability of new log messages (through the mechanism
associated with mpv_request_log_messages()) did not wakeup the client
API properly. Commit 3b7402b5 was basically a hack to improve that
somewhat, but it wasn't a solution.
The main problem is that the client API itself is producing messages, so
the message callback would attempt to lock the client API lock,
resulting in a deadlock. Even if the lock was recursive, we'd run into
lock-order issues.
Solve this by using a separate lock for waiting and wakeup. Also, since
it's a natural addition, avoid redundant wakeups. This means the wakeup
callback as well as the wakeup pipe will be triggered only once until
the next mpv_wait_event() call happens.
This might make the wakeup callback be invoked in a reentrant way for
the first time, for example if a mpv_* function prints to a log. Adjust
the docs accordingly. (Note that non-reentrant beheavior was never
guaranteed - basically the wakeup callback is somewhat dangerous and
inconvenient.)
Also remove some traces of unneeded code. ctx->shutdown for one was
never set, and probably a leftover of an abandoned idea.
2014-06-07 21:15:07 +00:00
|
|
|
pthread_mutex_unlock(&ctx->wakeup_lock);
|
2014-07-25 12:30:59 +00:00
|
|
|
return fd;
|
2014-04-12 18:13:07 +00:00
|
|
|
}
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
unsigned long mpv_client_api_version(void)
|
|
|
|
{
|
|
|
|
return MPV_CLIENT_API_VERSION;
|
|
|
|
}
|
|
|
|
|
2014-06-10 21:56:05 +00:00
|
|
|
static const char *const err_table[] = {
|
2014-02-10 20:01:35 +00:00
|
|
|
[-MPV_ERROR_SUCCESS] = "success",
|
|
|
|
[-MPV_ERROR_EVENT_QUEUE_FULL] = "event queue full",
|
|
|
|
[-MPV_ERROR_NOMEM] = "memory allocation failed",
|
|
|
|
[-MPV_ERROR_UNINITIALIZED] = "core not uninitialized",
|
|
|
|
[-MPV_ERROR_INVALID_PARAMETER] = "invalid parameter",
|
|
|
|
[-MPV_ERROR_OPTION_NOT_FOUND] = "option not found",
|
2014-02-24 19:05:56 +00:00
|
|
|
[-MPV_ERROR_OPTION_FORMAT] = "unsupported format for accessing option",
|
2014-02-10 20:01:35 +00:00
|
|
|
[-MPV_ERROR_OPTION_ERROR] = "error setting option",
|
|
|
|
[-MPV_ERROR_PROPERTY_NOT_FOUND] = "property not found",
|
2014-02-24 19:05:56 +00:00
|
|
|
[-MPV_ERROR_PROPERTY_FORMAT] = "unsupported format for accessing property",
|
2014-02-10 20:01:35 +00:00
|
|
|
[-MPV_ERROR_PROPERTY_UNAVAILABLE] = "property unavailable",
|
|
|
|
[-MPV_ERROR_PROPERTY_ERROR] = "error accessing property",
|
2014-06-01 01:41:46 +00:00
|
|
|
[-MPV_ERROR_COMMAND] = "error running command",
|
2014-10-28 15:19:07 +00:00
|
|
|
[-MPV_ERROR_LOADING_FAILED] = "loading failed",
|
|
|
|
[-MPV_ERROR_AO_INIT_FAILED] = "audio output initialization failed",
|
|
|
|
[-MPV_ERROR_VO_INIT_FAILED] = "audio output initialization failed",
|
|
|
|
[-MPV_ERROR_NOTHING_TO_PLAY] = "the file has no audio or video data",
|
|
|
|
[-MPV_ERROR_UNKNOWN_FORMAT] = "unrecognized file format",
|
2014-12-09 16:47:02 +00:00
|
|
|
[-MPV_ERROR_UNSUPPORTED] = "not supported",
|
|
|
|
[-MPV_ERROR_NOT_IMPLEMENTED] = "operation not implemented",
|
2014-02-10 20:01:35 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
const char *mpv_error_string(int error)
|
|
|
|
{
|
|
|
|
error = -error;
|
|
|
|
if (error < 0)
|
|
|
|
error = 0;
|
|
|
|
const char *name = NULL;
|
|
|
|
if (error < MP_ARRAY_SIZE(err_table))
|
|
|
|
name = err_table[error];
|
|
|
|
return name ? name : "unknown error";
|
|
|
|
}
|
|
|
|
|
2014-06-10 21:56:05 +00:00
|
|
|
static const char *const event_table[] = {
|
2014-02-10 20:01:35 +00:00
|
|
|
[MPV_EVENT_NONE] = "none",
|
|
|
|
[MPV_EVENT_SHUTDOWN] = "shutdown",
|
|
|
|
[MPV_EVENT_LOG_MESSAGE] = "log-message",
|
|
|
|
[MPV_EVENT_GET_PROPERTY_REPLY] = "get-property-reply",
|
|
|
|
[MPV_EVENT_SET_PROPERTY_REPLY] = "set-property-reply",
|
|
|
|
[MPV_EVENT_COMMAND_REPLY] = "command-reply",
|
|
|
|
[MPV_EVENT_START_FILE] = "start-file",
|
|
|
|
[MPV_EVENT_END_FILE] = "end-file",
|
2014-02-28 00:31:38 +00:00
|
|
|
[MPV_EVENT_FILE_LOADED] = "file-loaded",
|
2014-02-10 20:01:35 +00:00
|
|
|
[MPV_EVENT_TRACKS_CHANGED] = "tracks-changed",
|
|
|
|
[MPV_EVENT_TRACK_SWITCHED] = "track-switched",
|
|
|
|
[MPV_EVENT_IDLE] = "idle",
|
|
|
|
[MPV_EVENT_PAUSE] = "pause",
|
|
|
|
[MPV_EVENT_UNPAUSE] = "unpause",
|
|
|
|
[MPV_EVENT_TICK] = "tick",
|
|
|
|
[MPV_EVENT_SCRIPT_INPUT_DISPATCH] = "script-input-dispatch",
|
2014-02-17 01:33:47 +00:00
|
|
|
[MPV_EVENT_CLIENT_MESSAGE] = "client-message",
|
2014-02-17 01:52:26 +00:00
|
|
|
[MPV_EVENT_VIDEO_RECONFIG] = "video-reconfig",
|
|
|
|
[MPV_EVENT_AUDIO_RECONFIG] = "audio-reconfig",
|
2014-02-19 15:00:37 +00:00
|
|
|
[MPV_EVENT_METADATA_UPDATE] = "metadata-update",
|
2014-02-28 00:31:38 +00:00
|
|
|
[MPV_EVENT_SEEK] = "seek",
|
|
|
|
[MPV_EVENT_PLAYBACK_RESTART] = "playback-restart",
|
2014-04-05 21:54:21 +00:00
|
|
|
[MPV_EVENT_PROPERTY_CHANGE] = "property-change",
|
2014-04-27 20:28:07 +00:00
|
|
|
[MPV_EVENT_CHAPTER_CHANGE] = "chapter-change",
|
2014-02-10 20:01:35 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
const char *mpv_event_name(mpv_event_id event)
|
|
|
|
{
|
2014-11-07 14:58:51 +00:00
|
|
|
if ((unsigned)event >= MP_ARRAY_SIZE(event_table))
|
2014-02-10 20:01:35 +00:00
|
|
|
return NULL;
|
|
|
|
return event_table[event];
|
|
|
|
}
|
|
|
|
|
|
|
|
void mpv_free(void *data)
|
|
|
|
{
|
|
|
|
talloc_free(data);
|
|
|
|
}
|
2014-02-24 20:59:20 +00:00
|
|
|
|
|
|
|
int64_t mpv_get_time_us(mpv_handle *ctx)
|
|
|
|
{
|
|
|
|
return mp_time_us();
|
|
|
|
}
|
2014-12-09 16:47:02 +00:00
|
|
|
|
2014-12-31 19:31:19 +00:00
|
|
|
// Used by vo_opengl_cb to synchronously uninitialize video.
|
|
|
|
void kill_video(struct mp_client_api *client_api)
|
|
|
|
{
|
|
|
|
struct MPContext *mpctx = client_api->mpctx;
|
|
|
|
mp_dispatch_lock(mpctx->dispatch);
|
|
|
|
mp_switch_track(mpctx, STREAM_VIDEO, NULL);
|
2015-01-04 21:19:42 +00:00
|
|
|
uninit_video_out(mpctx);
|
2014-12-31 19:31:19 +00:00
|
|
|
mp_dispatch_unlock(mpctx->dispatch);
|
|
|
|
}
|
|
|
|
|
2014-12-09 16:47:02 +00:00
|
|
|
#include "libmpv/opengl_cb.h"
|
|
|
|
|
|
|
|
#if HAVE_GL
|
|
|
|
static mpv_opengl_cb_context *opengl_cb_get_context(mpv_handle *ctx)
|
|
|
|
{
|
|
|
|
mpv_opengl_cb_context *cb = ctx->mpctx->gl_cb_ctx;
|
|
|
|
if (!cb) {
|
2014-12-31 19:31:19 +00:00
|
|
|
cb = mp_opengl_create(ctx->mpctx->global, ctx->mpctx->osd, ctx->clients);
|
2014-12-09 16:47:02 +00:00
|
|
|
ctx->mpctx->gl_cb_ctx = cb;
|
|
|
|
}
|
|
|
|
return cb;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static mpv_opengl_cb_context *opengl_cb_get_context(mpv_handle *ctx)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
void mpv_opengl_cb_set_update_callback(mpv_opengl_cb_context *ctx,
|
|
|
|
mpv_opengl_cb_update_fn callback,
|
|
|
|
void *callback_ctx)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
int mpv_opengl_cb_init_gl(mpv_opengl_cb_context *ctx, const char *exts,
|
|
|
|
mpv_opengl_cb_get_proc_address_fn get_proc_address,
|
|
|
|
void *get_proc_address_ctx)
|
|
|
|
{
|
|
|
|
return MPV_ERROR_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
int mpv_opengl_cb_render(mpv_opengl_cb_context *ctx, int fbo, int vp[4])
|
|
|
|
{
|
|
|
|
return MPV_ERROR_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
int mpv_opengl_cb_uninit_gl(mpv_opengl_cb_context *ctx)
|
|
|
|
{
|
|
|
|
return MPV_ERROR_NOT_IMPLEMENTED;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
void *mpv_get_sub_api(mpv_handle *ctx, mpv_sub_api sub_api)
|
|
|
|
{
|
|
|
|
if (!ctx->mpctx->initialized)
|
|
|
|
return NULL;
|
|
|
|
void *res = NULL;
|
|
|
|
lock_core(ctx);
|
|
|
|
switch (sub_api) {
|
|
|
|
case MPV_SUB_API_OPENGL_CB:
|
|
|
|
res = opengl_cb_get_context(ctx);
|
|
|
|
break;
|
|
|
|
default:;
|
|
|
|
}
|
|
|
|
unlock_core(ctx);
|
|
|
|
return res;
|
|
|
|
}
|