mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-tunnel: handle holes in record stream

Browse source 
Holes in the stream return a NULL ptr. Write silence to the
ringbuffer in that case.
This commit is contained in:
Wim Taymans 2021-05-14 09:51:51 +02:00
parent 9b48c6f3ea
commit a428228ebf
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/modules/module-pulse-tunnel.c
View file

@ -235,7 +235,7 @@ static void capture_stream_process(void *d)
memset(bd->data, 0, size); memset(bd->data, 0, size);
} else { } else {
size = SPA_MIN(bd->maxsize, (uint32_t)avail); size = SPA_MIN(bd->maxsize, (uint32_t)avail);
size = SPA_MIN(bd->maxsize, req); size = SPA_MIN(size, req);
spa_ringbuffer_read_data(&impl->ring, spa_ringbuffer_read_data(&impl->ring,
impl->buffer, RINGBUFFER_SIZE, impl->buffer, RINGBUFFER_SIZE,
@ -385,13 +385,19 @@ static void stream_read_request_cb(pa_stream *s, size_t length, void *userdata)
if (length < nbytes) if (length < nbytes)
break; break;
while (nbytes > 0) {
uint32_t to_write = SPA_MIN(nbytes, sizeof(impl->empty));
spa_ringbuffer_write_data(&impl->ring, spa_ringbuffer_write_data(&impl->ring,
impl->buffer, RINGBUFFER_SIZE, impl->buffer, RINGBUFFER_SIZE,
write_index & RINGBUFFER_MASK, write_index & RINGBUFFER_MASK,
p, nbytes); p ? p : impl->empty, to_write);
length -= nbytes; write_index += to_write;
write_index += nbytes; p = p ? SPA_PTROFF(p, to_write, void) : NULL;
nbytes -= to_write;
length -= to_write;
}
pa_stream_drop(impl->pa_stream); pa_stream_drop(impl->pa_stream);
} }
spa_ringbuffer_write_update(&impl->ring, write_index); spa_ringbuffer_write_update(&impl->ring, write_index);