Fix crash when destroy if capture sound played callback is not called

[platform/core/multimedia/libmm-camcorder.git] / src / mm_camcorder_resource.c

diff --git a/src/mm_camcorder_resource.c b/src/mm_camcorder_resource.c
index 3c15e0a..5dde52d 100644 (file)
--- a/src/mm_camcorder_resource.c
+++ b/src/mm_camcorder_resource.c
@@ -318,11 +318,28 @@ static int __mmcamcorder_resource_set_release_cb(MMCamcorderResourceManager *res
        return ret;
 }
 
+static gpointer __mmcamcorder_launch_glib_murphy_loop(void *user_data)
+{
+       MMCamcorderResourceManager *resource_manager= (MMCamcorderResourceManager *)user_data;
+
+       _mmcam_dbg_log("Run mrp_loop");
+
+       g_main_loop_run(resource_manager->mrp_loop);
+
+       _mmcam_dbg_log("Murphy glib loop exit");
+
+       return NULL;
+}
+
 int _mmcamcorder_resource_manager_init(MMCamcorderResourceManager *resource_manager, void *user_data)
 {
        MMCAMCORDER_CHECK_RESOURCE_MANAGER_INSTANCE(resource_manager);
 
-       resource_manager->mloop = mrp_mainloop_glib_get(g_main_loop_new(NULL, TRUE));
+       GMainContext *mrp_ctx = g_main_context_new();
+       resource_manager->mrp_loop = g_main_loop_new(mrp_ctx, TRUE);
+       resource_manager->mloop = mrp_mainloop_glib_get(resource_manager->mrp_loop);
+       resource_manager->starter = g_thread_new(NULL, (GThreadFunc)__mmcamcorder_launch_glib_murphy_loop, resource_manager);
+       g_main_context_unref(mrp_ctx);
        if (!resource_manager->mloop) {
                _mmcam_dbg_err("failed to get mainloop for mrp");
                return MM_ERROR_RESOURCE_INTERNAL;
@@ -420,11 +437,25 @@ int _mmcamcorder_resource_manager_deinit(MMCamcorderResourceManager *resource_ma
                mrp_res_delete_resource_set(resource_manager->rset);
                resource_manager->rset = NULL;
        }
+
        if (resource_manager->context) {
                _mmcam_dbg_log("destroy resource context");
                mrp_res_destroy(resource_manager->context);
                resource_manager->context = NULL;
        }
+
+       if (resource_manager->mrp_loop) {
+               g_main_loop_quit(resource_manager->mrp_loop);
+               g_main_loop_unref(resource_manager->mrp_loop);
+               resource_manager->mrp_loop = NULL;
+       }
+
+       if (resource_manager->starter) {
+               g_thread_join(resource_manager->starter);
+               g_thread_unref(resource_manager->starter);
+               resource_manager->starter = NULL;
+       }
+
        if (resource_manager->mloop) {
                _mmcam_dbg_log("destroy resource mainloop");
                mrp_mainloop_destroy(resource_manager->mloop);