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

module-rtp: Clear after reading in direct timestamp mode

Browse source
This commit is contained in:
Carlos Rafael Giani 2025-07-25 16:47:13 +02:00 • committed by Wim Taymans
parent 0cab2fcb75
commit 91ebfac75b
1 changed files with 32 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/modules/module-rtp/audio.c
View file

@ -2,6 +2,26 @@
/* SPDX-FileCopyrightText: Copyright © 2022 Wim Taymans <wim.taymans@gmail.com> */ /* SPDX-FileCopyrightText: Copyright © 2022 Wim Taymans <wim.taymans@gmail.com> */
/* SPDX-License-Identifier: MIT */ /* SPDX-License-Identifier: MIT */
static inline void
set_iovec(struct spa_ringbuffer *rbuf, void *buffer, uint32_t size,
uint32_t offset, struct iovec *iov, uint32_t len)
{
iov[0].iov_len = SPA_MIN(len, size - offset);
iov[0].iov_base = SPA_PTROFF(buffer, offset, void);
iov[1].iov_len = len - iov[0].iov_len;
iov[1].iov_base = buffer;
}
static void ringbuffer_clear(struct spa_ringbuffer *rbuf SPA_UNUSED,
void *buffer, uint32_t size,
uint32_t offset, uint32_t len)
{
struct iovec iov[2];
set_iovec(rbuf, buffer, size, offset, iov, len);
memset(iov[0].iov_base, 0, iov[0].iov_len);
memset(iov[1].iov_base, 0, iov[1].iov_len);
}
static void rtp_audio_process_playback(void *data) static void rtp_audio_process_playback(void *data)
{ {
struct impl *impl = data; struct impl *impl = data;
@ -98,6 +118,18 @@ static void rtp_audio_process_playback(void *data)
(timestamp * stride) & BUFFER_MASK, (timestamp * stride) & BUFFER_MASK,
d[0].data, wanted * stride); d[0].data, wanted * stride);
/* Clear the bytes that were just retrieved. Since the fill level
* is not tracked in this buffer mode, it is possible that as soon
* as actual playback ends, the RTP source node re-reads old data.
* Make sure it reads silence when no actual new data is present
* and the RTP source node still runs. Do this by filling the
* region of the retrieved data with null bytes. */
ringbuffer_clear(&impl->ring,
impl->buffer,
BUFFER_SIZE,
(timestamp * stride) & BUFFER_MASK,
wanted * stride);
if (!impl->io_position) { if (!impl->io_position) {
/* In the unlikely case that no spa_io_position pointer /* In the unlikely case that no spa_io_position pointer
* was passed yet by PipeWire to this node, monotonically * was passed yet by PipeWire to this node, monotonically
@ -347,16 +379,6 @@ static void set_timer(struct impl *impl, uint64_t time, uint64_t itime)
impl->timer_running = time != 0 && itime != 0; impl->timer_running = time != 0 && itime != 0;
} }
static inline void
set_iovec(struct spa_ringbuffer *rbuf, void *buffer, uint32_t size,
uint32_t offset, struct iovec *iov, uint32_t len)
{
iov[0].iov_len = SPA_MIN(len, size - offset);
iov[0].iov_base = SPA_PTROFF(buffer, offset, void);
iov[1].iov_len = len - iov[0].iov_len;
iov[1].iov_base = buffer;
}
static void rtp_audio_flush_packets(struct impl *impl, uint32_t num_packets, uint64_t set_timestamp) static void rtp_audio_flush_packets(struct impl *impl, uint32_t num_packets, uint64_t set_timestamp)
{ {
int32_t avail, tosend; int32_t avail, tosend;