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

netjack2: account for overhead

Browse source 
The period calculation now subtracts the per-port int32_t overhead
from max_size before computing how many float samples fit. This guarantees
active_ports * (period * sizeof(float) + sizeof(int32_t)) <= max_size, so
packet_size = sizeof(header) + active_ports * sub_period_bytes <= mtu.

sub_cycle is bounded by nframes / sub_period_size, matching the sender's
num_packets = nframes / sub_period_size. Also ensure sub_period_size != 0
to avoid division by 0.
This commit is contained in:
Wim Taymans 2026-04-29 12:15:41 +02:00
parent 2af9e879a7
commit 0186bccdce
1 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -500,9 +500,14 @@ static int netjack2_send_float(struct netjack2_peer *peer, uint32_t nframes,
sub_period_size = nframes; sub_period_size = nframes;
} else { } else {
uint32_t max_size = PACKET_AVAILABLE_SIZE(peer->params.mtu); uint32_t max_size = PACKET_AVAILABLE_SIZE(peer->params.mtu);
uint32_t period = (uint32_t) powf(2.f, (uint32_t) (logf((float)max_size / uint32_t overhead = active_ports * sizeof(int32_t);
(active_ports * sizeof(float))) / logf(2.f))); if (max_size <= overhead) {
sub_period_size = SPA_MIN(period, nframes); sub_period_size = 1;
} else {
uint32_t period = (uint32_t) powf(2.f, (uint32_t) (logf((float)(max_size - overhead) /
(active_ports * sizeof(float))) / logf(2.f)));
sub_period_size = SPA_CLAMP(period, 1u, nframes);
}
} }
sub_period_bytes = sub_period_size * sizeof(float) + sizeof(int32_t); sub_period_bytes = sub_period_size * sizeof(float) + sizeof(int32_t);
num_packets = nframes / sub_period_size; num_packets = nframes / sub_period_size;
@ -850,17 +855,23 @@ static int netjack2_recv_float(struct netjack2_peer *peer, struct nj2_packet_hea
if (active_ports == 0 || active_ports > MAX_CHANNELS) if (active_ports == 0 || active_ports > MAX_CHANNELS)
return 0; return 0;
uint32_t nframes = SPA_MIN((uint32_t)peer->sync.frames, peer->quantum_limit);
uint32_t max_size = PACKET_AVAILABLE_SIZE(peer->params.mtu); uint32_t max_size = PACKET_AVAILABLE_SIZE(peer->params.mtu);
uint32_t period = (uint32_t) powf(2.f, (uint32_t) (logf((float)max_size / uint32_t overhead = active_ports * sizeof(int32_t);
(active_ports * sizeof(float))) / logf(2.f))); if (max_size <= overhead) {
sub_period_size = SPA_MIN(period, (uint32_t)peer->sync.frames); sub_period_size = 1;
} else {
uint32_t period = (uint32_t) powf(2.f, (uint32_t) (logf((float)(max_size - overhead) /
(active_ports * sizeof(float))) / logf(2.f)));
sub_period_size = SPA_CLAMP(period, 1u, nframes);
}
sub_period_bytes = sub_period_size * sizeof(float) + sizeof(int32_t); sub_period_bytes = sub_period_size * sizeof(float) + sizeof(int32_t);
if ((size_t)len < (size_t)active_ports * sub_period_bytes + sizeof(*header)) if ((size_t)len < (size_t)active_ports * sub_period_bytes + sizeof(*header))
return 0; return 0;
sub_cycle = ntohl(header->sub_cycle); sub_cycle = ntohl(header->sub_cycle);
if (sub_period_size == 0 || sub_cycle > peer->quantum_limit / sub_period_size) if (sub_cycle >= nframes / sub_period_size)
return 0; return 0;
for (i = 0; i < active_ports; i++) { for (i = 0; i < active_ports; i++) {