From fb4e3bb1fe76f82d3839d19d2a95b7d73042a642 Mon Sep 17 00:00:00 2001 From: Jaechul Lee Date: Thu, 14 Apr 2022 15:00:24 +0900 Subject: [PATCH] tizenaudio-sink/source: Fix crash when pulseaudio exit * Fix pulseaudio crash (pactl exit) * symbol mismatching(pa_processor_push_reference) * aarch64 build warning [Version] 15.0.13 [Issue Type] Bug Change-Id: I0d7f0d44a95cd9667746529ed1f03151ec92e64a Signed-off-by: Jaechul Lee --- packaging/pulseaudio-modules-tizen.spec | 2 +- src/echo-cancel/processor.c | 2 +- src/module-sound-player.c | 2 +- src/module-tizenaudio-sink.c | 3 +++ src/module-tizenaudio-sink2.c | 3 +++ src/module-tizenaudio-source.c | 3 +++ src/module-tizenaudio-source2.c | 3 +++ 7 files changed, 15 insertions(+), 3 deletions(-) diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec index 6c31737..d1d68f6 100644 --- a/packaging/pulseaudio-modules-tizen.spec +++ b/packaging/pulseaudio-modules-tizen.spec @@ -2,7 +2,7 @@ Name: pulseaudio-modules-tizen Summary: Pulseaudio modules for Tizen -Version: 15.0.12 +Version: 15.0.13 Release: 0 Group: Multimedia/Audio License: LGPL-2.1+ diff --git a/src/echo-cancel/processor.c b/src/echo-cancel/processor.c index 5b8916b..0052ab8 100644 --- a/src/echo-cancel/processor.c +++ b/src/echo-cancel/processor.c @@ -397,7 +397,7 @@ int pa_processor_process(pa_processor *processor, pa_memchunk *chunk, pa_memchun return r; } -int pa_processor_push_data(pa_processor *processor, pa_memchunk *chunk) { +int pa_processor_push_reference(pa_processor *processor, pa_memchunk *chunk) { pa_memchunk ochunk; int r; diff --git a/src/module-sound-player.c b/src/module-sound-player.c index ce505a8..cf55d04 100644 --- a/src/module-sound-player.c +++ b/src/module-sound-player.c @@ -753,7 +753,7 @@ static void io_event_callback(pa_mainloop_api *io, pa_io_event *e, int fd, pa_io else pa_log_error("Invalid method!!!"); } else { - pa_log_warn("Fail to read, retry_count(%d), read sum(%d), err(%s)", retry_count, read_sum, pa_cstrerror(errno)); + pa_log_warn("Fail to read, retry_count(%d), read sum(%zu), err(%s)", retry_count, read_sum, pa_cstrerror(errno)); } } diff --git a/src/module-tizenaudio-sink.c b/src/module-tizenaudio-sink.c index 6c56de9..0ea7846 100644 --- a/src/module-tizenaudio-sink.c +++ b/src/module-tizenaudio-sink.c @@ -796,5 +796,8 @@ void pa__done(pa_module*m) { pa_hal_interface_pcm_close(u->hal_interface, u->pcm_handle); } + if (u->hal_interface) + pa_hal_interface_unref(u->hal_interface); + pa_xfree(u); } diff --git a/src/module-tizenaudio-sink2.c b/src/module-tizenaudio-sink2.c index a81ac70..36675c3 100644 --- a/src/module-tizenaudio-sink2.c +++ b/src/module-tizenaudio-sink2.c @@ -654,5 +654,8 @@ void pa__done(pa_module*m) { pa_hal_interface_pcm_close(u->hal_interface, u->pcm_handle); } + if (u->hal_interface) + pa_hal_interface_unref(u->hal_interface); + pa_xfree(u); } diff --git a/src/module-tizenaudio-source.c b/src/module-tizenaudio-source.c index 4beabf5..e3ed819 100644 --- a/src/module-tizenaudio-source.c +++ b/src/module-tizenaudio-source.c @@ -700,5 +700,8 @@ void pa__done(pa_module*m) { pa_hal_interface_pcm_close(u->hal_interface, u->pcm_handle); } + if (u->hal_interface) + pa_hal_interface_unref(u->hal_interface); + pa_xfree(u); } diff --git a/src/module-tizenaudio-source2.c b/src/module-tizenaudio-source2.c index 5bd3a61..a47dbbe 100644 --- a/src/module-tizenaudio-source2.c +++ b/src/module-tizenaudio-source2.c @@ -619,5 +619,8 @@ void pa__done(pa_module*m) { pa_hal_interface_pcm_close(u->hal_interface, u->pcm_handle); } + if (u->hal_interface) + pa_hal_interface_unref(u->hal_interface); + pa_xfree(u); } -- 2.34.1