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

spa: bluez: fix SBC encoder/decoder leak

Browse source 
`sbc_finish()` wasn't called on the msbc en/decoder of
sco-sink and sco-source. Fix that.
This commit is contained in:
Barnabás Pőcze 2023-10-06 11:58:52 +02:00 • committed by Wim Taymans
parent 96a280497d
commit d2b5b53c08
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
spa/plugins/bluez5/sco-sink.c
View file

@ -662,7 +662,9 @@ static int transport_start(struct impl *this)
/* Init mSBC if needed */ /* Init mSBC if needed */
if (this->transport->codec == HFP_AUDIO_CODEC_MSBC) { if (this->transport->codec == HFP_AUDIO_CODEC_MSBC) {
sbc_init_msbc(&this->msbc, 0); res = sbc_init_msbc(&this->msbc, 0);
if (res < 0)
return res;
/* Libsbc expects audio samples by default in host endianness, mSBC requires little endian */ /* Libsbc expects audio samples by default in host endianness, mSBC requires little endian */
this->msbc.endian = SBC_LE; this->msbc.endian = SBC_LE;
@ -705,6 +707,7 @@ static int transport_start(struct impl *this)
fail: fail:
free(this->buffer); free(this->buffer);
this->buffer = NULL; this->buffer = NULL;
sbc_finish(&this->msbc);
return res; return res;
} }
@ -819,6 +822,8 @@ static void transport_stop(struct impl *this)
this->buffer = NULL; this->buffer = NULL;
this->buffer_head = this->buffer_next = this->buffer; this->buffer_head = this->buffer_next = this->buffer;
} }
sbc_finish(&this->msbc);
} }
static int do_stop(struct impl *this) static int do_stop(struct impl *this)

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

@ -687,7 +687,10 @@ static int transport_start(struct impl *this)
/* Init mSBC if needed */ /* Init mSBC if needed */
if (this->transport->codec == HFP_AUDIO_CODEC_MSBC) { if (this->transport->codec == HFP_AUDIO_CODEC_MSBC) {
sbc_init_msbc(&this->msbc, 0); res = sbc_init_msbc(&this->msbc, 0);
if (res < 0)
return res;
/* Libsbc expects audio samples by default in host endianness, mSBC requires little endian */ /* Libsbc expects audio samples by default in host endianness, mSBC requires little endian */
this->msbc.endian = SBC_LE; this->msbc.endian = SBC_LE;
this->msbc_seq_initialized = false; this->msbc_seq_initialized = false;
@ -708,6 +711,7 @@ static int transport_start(struct impl *this)
return 0; return 0;
fail: fail:
sbc_finish(&this->msbc);
return res; return res;
} }
@ -798,6 +802,8 @@ static void transport_stop(struct impl *this)
spa_loop_invoke(this->data_loop, do_remove_transport_source, 0, NULL, 0, true, this); spa_loop_invoke(this->data_loop, do_remove_transport_source, 0, NULL, 0, true, this);
spa_bt_decode_buffer_clear(&port->buffer); spa_bt_decode_buffer_clear(&port->buffer);
sbc_finish(&this->msbc);
} }
static int do_stop(struct impl *this) static int do_stop(struct impl *this)