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

bluez5: stop before freeing things

Browse source 
Make sure all timers are stopped before we clear our state.

See #2764
This commit is contained in:
Wim Taymans 2022-10-20 21:52:49 +02:00
parent 643d95f515
commit c0fc29494f
4 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
spa/plugins/bluez5/media-sink.c
View file

@ -1645,8 +1645,7 @@ static int impl_clear(struct spa_handle *handle)
{ {
struct impl *this = (struct impl *) handle; struct impl *this = (struct impl *) handle;
if (this->codec_data) do_stop(this);
this->codec->deinit(this->codec_data);
if (this->codec_props && this->codec->clear_props) if (this->codec_props && this->codec->clear_props)
this->codec->clear_props(this->codec_props); this->codec->clear_props(this->codec_props);
if (this->transport) if (this->transport)

4
spa/plugins/bluez5/media-source.c
View file

@ -1452,8 +1452,8 @@ static int impl_clear(struct spa_handle *handle)
{ {
struct impl *this = (struct impl *) handle; struct impl *this = (struct impl *) handle;
struct port *port = &this->port; struct port *port = &this->port;
if (this->codec_data)
this->codec->deinit(this->codec_data); do_stop(this);
if (this->codec_props && this->codec->clear_props) if (this->codec_props && this->codec->clear_props)
this->codec->clear_props(this->codec_props); this->codec->clear_props(this->codec_props);
if (this->transport) if (this->transport)

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

@ -1347,6 +1347,8 @@ static int impl_get_interface(struct spa_handle *handle, const char *type, void
static int impl_clear(struct spa_handle *handle) static int impl_clear(struct spa_handle *handle)
{ {
struct impl *this = (struct impl *) handle; struct impl *this = (struct impl *) handle;
do_stop(this);
if (this->transport) if (this->transport)
spa_hook_remove(&this->transport_listener); spa_hook_remove(&this->transport_listener);
spa_system_close(this->data_system, this->timerfd); spa_system_close(this->data_system, this->timerfd);

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

@ -1391,6 +1391,8 @@ static int impl_get_interface(struct spa_handle *handle, const char *type, void
static int impl_clear(struct spa_handle *handle) static int impl_clear(struct spa_handle *handle)
{ {
struct impl *this = (struct impl *) handle; struct impl *this = (struct impl *) handle;
do_stop(this);
if (this->transport) if (this->transport)
spa_hook_remove(&this->transport_listener); spa_hook_remove(&this->transport_listener);
spa_system_close(this->data_system, this->timerfd); spa_system_close(this->data_system, this->timerfd);