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

bluez5: use bigger decode buffer in a2dp-source

Browse source 
LC3plus expands 509 bytes input -> 7680 bytes output, which is bigger
than current decode buffer.

Make the decode buffer bigger, and put it on heap, not stack.
This commit is contained in:
Pauli Virtanen 2022-05-01 00:24:59 +03:00
parent 9ad53d9d19
commit f9850ca4f8
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spa/plugins/bluez5/a2dp-source.c
View file

@ -154,6 +154,7 @@ struct impl {
struct spa_audio_info codec_format; struct spa_audio_info codec_format;
uint8_t buffer_read[4096]; uint8_t buffer_read[4096];
uint8_t buffer_decoded[65536];
struct timespec now; struct timespec now;
uint64_t sample_count; uint64_t sample_count;
uint64_t skip_count; uint64_t skip_count;
@ -472,7 +473,6 @@ static void a2dp_on_ready_read(struct spa_source *source)
struct spa_data *datas; struct spa_data *datas;
struct buffer *buffer; struct buffer *buffer;
uint32_t min_data; uint32_t min_data;
uint8_t read_decoded[4096];
/* make sure the source is an input */ /* make sure the source is an input */
if ((source->rmask & SPA_IO_IN) == 0) { if ((source->rmask & SPA_IO_IN) == 0) {
@ -507,7 +507,7 @@ static void a2dp_on_ready_read(struct spa_source *source)
/* decode */ /* decode */
decoded = decode_data(this, this->buffer_read, size_read, decoded = decode_data(this, this->buffer_read, size_read,
read_decoded, sizeof (read_decoded)); this->buffer_decoded, sizeof (this->buffer_decoded));
if (decoded < 0) { if (decoded < 0) {
spa_log_debug(this->log, "failed to decode data: %d", decoded); spa_log_debug(this->log, "failed to decode data: %d", decoded);
return; return;
@ -557,7 +557,7 @@ static void a2dp_on_ready_read(struct spa_source *source)
avail = SPA_MIN(decoded, (int32_t)(datas[0].maxsize - port->ready_offset)); avail = SPA_MIN(decoded, (int32_t)(datas[0].maxsize - port->ready_offset));
if (avail < decoded) if (avail < decoded)
spa_log_warn(this->log, "buffer too small (%d > %d)", decoded, avail); spa_log_warn(this->log, "buffer too small (%d > %d)", decoded, avail);
memcpy ((uint8_t *)datas[0].data + port->ready_offset, read_decoded, avail); memcpy ((uint8_t *)datas[0].data + port->ready_offset, this->buffer_decoded, avail);
port->ready_offset += avail; port->ready_offset += avail;
this->sample_count += decoded / port->frame_size; this->sample_count += decoded / port->frame_size;