mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-07-03 00:06:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

filter-graph: set io with the new method

Browse source
This commit is contained in:
Wim Taymans 2026-07-02 17:26:42 +02:00
parent 95b95179d2
commit 53c2dd8d40
2 changed files with 35 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
spa/plugins/audioconvert/audioconvert.c
View file

@ -296,6 +296,7 @@ struct impl {
struct spa_io_clock *io_clock; struct spa_io_clock *io_clock;
struct spa_io_position *io_position; struct spa_io_position *io_position;
struct spa_io_rate_match *io_rate_match; struct spa_io_rate_match *io_rate_match;
struct spa_io_latency io_latency;
uint64_t info_all; uint64_t info_all;
struct spa_node_info info; struct spa_node_info info;
@ -1281,6 +1282,12 @@ static int setup_filter_graph(struct impl *this, struct filter_graph *g,
SPA_DICT_ITEM("filter-graph.n_inputs", channels ? in_ports : NULL))); SPA_DICT_ITEM("filter-graph.n_inputs", channels ? in_ports : NULL)));
g->setup = res >= 0; g->setup = res >= 0;
if (g->setup) {
spa_filter_graph_set_io(g->graph, SPA_TYPE_INFO_IO_BASE "Position",
this->io_position, sizeof(struct spa_io_position));
spa_filter_graph_set_io(g->graph, SPA_TYPE_INFO_IO_BASE "Latency",
&this->io_latency, sizeof(this->io_latency));
}
return res; return res;
} }

45
src/modules/module-filter-chain.c
View file

@ -1408,6 +1408,12 @@ static int activate_graph(struct impl *impl)
if (res >= 0) { if (res >= 0) {
struct pw_loop *data_loop = pw_stream_get_data_loop(impl->playback); struct pw_loop *data_loop = pw_stream_get_data_loop(impl->playback);
spa_filter_graph_set_io(impl->graph, SPA_TYPE_INFO_IO_BASE "Latency",
&impl->io_latency, sizeof(impl->io_latency));
spa_filter_graph_set_io(impl->graph, SPA_TYPE_INFO_IO_BASE "Position",
impl->position, sizeof(struct spa_io_position));
pw_loop_lock(data_loop); pw_loop_lock(data_loop);
impl->graph_active = true; impl->graph_active = true;
pw_loop_unlock(data_loop); pw_loop_unlock(data_loop);
@ -1481,11 +1487,28 @@ static void update_latencies(struct impl *impl, bool process)
update_latency(impl, SPA_DIRECTION_OUTPUT, process); update_latency(impl, SPA_DIRECTION_OUTPUT, process);
} }
static void update_io_latency(struct impl *impl, enum spa_direction direction)
{
struct pw_stream *stream;
struct pw_time time;
if (direction == SPA_DIRECTION_OUTPUT)
stream = impl->capture;
else
stream = impl->playback;
pw_stream_get_time_n(stream, &time, sizeof(time));
impl->io_latency.rate = time.rate;
if (direction == SPA_DIRECTION_OUTPUT)
impl->io_latency.capture_latency = time.delay;
else
impl->io_latency.playback_latency = time.delay;
}
static void param_latency_changed(struct impl *impl, const struct spa_pod *param, static void param_latency_changed(struct impl *impl, const struct spa_pod *param,
enum spa_direction direction, struct pw_stream *stream) enum spa_direction direction, struct pw_stream *stream)
{ {
struct spa_latency_info latency; struct spa_latency_info latency;
struct pw_time time;
if (param == NULL || spa_latency_parse(param, &latency) < 0) if (param == NULL || spa_latency_parse(param, &latency) < 0)
return; return;
@ -1493,12 +1516,7 @@ static void param_latency_changed(struct impl *impl, const struct spa_pod *param
impl->latency[latency.direction] = latency; impl->latency[latency.direction] = latency;
update_latency(impl, latency.direction, false); update_latency(impl, latency.direction, false);
pw_stream_get_time_n(stream, &time, sizeof(time)); update_io_latency(impl, latency.direction);
impl->io_latency.rate = time.rate;
if (latency.direction == SPA_DIRECTION_OUTPUT)
impl->io_latency.capture_latency = time.delay;
else
impl->io_latency.playback_latency = time.delay;
} }
static void param_process_latency_changed(struct impl *impl, const struct spa_pod *param, static void param_process_latency_changed(struct impl *impl, const struct spa_pod *param,
@ -1553,13 +1571,8 @@ static void capture_state_changed(void *data, enum pw_stream_state old,
pw_log_info("module %p: error: %s", impl, error); pw_log_info("module %p: error: %s", impl, error);
break; break;
case PW_STREAM_STATE_STREAMING: case PW_STREAM_STATE_STREAMING:
{ update_io_latency(impl, SPA_DIRECTION_OUTPUT);
struct pw_time time;
pw_stream_get_time_n(impl->capture, &time, sizeof(time));
impl->io_latency.rate = time.rate;
impl->io_latency.capture_latency = time.delay;
break; break;
}
default: default:
break; break;
} }
@ -1655,7 +1668,7 @@ static void playback_state_changed(void *data, enum pw_stream_state old,
case PW_STREAM_STATE_STREAMING: case PW_STREAM_STATE_STREAMING:
{ {
uint32_t target = impl->info.rate; uint32_t target = impl->info.rate;
struct pw_time time;
if (target == 0) if (target == 0)
target = impl->position ? target = impl->position ?
impl->position->clock.target_rate.denom : DEFAULT_RATE; impl->position->clock.target_rate.denom : DEFAULT_RATE;
@ -1664,9 +1677,7 @@ static void playback_state_changed(void *data, enum pw_stream_state old,
goto error; goto error;
} }
pw_stream_get_time_n(impl->playback, &time, sizeof(time)); update_io_latency(impl, SPA_DIRECTION_INPUT);
impl->io_latency.rate = time.rate;
impl->io_latency.playback_latency = time.delay;
if (impl->rate != target) { if (impl->rate != target) {
impl->rate = target; impl->rate = target;