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

Revert "jack-tunnel: run graph from JACK thread"

Browse source 
This reverts commit d89df144f0.

This is not better than using a semaphore and the regular data thread.
This commit is contained in:
Wim Taymans 2023-04-28 17:17:00 +02:00
parent d89df144f0
commit 56c59630c9
1 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/modules/module-jack-tunnel.c
View file

@ -13,6 +13,7 @@
#include <signal.h> #include <signal.h>
#include <limits.h> #include <limits.h>
#include <math.h> #include <math.h>
#include <semaphore.h>
#include "config.h" #include "config.h"
@ -113,7 +114,9 @@ static const struct spa_dict_item module_props[] = {
struct impl { struct impl {
struct pw_context *context; struct pw_context *context;
struct pw_loop *main_loop; struct pw_loop *main_loop;
struct pw_data_loop *data_loop; struct spa_system *system;
sem_t sem;
#define MODE_SINK (1<<0) #define MODE_SINK (1<<0)
#define MODE_SOURCE (1<<1) #define MODE_SOURCE (1<<1)
@ -157,13 +160,12 @@ struct impl {
uint32_t pw_xrun; uint32_t pw_xrun;
uint32_t jack_xrun; uint32_t jack_xrun;
uint32_t total_xrun;
unsigned int do_disconnect:1; unsigned int do_disconnect:1;
unsigned int source_running:1; unsigned int source_running:1;
unsigned int sink_running:1; unsigned int sink_running:1;
unsigned int done:1; unsigned int done:1;
unsigned int running:1; unsigned int new_xrun:1;
}; };
static void source_stream_destroy(void *d) static void source_stream_destroy(void *d)
@ -227,9 +229,9 @@ static void sink_stream_process(void *d)
} }
pw_stream_queue_buffer(impl->sink, buf); pw_stream_queue_buffer(impl->sink, buf);
done: done:
impl->done = true;
impl->running = false;
pw_log_trace_fp("done %u", impl->frames); pw_log_trace_fp("done %u", impl->frames);
impl->done = true;
sem_post(&impl->sem);
} }
static void source_stream_process(void *d) static void source_stream_process(void *d)
@ -459,28 +461,20 @@ static int jack_process(jack_nframes_t nframes, void *arg)
impl->nframes = nframes; impl->nframes = nframes;
if (sink_running && source_running) { if (sink_running && source_running) {
pw_loop_enter(impl->data_loop->loop);
impl->running = true; while (sem_trywait(&impl->sem) == 0);
impl->done = false; impl->done = false;
/* clear some stray events */
while (pw_loop_iterate(impl->data_loop->loop, 0) > 0);
/* start processing the graph */
pw_stream_trigger_process(impl->sink); pw_stream_trigger_process(impl->sink);
while (impl->running) { sem_wait(&impl->sem);
if (pw_loop_iterate(impl->data_loop->loop, 1000) <= 0) if (!impl->done) {
break;
}
pw_loop_leave(impl->data_loop->loop);
if (!impl->done)
impl->pw_xrun++; impl->pw_xrun++;
impl->new_xrun = true;
if (impl->total_xrun != impl->pw_xrun + impl->jack_xrun) { }
if (impl->new_xrun) {
pw_log_warn("Xrun JACK:%u PipeWire:%u", impl->jack_xrun, impl->pw_xrun); pw_log_warn("Xrun JACK:%u PipeWire:%u", impl->jack_xrun, impl->pw_xrun);
impl->total_xrun = impl->pw_xrun + impl->jack_xrun; impl->new_xrun = false;
} }
} }
pw_log_trace_fp("done %u", impl->frames); pw_log_trace_fp("done %u", impl->frames);
@ -491,10 +485,11 @@ static int jack_process(jack_nframes_t nframes, void *arg)
static int jack_xrun(void *arg) static int jack_xrun(void *arg)
{ {
struct impl *impl = arg; struct impl *impl = arg;
if (impl->done) if (impl->done) {
impl->jack_xrun++; impl->jack_xrun++;
impl->running = false; impl->new_xrun = true;
pw_loop_invoke(impl->data_loop->loop, NULL, 1, NULL, 0, false, impl); }
sem_post(&impl->sem);
return 0; return 0;
} }
@ -676,8 +671,6 @@ static int start_jack_clients(struct impl *impl)
const char **ports; const char **ports;
uint32_t i; uint32_t i;
pw_data_loop_stop(impl->data_loop);
jack_activate(impl->client); jack_activate(impl->client);
ports = jack_get_ports(impl->client, NULL, NULL, ports = jack_get_ports(impl->client, NULL, NULL,
@ -743,7 +736,6 @@ static void impl_destroy(struct impl *impl)
if (impl->client) { if (impl->client) {
jack_deactivate(impl->client); jack_deactivate(impl->client);
jack_client_close(impl->client); jack_client_close(impl->client);
pw_data_loop_start(impl->data_loop);
} }
if (impl->source) if (impl->source)
pw_stream_destroy(impl->source); pw_stream_destroy(impl->source);
@ -756,6 +748,8 @@ static void impl_destroy(struct impl *impl)
pw_properties_free(impl->source_props); pw_properties_free(impl->source_props);
pw_properties_free(impl->props); pw_properties_free(impl->props);
sem_destroy(&impl->sem);
free(impl); free(impl);
} }
@ -840,6 +834,12 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
pw_log_debug("module %p: new %s", impl, args); pw_log_debug("module %p: new %s", impl, args);
if (sem_init(&impl->sem, 0, 0) < 0) {
res = -errno;
pw_log_error( "can't create semaphore: %m");
goto error;
}
if (args == NULL) if (args == NULL)
args = ""; args = "";
@ -862,7 +862,8 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
impl->module = module; impl->module = module;
impl->context = context; impl->context = context;
impl->main_loop = pw_context_get_main_loop(context); impl->main_loop = pw_context_get_main_loop(context);
impl->data_loop = pw_context_get_data_loop(context); impl->system = impl->main_loop->system;
impl->mode = MODE_DUPLEX; impl->mode = MODE_DUPLEX;
if ((str = pw_properties_get(props, "tunnel.mode")) != NULL) { if ((str = pw_properties_get(props, "tunnel.mode")) != NULL) {