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

netjack2: make function to clear events

Browse source 
Make a separate function to clear events instead of passing NULL as the
midi buffer and segfaulting.
This commit is contained in:
Wim Taymans 2025-04-29 16:26:30 +02:00
parent 78fe234bfe
commit 18a5f884be
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/modules/module-netjack2/peer.c
View file

@ -368,17 +368,27 @@ static void midi_to_netjack2(struct netjack2_peer *peer,
buf->write_pos); buf->write_pos);
} }
static inline void netjack2_clear_midi(float *dst, uint32_t size)
{
struct spa_pod_builder b = { 0, };
struct spa_pod_frame f;
spa_pod_builder_init(&b, dst, size);
spa_pod_builder_push_sequence(&b, &f, 0);
spa_pod_builder_pop(&b, &f);
}
static inline void netjack2_to_midi(float *dst, uint32_t size, struct nj2_midi_buffer *buf) static inline void netjack2_to_midi(float *dst, uint32_t size, struct nj2_midi_buffer *buf)
{ {
struct spa_pod_builder b = { 0, }; struct spa_pod_builder b = { 0, };
uint32_t i; uint32_t i;
struct spa_pod_frame f; struct spa_pod_frame f;
size_t offset = size - buf->write_pos - size_t offset = size - buf->write_pos - sizeof(*buf) -
sizeof(*buf) - (buf->event_count * sizeof(struct nj2_midi_event)); (buf->event_count * sizeof(struct nj2_midi_event));
spa_pod_builder_init(&b, dst, size); spa_pod_builder_init(&b, dst, size);
spa_pod_builder_push_sequence(&b, &f, 0); spa_pod_builder_push_sequence(&b, &f, 0);
for (i = 0; buf != NULL && i < buf->event_count; i++) {
for (i = 0; i < buf->event_count; i++) {
struct nj2_midi_event *ev = &buf->event[i]; struct nj2_midi_event *ev = &buf->event[i];
uint8_t *data; uint8_t *data;
size_t s; size_t s;
@ -1088,7 +1098,7 @@ static int netjack2_recv_data(struct netjack2_peer *peer,
} }
for (i = 0; i < n_midi; i++) { for (i = 0; i < n_midi; i++) {
if (!midi[i].filled && midi[i].data != NULL) if (!midi[i].filled && midi[i].data != NULL)
netjack2_to_midi(midi[i].data, peer->params.period_size * sizeof(float), NULL); netjack2_clear_midi(midi[i].data, peer->params.period_size * sizeof(float));
} }
peer->sync.cycle = ntohl(header.cycle); peer->sync.cycle = ntohl(header.cycle);
return 0; return 0;