mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

netjack2: keep position io per stream

Browse source 
Keep a position info for the stream it was set and then use the position
info for the stream that is driving the graph. Otherwise we might use a
destroyed position info.
This commit is contained in:
Wim Taymans 2025-04-28 12:23:15 +02:00
parent b6cb76bf8d
commit 07f033c8da
1 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/modules/module-netjack2-driver.c
View file

@ -181,6 +181,8 @@ struct stream {
struct pw_filter *filter; struct pw_filter *filter;
struct spa_hook listener; struct spa_hook listener;
struct spa_io_position *position;
struct spa_audio_info_raw info; struct spa_audio_info_raw info;
uint32_t n_midi; uint32_t n_midi;
@ -221,8 +223,6 @@ struct impl {
struct spa_hook core_proxy_listener; struct spa_hook core_proxy_listener;
struct spa_hook core_listener; struct spa_hook core_listener;
struct spa_io_position *position;
struct stream source; struct stream source;
struct stream sink; struct stream sink;
@ -368,11 +368,10 @@ static void source_process(void *d, struct spa_io_position *position)
static void stream_io_changed(void *data, void *port_data, uint32_t id, void *area, uint32_t size) static void stream_io_changed(void *data, void *port_data, uint32_t id, void *area, uint32_t size)
{ {
struct stream *s = data; struct stream *s = data;
struct impl *impl = s->impl;
if (port_data == NULL) { if (port_data == NULL) {
switch (id) { switch (id) {
case SPA_IO_Position: case SPA_IO_Position:
impl->position = area; s->position = area;
break; break;
default: default:
break; break;
@ -615,6 +614,24 @@ static inline uint64_t get_time_nsec(struct impl *impl)
return nsec; return nsec;
} }
static void update_clock(struct impl *impl, struct stream *s, uint64_t nsec, uint32_t nframes)
{
if (s->position) {
struct spa_io_clock *c = &s->position->clock;
c->nsec = nsec;
c->rate = SPA_FRACTION(1, impl->samplerate);
c->position = impl->frame_time;
c->duration = nframes;
c->delay = 0;
c->rate_diff = 1.0;
c->next_nsec = nsec;
c->target_rate = c->rate;
c->target_duration = c->duration;
}
}
static void static void
on_data_io(void *data, int fd, uint32_t mask) on_data_io(void *data, int fd, uint32_t mask)
{ {
@ -654,20 +671,6 @@ on_data_io(void *data, int fd, uint32_t mask)
pw_log_warn("Xrun netjack2:%u PipeWire:%u", impl->nj2_xrun, impl->pw_xrun); pw_log_warn("Xrun netjack2:%u PipeWire:%u", impl->nj2_xrun, impl->pw_xrun);
impl->new_xrun = false; impl->new_xrun = false;
} }
if (impl->position) {
struct spa_io_clock *c = &impl->position->clock;
c->nsec = nsec;
c->rate = SPA_FRACTION(1, impl->samplerate);
c->position = impl->frame_time;
c->duration = nframes;
c->delay = 0;
c->rate_diff = 1.0;
c->next_nsec = nsec;
c->target_rate = c->rate;
c->target_duration = c->duration;
}
if (!source_running) if (!source_running)
netjack2_recv_data(&impl->peer, NULL, 0, NULL, 0); netjack2_recv_data(&impl->peer, NULL, 0, NULL, 0);
@ -675,11 +678,13 @@ on_data_io(void *data, int fd, uint32_t mask)
impl->done = false; impl->done = false;
impl->triggered = true; impl->triggered = true;
impl->driving = MODE_SOURCE; impl->driving = MODE_SOURCE;
update_clock(impl, &impl->source, nsec, nframes);
pw_filter_trigger_process(impl->source.filter); pw_filter_trigger_process(impl->source.filter);
} else if (impl->mode == MODE_SINK && sink_running) { } else if (impl->mode == MODE_SINK && sink_running) {
impl->done = false; impl->done = false;
impl->triggered = true; impl->triggered = true;
impl->driving = MODE_SINK; impl->driving = MODE_SINK;
update_clock(impl, &impl->sink, nsec, nframes);
pw_filter_trigger_process(impl->sink.filter); pw_filter_trigger_process(impl->sink.filter);
} else { } else {
sink_running = false; sink_running = false;