mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: add option to disable process lock

Browse source 
Some applications might expect the process function to run concurrently
with the callbacks. PipeWire tries to avoid this by using a lock for the
duration of the process callback. Make an option to disable this.

See #1576
This commit is contained in:
Wim Taymans 2021-09-08 13:02:04 +02:00
parent 2071a14c82
commit e4b030fafa
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pipewire-jack/src/pipewire-jack.c
View file

@ -387,6 +387,7 @@ struct client {
unsigned int short_name:1; unsigned int short_name:1;
unsigned int filter_name:1; unsigned int filter_name:1;
unsigned int freewheeling:1; unsigned int freewheeling:1;
unsigned int locked_process:1;
int self_connect_mode; int self_connect_mode;
int rt_max; int rt_max;
@ -739,8 +740,10 @@ void jack_get_version(int *major_ptr, int *minor_ptr, int *micro_ptr, int *proto
({ \ ({ \
if (c->callback && c->active) { \ if (c->callback && c->active) { \
pw_thread_loop_unlock(c->context.loop); \ pw_thread_loop_unlock(c->context.loop); \
if (c->locked_process) \
pthread_mutex_lock(&c->rt_lock); \ pthread_mutex_lock(&c->rt_lock); \
c->callback(__VA_ARGS__); \ c->callback(__VA_ARGS__); \
if (c->locked_process) \
pthread_mutex_unlock(&c->rt_lock); \ pthread_mutex_unlock(&c->rt_lock); \
pw_thread_loop_lock(c->context.loop); \ pw_thread_loop_lock(c->context.loop); \
} \ } \
@ -2972,6 +2975,9 @@ jack_client_t * jack_client_open (const char *client_name,
if ((str = pw_properties_get(client->props, "jack.filter-name")) != NULL) if ((str = pw_properties_get(client->props, "jack.filter-name")) != NULL)
client->filter_name = pw_properties_parse_bool(str); client->filter_name = pw_properties_parse_bool(str);
str = pw_properties_get(client->props, "jack.locked-process");
client->locked_process = str ? pw_properties_parse_bool(str) : true;
client->self_connect_mode = SELF_CONNECT_ALLOW; client->self_connect_mode = SELF_CONNECT_ALLOW;
if ((str = pw_properties_get(client->props, "jack.self-connect-mode")) != NULL) { if ((str = pw_properties_get(client->props, "jack.self-connect-mode")) != NULL) {
if (spa_streq(str, "fail-external")) if (spa_streq(str, "fail-external"))

2
src/daemon/jack.conf.in
View file

@ -59,6 +59,7 @@ context.modules = [
# global properties for all jack clients # global properties for all jack clients
jack.properties = { jack.properties = {
#node.latency = 1024/48000 #node.latency = 1024/48000
#node.lock-quantum = false
#jack.merge-monitor = false #jack.merge-monitor = false
#jack.short-name = false #jack.short-name = false
#jack.filter-name = false #jack.filter-name = false
@ -69,6 +70,7 @@ jack.properties = {
# fail-all: Fail all self connect requests # fail-all: Fail all self connect requests
# ignore-all: Ignore all self connect requests # ignore-all: Ignore all self connect requests
#jack.self-connect-mode = allow #jack.self-connect-mode = allow
#jack.locked-process = true
} }
# client specific properties # client specific properties