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

module-rtp: Fix timestamp integer overflow

Browse source
This commit is contained in:
Alexander Stephens 2026-01-15 03:48:34 +00:00 • committed by Wim Taymans
parent dcdc19238b
commit c74acf6c25
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -118,7 +118,7 @@ static void rtp_audio_process_playback(void *data)
spa_ringbuffer_read_data(&impl->ring, spa_ringbuffer_read_data(&impl->ring,
impl->buffer, impl->buffer,
impl->actual_max_buffer_size, impl->actual_max_buffer_size,
(timestamp * stride) % impl->actual_max_buffer_size, ((uint64_t)timestamp * stride) % impl->actual_max_buffer_size,
d[0].data, wanted * stride); d[0].data, wanted * stride);
/* Clear the bytes that were just retrieved. Since the fill level /* Clear the bytes that were just retrieved. Since the fill level
@ -130,7 +130,7 @@ static void rtp_audio_process_playback(void *data)
ringbuffer_clear(&impl->ring, ringbuffer_clear(&impl->ring,
impl->buffer, impl->buffer,
impl->actual_max_buffer_size, impl->actual_max_buffer_size,
(timestamp * stride) % impl->actual_max_buffer_size, ((uint64_t)timestamp * stride) % impl->actual_max_buffer_size,
wanted * stride); wanted * stride);
if (!impl->io_position) { if (!impl->io_position) {
@ -219,7 +219,7 @@ static void rtp_audio_process_playback(void *data)
spa_ringbuffer_read_data(&impl->ring, spa_ringbuffer_read_data(&impl->ring,
impl->buffer, impl->buffer,
impl->actual_max_buffer_size, impl->actual_max_buffer_size,
(timestamp * stride) % impl->actual_max_buffer_size, ((uint64_t)timestamp * stride) % impl->actual_max_buffer_size,
d[0].data, wanted * stride); d[0].data, wanted * stride);
timestamp += wanted; timestamp += wanted;
@ -319,7 +319,7 @@ static int rtp_audio_receive(struct impl *impl, uint8_t *buffer, ssize_t len,
spa_ringbuffer_write_data(&impl->ring, spa_ringbuffer_write_data(&impl->ring,
impl->buffer, impl->buffer,
impl->actual_max_buffer_size, impl->actual_max_buffer_size,
(write * stride) % impl->actual_max_buffer_size, ((uint64_t)write * stride) % impl->actual_max_buffer_size,
&buffer[hlen], (samples * stride)); &buffer[hlen], (samples * stride));
/* Only update the write index if data was actually _appended_. /* Only update the write index if data was actually _appended_.
@ -435,7 +435,7 @@ static void rtp_audio_flush_packets(struct impl *impl, uint32_t num_packets, uin
set_iovec(&impl->ring, set_iovec(&impl->ring,
impl->buffer, impl->actual_max_buffer_size, impl->buffer, impl->actual_max_buffer_size,
(timestamp * stride) % impl->actual_max_buffer_size, ((uint64_t)timestamp * stride) % impl->actual_max_buffer_size,
&iov[1], tosend * stride); &iov[1], tosend * stride);
pw_log_trace("sending %d packet:%d ts_offset:%d timestamp:%d", pw_log_trace("sending %d packet:%d ts_offset:%d timestamp:%d",
@ -587,7 +587,7 @@ static void rtp_audio_process_capture(void *data)
spa_ringbuffer_write_data(&impl->ring, spa_ringbuffer_write_data(&impl->ring,
impl->buffer, impl->buffer,
impl->actual_max_buffer_size, impl->actual_max_buffer_size,
(expected_timestamp * stride) % impl->actual_max_buffer_size, ((uint64_t)expected_timestamp * stride) % impl->actual_max_buffer_size,
SPA_PTROFF(d[0].data, offs, void), wanted * stride); SPA_PTROFF(d[0].data, offs, void), wanted * stride);
expected_timestamp += wanted; expected_timestamp += wanted;
spa_ringbuffer_write_update(&impl->ring, expected_timestamp); spa_ringbuffer_write_update(&impl->ring, expected_timestamp);