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

roc-source: start/stop receiving in streaming/pause

Browse source 
Only start receiving packets when we are streaming.

Otherwise the ROC source will start receiving and queueing packets and
consume a lot of memory while we don't read the packets from the queue.

Likewise, stop receiving packets when we pause.

Fixes #5250
This commit is contained in:
Wim Taymans 2026-04-27 17:38:05 +02:00
parent f00c84ccad
commit c889edf172
1 changed files with 52 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/modules/module-roc-source.c
View file

@ -140,6 +140,8 @@ struct module_roc_source_data {
roc_endpoint *local_control_addr; roc_endpoint *local_control_addr;
int local_control_port; int local_control_port;
bool receiving;
}; };
static void stream_destroy(void *d) static void stream_destroy(void *d)
@ -203,6 +205,50 @@ static const struct pw_core_events core_events = {
.error = on_core_error, .error = on_core_error,
}; };
static int start_receiving(struct module_roc_source_data *data)
{
if (data->receiver == NULL || data->receiving)
return 0;
if (data->local_source_addr != NULL) {
if (roc_receiver_bind(data->receiver, ROC_SLOT_DEFAULT, ROC_INTERFACE_AUDIO_SOURCE,
data->local_source_addr) != 0) {
pw_log_error("can't connect roc receiver to local source address");
return -EINVAL;
}
}
if (data->local_repair_addr != NULL) {
if (roc_receiver_bind(data->receiver, ROC_SLOT_DEFAULT, ROC_INTERFACE_AUDIO_REPAIR,
data->local_repair_addr) != 0) {
pw_log_error("can't connect roc receiver to local repair address");
return -EINVAL;
}
}
if (data->local_control_addr != NULL) {
if (roc_receiver_bind(data->receiver, ROC_SLOT_DEFAULT, ROC_INTERFACE_AUDIO_CONTROL,
data->local_control_addr) != 0) {
pw_log_error("can't connect roc receiver to local control address");
return -EINVAL;
}
}
data->receiving = true;
return 0;
}
static int stop_receiving(struct module_roc_source_data *data)
{
if (data->receiver == NULL || !data->receiving)
return 0;
if (roc_receiver_unlink(data->receiver, ROC_SLOT_DEFAULT) != 0)
pw_log_warn("can't unlink roc receiver");
data->receiving = false;
return 0;
}
static void on_stream_state_changed(void *d, enum pw_stream_state old, static void on_stream_state_changed(void *d, enum pw_stream_state old,
enum pw_stream_state state, const char *error) enum pw_stream_state state, const char *error)
{ {
@ -216,6 +262,12 @@ static void on_stream_state_changed(void *d, enum pw_stream_state old,
case PW_STREAM_STATE_ERROR: case PW_STREAM_STATE_ERROR:
pw_log_error("stream error: %s", error); pw_log_error("stream error: %s", error);
break; break;
case PW_STREAM_STATE_STREAMING:
start_receiving(data);
break;
case PW_STREAM_STATE_PAUSED:
stop_receiving(data);
break;
default: default:
break; break;
} }
@ -354,11 +406,6 @@ static int roc_source_setup(struct module_roc_source_data *data)
return res; return res;
} }
if (roc_receiver_bind(data->receiver, ROC_SLOT_DEFAULT, ROC_INTERFACE_AUDIO_SOURCE,
data->local_source_addr) != 0) {
pw_log_error("can't connect roc receiver to local source address");
return -EINVAL;
}
if (repair_proto != 0) { if (repair_proto != 0) {
res = pw_roc_create_endpoint(&data->local_repair_addr, repair_proto, data->local_ip, data->local_repair_port); res = pw_roc_create_endpoint(&data->local_repair_addr, repair_proto, data->local_ip, data->local_repair_port);
@ -367,11 +414,6 @@ static int roc_source_setup(struct module_roc_source_data *data)
return res; return res;
} }
if (roc_receiver_bind(data->receiver, ROC_SLOT_DEFAULT, ROC_INTERFACE_AUDIO_REPAIR,
data->local_repair_addr) != 0) {
pw_log_error("can't connect roc receiver to local repair address");
return -EINVAL;
}
} }
res = pw_roc_create_endpoint(&data->local_control_addr, PW_ROC_DEFAULT_CONTROL_PROTO, data->local_ip, data->local_control_port); res = pw_roc_create_endpoint(&data->local_control_addr, PW_ROC_DEFAULT_CONTROL_PROTO, data->local_ip, data->local_control_port);
@ -380,12 +422,6 @@ static int roc_source_setup(struct module_roc_source_data *data)
return res; return res;
} }
if (roc_receiver_bind(data->receiver, ROC_SLOT_DEFAULT, ROC_INTERFACE_AUDIO_CONTROL,
data->local_control_addr) != 0) {
pw_log_error("can't connect roc receiver to local control address");
return -EINVAL;
}
data->playback = pw_stream_new(data->core, data->playback = pw_stream_new(data->core,
"roc-source playback", data->playback_props); "roc-source playback", data->playback_props);
data->playback_props = NULL; data->playback_props = NULL;