mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-rtp: fix writing of audio samples

Browse source 
Always write samples according to the current write position, only use
the graph timestamp to align.
This commit is contained in:
Wim Taymans 2023-03-13 15:14:41 +01:00
parent 6230154677
commit 51a970f5b7
2 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -265,13 +265,21 @@ static void rtp_audio_process_capture(void *data)
wanted = size / stride; wanted = size / stride;
filled = spa_ringbuffer_get_write_index(&impl->ring, &expected_timestamp); filled = spa_ringbuffer_get_write_index(&impl->ring, &expected_timestamp);
if (SPA_LIKELY(impl->io_position)) { if (SPA_LIKELY(impl->io_position)) {
uint32_t rate = impl->io_position->clock.rate.denom; uint32_t rate = impl->io_position->clock.rate.denom;
timestamp = impl->io_position->clock.position * impl->rate / rate; timestamp = impl->io_position->clock.position * impl->rate / rate;
} else } else
timestamp = expected_timestamp; timestamp = expected_timestamp;
if (impl->have_sync) { if (!impl->have_sync) {
pw_log_info("sync to timestamp:%u seq:%u ts_offset:%u SSRC:%u",
timestamp, impl->seq, impl->ts_offset, impl->ssrc);
impl->ring.readindex = impl->ring.writeindex = timestamp;
memset(impl->buffer, 0, BUFFER_SIZE);
impl->have_sync = true;
expected_timestamp = timestamp;
} else {
if (SPA_ABS((int32_t)expected_timestamp - (int32_t)timestamp) > 32) { if (SPA_ABS((int32_t)expected_timestamp - (int32_t)timestamp) > 32) {
pw_log_warn("expected %u != timestamp %u", expected_timestamp, timestamp); pw_log_warn("expected %u != timestamp %u", expected_timestamp, timestamp);
impl->have_sync = false; impl->have_sync = false;
@ -280,21 +288,14 @@ static void rtp_audio_process_capture(void *data)
impl->have_sync = false; impl->have_sync = false;
} }
} }
if (!impl->have_sync) {
pw_log_info("sync to timestamp:%u seq:%u ts_offset:%u SSRC:%u",
timestamp, impl->seq, impl->ts_offset, impl->ssrc);
impl->ring.readindex = impl->ring.writeindex = timestamp;
memset(impl->buffer, 0, BUFFER_SIZE);
impl->have_sync = true;
}
spa_ringbuffer_write_data(&impl->ring, spa_ringbuffer_write_data(&impl->ring,
impl->buffer, impl->buffer,
BUFFER_SIZE, BUFFER_SIZE,
(timestamp * stride) & BUFFER_MASK, (expected_timestamp * stride) & BUFFER_MASK,
SPA_PTROFF(d[0].data, offs, void), wanted * stride); SPA_PTROFF(d[0].data, offs, void), wanted * stride);
timestamp += wanted; expected_timestamp += wanted;
spa_ringbuffer_write_update(&impl->ring, timestamp); spa_ringbuffer_write_update(&impl->ring, expected_timestamp);
pw_stream_queue_buffer(impl->stream, buf); pw_stream_queue_buffer(impl->stream, buf);

19
src/modules/module-rtp/opus.c
View file

@ -288,7 +288,13 @@ static void rtp_opus_process_capture(void *data)
} else } else
timestamp = expected_timestamp; timestamp = expected_timestamp;
if (impl->have_sync) { if (!impl->have_sync) {
pw_log_info("sync to timestamp:%u seq:%u ts_offset:%u SSRC:%u",
timestamp, impl->seq, impl->ts_offset, impl->ssrc);
impl->ring.readindex = impl->ring.writeindex = expected_timestamp = timestamp;
memset(impl->buffer, 0, BUFFER_SIZE);
impl->have_sync = true;
} else {
if (SPA_ABS((int32_t)expected_timestamp - (int32_t)timestamp) > 32) { if (SPA_ABS((int32_t)expected_timestamp - (int32_t)timestamp) > 32) {
pw_log_warn("expected %u != timestamp %u", expected_timestamp, timestamp); pw_log_warn("expected %u != timestamp %u", expected_timestamp, timestamp);
impl->have_sync = false; impl->have_sync = false;
@ -297,21 +303,14 @@ static void rtp_opus_process_capture(void *data)
impl->have_sync = false; impl->have_sync = false;
} }
} }
if (!impl->have_sync) {
pw_log_info("sync to timestamp:%u seq:%u ts_offset:%u SSRC:%u",
timestamp, impl->seq, impl->ts_offset, impl->ssrc);
impl->ring.readindex = impl->ring.writeindex = timestamp;
memset(impl->buffer, 0, BUFFER_SIZE);
impl->have_sync = true;
}
spa_ringbuffer_write_data(&impl->ring, spa_ringbuffer_write_data(&impl->ring,
impl->buffer, impl->buffer,
BUFFER_SIZE, BUFFER_SIZE,
(filled * stride) & BUFFER_MASK, (filled * stride) & BUFFER_MASK,
SPA_PTROFF(d[0].data, offs, void), wanted * stride); SPA_PTROFF(d[0].data, offs, void), wanted * stride);
timestamp += wanted; expected_timestamp += wanted;
spa_ringbuffer_write_update(&impl->ring, timestamp); spa_ringbuffer_write_update(&impl->ring, expected_timestamp);
pw_stream_queue_buffer(impl->stream, buf); pw_stream_queue_buffer(impl->stream, buf);