mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: improve decode-buffer latency accuracy

Browse source 
Interpolate buffer level to current playback position, and change its
definition so it directly corresponds to the total buffer latency.  This
is also a bit simpler.
This commit is contained in:
Pauli Virtanen 2024-11-30 13:14:43 +02:00
parent 41ca76685c
commit 46c89f1e0c
3 changed files with 126 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

16
spa/plugins/bluez5/sco-source.c
View file

@ -458,7 +458,7 @@ static int lc3_decode_frame(struct impl *this, const void *src, size_t src_size,
#endif
}
static uint32_t preprocess_and_decode_codec_data(void *userdata, uint8_t *read_data, int size_read)
static uint32_t preprocess_and_decode_codec_data(void *userdata, uint8_t *read_data, int size_read, uint64_t now)
{
struct impl *this = userdata;
struct port *port = &this->port;
@ -531,7 +531,7 @@ static uint32_t preprocess_and_decode_codec_data(void *userdata, uint8_t *read_d
continue;
}
spa_bt_decode_buffer_write_packet(&port->buffer, written);
spa_bt_decode_buffer_write_packet(&port->buffer, written, now);
decoded += written;
}
@ -566,7 +566,7 @@ static int sco_source_cb(void *userdata, uint8_t *read_data, int size_read)
if (this->transport->codec == HFP_AUDIO_CODEC_MSBC ||
this->transport->codec == HFP_AUDIO_CODEC_LC3_SWB) {
decoded = preprocess_and_decode_codec_data(userdata, read_data, size_read);
decoded = preprocess_and_decode_codec_data(userdata, read_data, size_read, SPA_TIMESPEC_TO_NSEC(&this->now));
} else {
uint32_t avail;
uint8_t *packet;
@ -591,7 +591,7 @@ static int sco_source_cb(void *userdata, uint8_t *read_data, int size_read)
packet = spa_bt_decode_buffer_get_write(&port->buffer, &avail);
avail = SPA_MIN(avail, (uint32_t)size_read);
spa_memmove(packet, read_data, avail);
spa_bt_decode_buffer_write_packet(&port->buffer, avail);
spa_bt_decode_buffer_write_packet(&port->buffer, avail, SPA_TIMESPEC_TO_NSEC(&this->now));
decoded = avail;
}
@ -728,8 +728,8 @@ static int transport_start(struct impl *this)
this->quantum_limit, this->quantum_limit)) < 0)
return res;
/* 40 ms max buffer */
spa_bt_decode_buffer_set_max_latency(&port->buffer,
/* 40 ms max buffer (on top of duration) */
spa_bt_decode_buffer_set_max_extra_latency(&port->buffer,
port->current_format.info.raw.rate * 40 / 1000);
/* Init mSBC/LC3 if needed */
@ -1402,7 +1402,9 @@ static void process_buffering(struct impl *this)
void *buf;
uint32_t avail;
spa_bt_decode_buffer_process(&port->buffer, samples, duration);
spa_bt_decode_buffer_process(&port->buffer, samples, duration,
this->position ? this->position->clock.rate_diff : 1.0,
this->position ? this->position->clock.next_nsec : 0);
setup_matching(this);