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

bluetooth: fix a2dp_process_push

Browse source 
Use minimum bitpool configured to get the maximum block_size possible,
also remove checks for how much has been written when decoding sbc frames
since the block size may change due to bitpool changes.
This commit is contained in:
Luiz Augusto von Dentz 2010-12-23 15:24:39 +02:00
parent 1c388f977a
commit 97f7c5759e
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/modules/bluetooth/module-bluetooth-device.c
View file

@ -579,7 +579,7 @@ static int setup_a2dp(struct userdata *u) {
} }
/* Run from main thread */ /* Run from main thread */
static void setup_sbc(struct a2dp_info *a2dp) { static void setup_sbc(struct a2dp_info *a2dp, enum profile p) {
sbc_capabilities_t *active_capabilities; sbc_capabilities_t *active_capabilities;
pa_assert(a2dp); pa_assert(a2dp);
@ -668,7 +668,8 @@ static void setup_sbc(struct a2dp_info *a2dp) {
a2dp->min_bitpool = active_capabilities->min_bitpool; a2dp->min_bitpool = active_capabilities->min_bitpool;
a2dp->max_bitpool = active_capabilities->max_bitpool; a2dp->max_bitpool = active_capabilities->max_bitpool;
a2dp->sbc.bitpool = active_capabilities->max_bitpool; /* Set minimum bitpool for source to get the maximum possible block_size */
a2dp->sbc.bitpool = p == PROFILE_A2DP ? a2dp->max_bitpool : a2dp->min_bitpool;
a2dp->codesize = sbc_get_codesize(&a2dp->sbc); a2dp->codesize = sbc_get_codesize(&a2dp->sbc);
a2dp->frame_length = sbc_get_frame_length(&a2dp->sbc); a2dp->frame_length = sbc_get_frame_length(&a2dp->sbc);
} }
@ -736,7 +737,7 @@ static int set_conf(struct userdata *u) {
/* setup SBC encoder now we agree on parameters */ /* setup SBC encoder now we agree on parameters */
if (u->profile == PROFILE_A2DP || u->profile == PROFILE_A2DP_SOURCE) { if (u->profile == PROFILE_A2DP || u->profile == PROFILE_A2DP_SOURCE) {
setup_sbc(&u->a2dp); setup_sbc(&u->a2dp, u->profile);
u->block_size = u->block_size =
((u->link_mtu - sizeof(struct rtp_header) - sizeof(struct rtp_payload)) ((u->link_mtu - sizeof(struct rtp_header) - sizeof(struct rtp_payload))
@ -1486,7 +1487,7 @@ static int a2dp_process_push(struct userdata *u) {
d = pa_memblock_acquire(memchunk.memblock); d = pa_memblock_acquire(memchunk.memblock);
to_write = memchunk.length = pa_memblock_get_length(memchunk.memblock); to_write = memchunk.length = pa_memblock_get_length(memchunk.memblock);
while (PA_LIKELY(to_decode > 0 && to_write > 0)) { while (PA_LIKELY(to_decode > 0)) {
size_t written; size_t written;
ssize_t decoded; ssize_t decoded;
@ -1505,10 +1506,12 @@ static int a2dp_process_push(struct userdata *u) {
/* pa_log_debug("SBC: decoded: %lu; written: %lu", (unsigned long) decoded, (unsigned long) written); */ /* pa_log_debug("SBC: decoded: %lu; written: %lu", (unsigned long) decoded, (unsigned long) written); */
/* pa_log_debug("SBC: frame_length: %lu; codesize: %lu", (unsigned long) a2dp->frame_length, (unsigned long) a2dp->codesize); */ /* pa_log_debug("SBC: frame_length: %lu; codesize: %lu", (unsigned long) a2dp->frame_length, (unsigned long) a2dp->codesize); */
/* Reset frame length, it can be changed due to bitpool change */
a2dp->frame_length = sbc_get_frame_length(&a2dp->sbc);
pa_assert_fp((size_t) decoded <= to_decode); pa_assert_fp((size_t) decoded <= to_decode);
pa_assert_fp((size_t) decoded == a2dp->frame_length); pa_assert_fp((size_t) decoded == a2dp->frame_length);
pa_assert_fp((size_t) written <= to_write);
pa_assert_fp((size_t) written == a2dp->codesize); pa_assert_fp((size_t) written == a2dp->codesize);
p = (const uint8_t*) p + decoded; p = (const uint8_t*) p + decoded;
@ -1520,6 +1523,8 @@ static int a2dp_process_push(struct userdata *u) {
frame_count++; frame_count++;
} }
memchunk.length -= to_write;
pa_memblock_release(memchunk.memblock); pa_memblock_release(memchunk.memblock);
pa_source_post(u->source, &memchunk); pa_source_post(u->source, &memchunk);
@ -2166,7 +2171,8 @@ static int bt_transport_config_a2dp(struct userdata *u) {
a2dp->min_bitpool = config->min_bitpool; a2dp->min_bitpool = config->min_bitpool;
a2dp->max_bitpool = config->max_bitpool; a2dp->max_bitpool = config->max_bitpool;
a2dp->sbc.bitpool = config->max_bitpool; /* Set minimum bitpool for source to get the maximum possible block_size */
a2dp->sbc.bitpool = u->profile == PROFILE_A2DP ? a2dp->max_bitpool : a2dp->min_bitpool;
a2dp->codesize = sbc_get_codesize(&a2dp->sbc); a2dp->codesize = sbc_get_codesize(&a2dp->sbc);
a2dp->frame_length = sbc_get_frame_length(&a2dp->sbc); a2dp->frame_length = sbc_get_frame_length(&a2dp->sbc);