mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

a2dpsink: Process right amount of data with sbc_encode

Browse source 
sbc_encode() can only process data with at least this->codesize bytes.
When encode_buffer() is called with less then codesize bytes, accumulate
those bytes in a temporary buffer up to codesize length, then SBC encode
them.
Maximum size for SBC buffer is (subbands * blocks * channels * 2) with max
subbands = 8, max blocks = 16, max channels = 2, i.e. 512.

Fixes !277
This commit is contained in:
Frédéric Danis 2020-06-18 20:05:25 +02:00 • committed by Wim Taymans
parent 2e914ac10e
commit 41d7ccc336
1 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

25
spa/plugins/bluez5/a2dp-sink.c
View file

@ -133,6 +133,8 @@ struct impl {
int frame_count;
uint16_t seqnum;
uint32_t timestamp;
uint8_t tmp_buffer[512];
int tmp_buffer_used;
int min_bitpool;
int max_bitpool;
@ -397,6 +399,8 @@ static int encode_buffer(struct impl *this, const void *data, int size)
int processed;
ssize_t out_encoded;
struct port *port = &this->port;
const void *from_data = data;
int from_size = size;
spa_log_trace(this->log, NAME " %p: encode %d used %d, %d %d %d/%d",
this, size, this->buffer_used, port->frame_size, this->write_size,
@ -405,7 +409,18 @@ static int encode_buffer(struct impl *this, const void *data, int size)
if (this->frame_count > MAX_FRAME_COUNT)
return -ENOSPC;
processed = sbc_encode(&this->sbc, data, size,
if (size < this->codesize - this->tmp_buffer_used) {
memcpy(this->tmp_buffer + this->tmp_buffer_used, data, size);
this->tmp_buffer_used += size;
return size;
} else if (this->tmp_buffer_used > 0) {
memcpy(this->tmp_buffer + this->tmp_buffer_used, data, this->codesize - this->tmp_buffer_used);
from_data = this->tmp_buffer;
from_size = this->codesize;
this->tmp_buffer_used = this->codesize - this->tmp_buffer_used;
}
processed = sbc_encode(&this->sbc, from_data, from_size,
this->buffer + this->buffer_used,
this->write_size - this->buffer_used,
&out_encoded);
@ -420,6 +435,11 @@ static int encode_buffer(struct impl *this, const void *data, int size)
spa_log_trace(this->log, NAME " %p: processed %d %zd used %d",
this, processed, out_encoded, this->buffer_used);
if (this->tmp_buffer_used) {
processed = this->tmp_buffer_used;
this->tmp_buffer_used = 0;
}
return processed;
}
@ -504,6 +524,9 @@ static int set_bitpool(struct impl *this, int bitpool)
spa_log_debug(this->log, NAME" %p: set bitpool %d", this, this->sbc.bitpool);
this->codesize = sbc_get_codesize(&this->sbc);
/* make sure there's enough space in this->tmp_buffer */
spa_assert(this->codesize <= 512);
this->frame_length = sbc_get_frame_length(&this->sbc);
this->read_size = this->transport->read_mtu