mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-17 08:56:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

raop: Correctly wrap RTP packet sequence number

Browse source
This commit is contained in:
Martin Blanchard 2016-11-06 12:54:19 -06:00 • committed by Tanu Kaskinen
parent 3de65e61e4
commit 516906aef9
3 changed files with 65 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/modules/raop/raop-client.c
View file

@ -24,6 +24,7 @@
#endif #endif
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
@ -316,10 +317,10 @@ static size_t build_tcp_audio_packet(pa_raop_client *c, pa_memchunk *block, pa_m
buffer += packet->index / sizeof(uint32_t); buffer += packet->index / sizeof(uint32_t);
raw += block->index; raw += block->index;
if (c->seq == 0xFFFF) { /* Wrap sequence number to 0 then UINT16_MAX is reached */
pa_log_debug("wrapping sequence number"); if (c->seq == UINT16_MAX)
c->seq = pa_raop_packet_buffer_wrap_seq(c->pbuf, c->seq); c->seq = 0;
} else else
c->seq++; c->seq++;
memcpy(buffer, tcp_audio_header, sizeof(tcp_audio_header)); memcpy(buffer, tcp_audio_header, sizeof(tcp_audio_header));
@ -360,13 +361,13 @@ static ssize_t send_tcp_audio_packet(pa_raop_client *c, pa_memchunk *block, size
ssize_t written = -1; ssize_t written = -1;
size_t done = 0; size_t done = 0;
if (!(packet = pa_raop_packet_buffer_get(c->pbuf, c->seq, max))) if (!(packet = pa_raop_packet_buffer_retrieve(c->pbuf, c->seq)))
return -1; return -1;
if (packet->length <= 0) { if (packet->length <= 0) {
pa_assert(block->index == offset); pa_assert(block->index == offset);
if (!(packet = pa_raop_packet_buffer_get(c->pbuf, c->seq + 1, max))) if (!(packet = pa_raop_packet_buffer_prepare(c->pbuf, c->seq + 1, max)))
return -1; return -1;
packet->index = 0; packet->index = 0;
@ -427,10 +428,10 @@ static size_t build_udp_audio_packet(pa_raop_client *c, pa_memchunk *block, pa_m
c->rtptime += length / 4; c->rtptime += length / 4;
if (c->seq == 0xFFFF) { /* Wrap sequence number to 0 then UINT16_MAX is reached */
pa_log_debug("wrapping sequence number"); if (c->seq == UINT16_MAX)
c->seq = pa_raop_packet_buffer_wrap_seq(c->pbuf, c->seq); c->seq = 0;
} else else
c->seq++; c->seq++;
pa_memblock_release(block->memblock); pa_memblock_release(block->memblock);
@ -453,11 +454,11 @@ static ssize_t send_udp_audio_packet(pa_raop_client *c, pa_memchunk *block, size
/* UDP packet has to be sent at once ! */ /* UDP packet has to be sent at once ! */
pa_assert(block->index == offset); pa_assert(block->index == offset);
if (!(packet = pa_raop_packet_buffer_get(c->pbuf, c->seq, max))) if (!(packet = pa_raop_packet_buffer_prepare(c->pbuf, c->seq, max)))
return -1; return -1;
packet->length = max;
packet->index = sizeof(udp_audio_retrans_header); packet->index = sizeof(udp_audio_retrans_header);
packet->length = max - sizeof(udp_audio_retrans_header);
if (!build_udp_audio_packet(c, block, packet)) if (!build_udp_audio_packet(c, block, packet))
return -1; return -1;
@ -508,7 +509,7 @@ static ssize_t resend_udp_audio_packets(pa_raop_client *c, uint16_t seq, uint16_
uint8_t *buffer = NULL; uint8_t *buffer = NULL;
ssize_t written = -1; ssize_t written = -1;
if (!(packet = pa_raop_packet_buffer_get(c->pbuf, seq + i, 0))) if (!(packet = pa_raop_packet_buffer_retrieve(c->pbuf, seq + i)))
continue; continue;
if (packet->index > 0) { if (packet->index > 0) {

68
src/modules/raop/raop-packet-buffer.c
View file

@ -25,6 +25,7 @@
#endif #endif
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h>
#include <limits.h> #include <limits.h>
#include <pulse/xmalloc.h> #include <pulse/xmalloc.h>
@ -37,7 +38,9 @@
struct pa_raop_packet_buffer { struct pa_raop_packet_buffer {
pa_memchunk *packets; pa_memchunk *packets;
pa_mempool *mempool; pa_mempool *mempool;
size_t size; size_t size;
size_t count;
uint16_t seq; uint16_t seq;
size_t pos; size_t pos;
@ -49,6 +52,7 @@ pa_raop_packet_buffer *pa_raop_packet_buffer_new(pa_mempool *mempool, const size
pa_assert(mempool); pa_assert(mempool);
pa_assert(size > 0); pa_assert(size > 0);
pb->count = 0;
pb->size = size; pb->size = size;
pb->mempool = mempool; pb->mempool = mempool;
pb->packets = pa_xnew0(pa_memchunk, size); pb->packets = pa_xnew0(pa_memchunk, size);
@ -80,7 +84,8 @@ void pa_raop_packet_buffer_reset(pa_raop_packet_buffer *pb, uint16_t seq) {
pa_assert(pb->packets); pa_assert(pb->packets);
pb->pos = 0; pb->pos = 0;
pb->seq = seq - 1; pb->count = 0;
pb->seq = (!seq) ? UINT16_MAX : seq - 1;
for (i = 0; i < pb->size; i++) { for (i = 0; i < pb->size; i++) {
if (pb->packets[i].memblock) if (pb->packets[i].memblock)
pa_memblock_unref(pb->packets[i].memblock); pa_memblock_unref(pb->packets[i].memblock);
@ -88,23 +93,43 @@ void pa_raop_packet_buffer_reset(pa_raop_packet_buffer *pb, uint16_t seq) {
} }
} }
uint16_t pa_raop_packet_buffer_wrap_seq(pa_raop_packet_buffer *pb, uint16_t seq) { pa_memchunk *pa_raop_packet_buffer_prepare(pa_raop_packet_buffer *pb, uint16_t seq, const size_t size) {
int seq_shift; pa_memchunk *packet = NULL;
size_t i;
pa_assert(pb); pa_assert(pb);
pa_assert(pb->packets);
if (seq > pb->seq) if (seq == 0) {
seq_shift = pb->seq - 1; /* 0 means seq reached UINT16_MAX and has been wrapped... */
else pa_assert(pb->seq == UINT16_MAX);
seq_shift = seq; pb->seq = 0;
} else {
/* ...otherwise, seq MUST have be increased! */
pa_assert(seq == pb->seq + 1);
pb->seq++;
}
pb->seq -= seq_shift; i = (pb->pos + 1) % pb->size;
return seq - seq_shift; if (pb->packets[i].memblock)
pa_memblock_unref(pb->packets[i].memblock);
pa_memchunk_reset(&pb->packets[i]);
pb->packets[i].memblock = pa_memblock_new(pb->mempool, size);
pb->packets[i].length = size;
pb->packets[i].index = 0;
packet = &pb->packets[i];
if (pb->count < pb->size)
pb->count++;
pb->pos = i;
return packet;
} }
pa_memchunk *pa_raop_packet_buffer_get(pa_raop_packet_buffer *pb, uint16_t seq, const size_t size) { pa_memchunk *pa_raop_packet_buffer_retrieve(pa_raop_packet_buffer *pb, uint16_t seq) {
pa_memchunk *packet = NULL; pa_memchunk *packet = NULL;
size_t delta, i; size_t delta, i;
@ -113,20 +138,21 @@ pa_memchunk *pa_raop_packet_buffer_get(pa_raop_packet_buffer *pb, uint16_t seq,
if (seq == pb->seq) if (seq == pb->seq)
packet = &pb->packets[pb->pos]; packet = &pb->packets[pb->pos];
else if (seq < pb->seq) { else {
if (seq < pb->seq) {
/* Regular case: pb->seq did not wrapped since seq. */
delta = pb->seq - seq; delta = pb->seq - seq;
i = (pb->size + pb->pos - delta) % pb->size; pa_assert(delta <= pb->count);
if (delta < pb->size)
packet = &pb->packets[i];
} else { } else {
i = (pb->pos + (seq - pb->seq)) % pb->size; /* Tricky case: pb->seq wrapped since seq! */
if (pb->packets[i].memblock) delta = pb->seq + (UINT16_MAX - seq);
pa_memblock_unref(pb->packets[i].memblock); pa_assert(delta <= pb->count);
pa_memchunk_reset(&pb->packets[i]); }
pb->packets[i].memblock = pa_memblock_new(pb->mempool, size);
i = (pb->size + pb->pos - delta) % pb->size;
if (delta < pb->size && pb->packets[i].memblock)
packet = &pb->packets[i]; packet = &pb->packets[i];
pb->seq = seq;
pb->pos = i;
} }
return packet; return packet;

5
src/modules/raop/raop-packet-buffer.h
View file

@ -33,7 +33,8 @@ pa_raop_packet_buffer *pa_raop_packet_buffer_new(pa_mempool *mempool, const size
void pa_raop_packet_buffer_free(pa_raop_packet_buffer *pb); void pa_raop_packet_buffer_free(pa_raop_packet_buffer *pb);
void pa_raop_packet_buffer_reset(pa_raop_packet_buffer *pb, uint16_t seq); void pa_raop_packet_buffer_reset(pa_raop_packet_buffer *pb, uint16_t seq);
pa_memchunk *pa_raop_packet_buffer_get(pa_raop_packet_buffer *pb, uint16_t seq, const size_t size);
uint16_t pa_raop_packet_buffer_wrap_seq(pa_raop_packet_buffer *pb, uint16_t seq); pa_memchunk *pa_raop_packet_buffer_prepare(pa_raop_packet_buffer *pb, uint16_t seq, const size_t size);
pa_memchunk *pa_raop_packet_buffer_retrieve(pa_raop_packet_buffer *pb, uint16_t seq);
#endif #endif