Fix build warnings
[platform/core/api/recorder.git] / src / recorder.c
index 1f4fcc5..e240071 100644 (file)
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <inttypes.h>
 #include <camera_internal.h>
 #include <recorder.h>
 #include <sound_manager.h>
 #include <sound_manager_internal.h>
 #include <storage.h>
+#include <storage-internal.h>
 #include <muse_recorder.h>
 #include <muse_recorder_msg.h>
-#include <muse_core_ipc.h>
-#include <muse_core_module.h>
+#include <muse_core.h>
+#include <muse_client.h>
 #include <recorder_private.h>
-#include <glib.h>
+#include <gio/gio.h>
 #include <dlog.h>
+#include <tzplatform_config.h>
 
 #ifdef LOG_TAG
 #undef LOG_TAG
 #endif
-#define LOG_TAG "TIZEN_N_RECORDER"
+#define LOG_TAG         "TIZEN_N_RECORDER"
+#define MODULE_NAME     "recorder"
 
+/* for device changed callback */
+static GMutex g_rec_dev_state_changed_cb_lock;
+static GList *g_rec_dev_state_changed_cb_list;
+static int g_rec_dev_state_changed_cb_id;
+static GDBusConnection *g_rec_dev_state_changed_cb_conn;
+static guint g_rec_dev_state_changed_cb_subscribe_id;
+static GMutex g_rec_idle_event_lock;
 
-static int _recorder_import_tbm_key(tbm_bufmgr bufmgr, unsigned int tbm_key, tbm_bo *bo, tbm_bo_handle *bo_handle)
+
+
+static void __recorder_update_api_waiting(recorder_cb_info_s *cb_info, int api, int value)
+{
+       if (!cb_info ||
+               api < 0 || api >= MUSE_RECORDER_API_MAX) {
+               LOGE("invalid param %p %d", cb_info, api);
+               return;
+       }
+
+       g_mutex_lock(&(cb_info->api_mutex[api]));
+       cb_info->api_waiting[api] += value;
+       g_mutex_unlock(&(cb_info->api_mutex[api]));
+
+       /*LOGD("api %d, value %d, waiting %d",
+               api, value, cb_info->api_waiting[api]);*/
+
+       return;
+}
+
+
+static void __recorder_device_state_changed_cb(GDBusConnection *connection,
+       const gchar *sender_name, const gchar *object_path, const gchar *interface_name,
+       const gchar *signal_name, GVariant *param, gpointer user_data)
+{
+       int value = 0;
+       recorder_type_e type = RECORDER_TYPE_AUDIO;
+       recorder_device_state_e state = RECORDER_DEVICE_STATE_IDLE;
+       GList *tmp_list = NULL;
+       recorder_cb_info *info = NULL;
+
+       g_mutex_lock(&g_rec_dev_state_changed_cb_lock);
+
+       if (!g_rec_dev_state_changed_cb_list || !param) {
+               LOGW("no callback or NULL param %p", param);
+               goto _DONE;
+       }
+
+       /* get device type and state */
+       g_variant_get(param, "(i)", &value);
+
+       type = value >> 16;
+       state = 0x0000ffff & value;
+
+       LOGD("type %d, state %d", type, state);
+
+       tmp_list = g_rec_dev_state_changed_cb_list;
+
+       do {
+               info = (recorder_cb_info *)tmp_list->data;
+
+               if (info) {
+                       if (info->callback) {
+                               LOGD("start id[%d] callback", info->id);
+                               ((recorder_device_state_changed_cb)info->callback)(type, state, info->user_data);
+                               LOGD("returned id[%d] callback", info->id);
+                       } else {
+                               LOGW("NULL callback for id %d", info->id);
+                       }
+               }
+
+               tmp_list = tmp_list->next;
+       } while (tmp_list);
+
+_DONE:
+       g_mutex_unlock(&g_rec_dev_state_changed_cb_lock);
+
+       return;
+}
+
+
+static int _recorder_import_tbm_fd(tbm_bufmgr bufmgr, int fd, tbm_bo *bo, tbm_bo_handle *bo_handle)
 {
        tbm_bo tmp_bo = NULL;
        tbm_bo_handle tmp_bo_handle = {NULL, };
 
-       if (bufmgr == NULL || bo == NULL || bo_handle == NULL || tbm_key == 0) {
-               LOGE("invalid parameter - bufmgr %p, bo %p, bo_handle %p, key %d",
-                    bufmgr, bo, bo_handle, tbm_key);
+       if (bufmgr == NULL || bo == NULL || bo_handle == NULL || fd < 0) {
+               LOGE("invalid parameter - bufmgr %p, bo %p, bo_handle %p, fd %d",
+                    bufmgr, bo, bo_handle, fd);
                return false;
        }
 
-       tmp_bo = tbm_bo_import(bufmgr, tbm_key);
+       tmp_bo = tbm_bo_import_fd(bufmgr, (tbm_fd)fd);
        if (tmp_bo == NULL) {
-               LOGE("bo import failed - bufmgr %p, key %d", bufmgr, tbm_key);
+               LOGE("bo import failed - bufmgr %p, fd %d", bufmgr, fd);
                return false;
        }
 
@@ -82,18 +164,26 @@ static void _recorder_release_imported_bo(tbm_bo *bo)
        return;
 }
 
-static void _client_user_callback(recorder_cb_info_s *cb_info, char *recv_msg, muse_recorder_event_e event)
+static void _recorder_client_user_callback(recorder_cb_info_s *cb_info, char *recv_msg, muse_recorder_event_e event, int tfd)
 {
        if (recv_msg == NULL || event >= MUSE_RECORDER_EVENT_TYPE_NUM) {
                LOGE("invalid parameter - recorder msg %p, event %d", recv_msg, event);
                return;
        }
 
-       LOGD("get recorder msg %s, event %d", recv_msg, event);
+       /*LOGD("get recorder msg %s, event %d", recv_msg, event);*/
+
+       g_mutex_lock(&cb_info->user_cb_mutex[event]);
 
        if (cb_info->user_cb[event] == NULL) {
-               LOGW("user callback for event %d is not set", event);
-               return;
+               if (event != MUSE_RECORDER_EVENT_TYPE_AUDIO_STREAM &&
+                       event != MUSE_RECORDER_EVENT_TYPE_MUXED_STREAM) {
+                       g_mutex_unlock(&cb_info->user_cb_mutex[event]);
+                       LOGW("NULL callback for event %d, return here", event);
+                       return;
+               } else {
+                       LOGW("NULL callback for event %d, NOT return here", event);
+               }
        }
 
        switch (event) {
@@ -128,8 +218,8 @@ static void _client_user_callback(recorder_cb_info_s *cb_info, char *recv_msg, m
                        int64_t cb_elapsed_time = 0;
                        int64_t cb_file_size = 0;
 
-                       muse_recorder_msg_get(cb_elapsed_time, recv_msg);
-                       muse_recorder_msg_get(cb_file_size, recv_msg);
+                       muse_recorder_msg_get_int64(cb_elapsed_time, recv_msg);
+                       muse_recorder_msg_get_int64(cb_file_size, recv_msg);
 
                        ((recorder_recording_status_cb)cb_info->user_cb[event])((unsigned long long)cb_elapsed_time,
                                (unsigned long long)cb_file_size,
@@ -146,54 +236,143 @@ static void _client_user_callback(recorder_cb_info_s *cb_info, char *recv_msg, m
                        muse_recorder_msg_get(previous, recv_msg);
                        muse_recorder_msg_get(current, recv_msg);
 
+                       LOGW("INTERRUPTED - policy %d, state %d -> %d", policy, previous, current);
+
                        ((recorder_interrupted_cb)cb_info->user_cb[event])((recorder_policy_e)policy,
                                (recorder_state_e)previous,
                                (recorder_state_e)current,
                                cb_info->user_data[event]);
                        break;
                }
+       case MUSE_RECORDER_EVENT_TYPE_INTERRUPT_STARTED:
+               {
+                       int policy = 0;
+                       int state = 0;
+
+                       muse_recorder_msg_get(policy, recv_msg);
+                       muse_recorder_msg_get(state, recv_msg);
+
+                       LOGW("INTERRUPT_STARTED - policy %d, state %d", policy, state);
+
+                       ((recorder_interrupt_started_cb)cb_info->user_cb[event])((recorder_policy_e)policy,
+                               (recorder_state_e)state, cb_info->user_data[event]);
+               }
+               break;
        case MUSE_RECORDER_EVENT_TYPE_AUDIO_STREAM:
                {
-                       int tbm_key = 0;
+                       int audio_fd = -1;
                        int size = 0;
                        int format = 0;
                        int channel = 0;
                        int timestamp = 0;
                        tbm_bo bo = NULL;
                        tbm_bo_handle bo_handle = {.ptr = NULL};
+                       char *send_msg = NULL;
 
-                       muse_recorder_msg_get(tbm_key, recv_msg);
-                       if (tbm_key == 0) {
-                               LOGE("invalid key");
+                       if (tfd < 0) {
+                               LOGE("invalid fd %d", tfd);
                                break;
                        }
 
-                       if (!_recorder_import_tbm_key(cb_info->bufmgr, tbm_key, &bo, &bo_handle)) {
-                               LOGE("tbm key %d import failed", tbm_key);
+                       muse_recorder_msg_get(audio_fd, recv_msg);
+
+                       if (cb_info->user_cb[event]) {
+                               if (_recorder_import_tbm_fd(cb_info->bufmgr, tfd, &bo, &bo_handle)) {
+                                       muse_recorder_msg_get(size, recv_msg);
+                                       muse_recorder_msg_get(format, recv_msg);
+                                       muse_recorder_msg_get(channel, recv_msg);
+                                       muse_recorder_msg_get(timestamp, recv_msg);
+
+                                       LOGD("%p, size %d, format %d, channel %d, timestamp %d",
+                                               bo_handle.ptr, size, format, channel, timestamp);
+
+                                       ((recorder_audio_stream_cb)cb_info->user_cb[event])((void *)bo_handle.ptr,
+                                               size, (audio_sample_type_e)format, channel,
+                                               (unsigned int)timestamp, cb_info->user_data[event]);
+
+                                       LOGD("returned");
+
+                                       /* release imported bo */
+                                       _recorder_release_imported_bo(&bo);
+                               } else {
+                                       LOGE("tbm fd %d import failed", tfd);
+                               }
+                       }
+
+                       /* return buffer */
+                       send_msg = muse_core_msg_new(MUSE_RECORDER_API_RETURN_BUFFER,
+                               MUSE_TYPE_INT, "ret_fd", audio_fd, NULL);
+
+                       if (send_msg) {
+                               if (muse_core_msg_send(cb_info->fd, send_msg) <= 0)
+                                       LOGE("sending message failed");
+
+                               muse_core_msg_free(send_msg);
+                               send_msg = NULL;
+                       } else {
+                               LOGE("failed to create send msg for fd %d", audio_fd);
+                       }
+
+                       /* close imported fd */
+                       close(tfd);
+                       tfd = -1;
+                       break;
+               }
+       case MUSE_RECORDER_EVENT_TYPE_MUXED_STREAM:
+               {
+                       int muxed_fd = -1;
+                       int size = 0;
+                       int64_t offset = 0;
+
+                       tbm_bo bo = NULL;
+                       tbm_bo_handle bo_handle = {.ptr = NULL};
+                       char *send_msg = NULL;
+
+                       if (tfd < 0) {
+                               LOGE("invalid fd %d", tfd);
                                break;
                        }
 
-                       muse_recorder_msg_get(size, recv_msg);
-                       muse_recorder_msg_get(format, recv_msg);
-                       muse_recorder_msg_get(channel, recv_msg);
-                       muse_recorder_msg_get(timestamp, recv_msg);
-
-                       ((recorder_audio_stream_cb)cb_info->user_cb[event])((void *)bo_handle.ptr,
-                               size,
-                               (audio_sample_type_e)format,
-                               channel,
-                               (unsigned int)timestamp,
-                               cb_info->user_data[event]);
+                       muse_recorder_msg_get(muxed_fd, recv_msg);
+
+                       if (cb_info->user_cb[event]) {
+                               if (_recorder_import_tbm_fd(cb_info->bufmgr, tfd, &bo, &bo_handle)) {
+                                       muse_recorder_msg_get(size, recv_msg);
+                                       muse_recorder_msg_get_int64(offset, recv_msg);
 
-                       /* release imported bo */
-                       _recorder_release_imported_bo(&bo);
+                                       LOGD("%p, size %d, offset %"PRId64, bo_handle.ptr, size, offset);
+
+                                       ((recorder_muxed_stream_cb)cb_info->user_cb[event])((void *)bo_handle.ptr,
+                                               size, (unsigned long long)offset, cb_info->user_data[event]);
+
+                                       LOGD("returned");
+
+                                       /* release imported bo */
+                                       _recorder_release_imported_bo(&bo);
+                               } else {
+                                       LOGE("tbm fd %d import failed", tfd);
+                               }
+                       }
 
                        /* return buffer */
-                       muse_recorder_msg_send1_no_return(MUSE_RECORDER_API_RETURN_BUFFER,
-                               cb_info->fd, cb_info,
-                               INT, tbm_key);
+                       send_msg = muse_core_msg_new(MUSE_RECORDER_API_RETURN_BUFFER,
+                               MUSE_TYPE_INT, "ret_fd", muxed_fd, NULL);
+                       if (send_msg) {
+                               if (muse_core_msg_send(cb_info->fd, send_msg) <= 0)
+                                       LOGE("sending message failed");
+
+                               muse_core_msg_free(send_msg);
+                               send_msg = NULL;
+                       } else {
+                               LOGE("failed to create send msg for fd %d", tfd);
+                       }
+
+                       /* close imported fd */
+                       close(tfd);
+                       tfd = -1;
                        break;
                }
+//LCOV_EXCL_START
        case MUSE_RECORDER_EVENT_TYPE_ERROR:
                {
                        int error = 0;
@@ -207,6 +386,7 @@ static void _client_user_callback(recorder_cb_info_s *cb_info, char *recv_msg, m
                                cb_info->user_data[event]);
                        break;
                }
+//LCOV_EXCL_STOP
        case MUSE_RECORDER_EVENT_TYPE_FOREACH_SUPPORTED_AUDIO_ENCODER:
                {
                        int codec = 0;
@@ -216,7 +396,7 @@ static void _client_user_callback(recorder_cb_info_s *cb_info, char *recv_msg, m
                        if (((recorder_supported_audio_encoder_cb)cb_info->user_cb[event])((recorder_audio_codec_e)codec, cb_info->user_data[event]) == false) {
                                cb_info->user_cb[event] = NULL;
                                cb_info->user_data[event] = NULL;
-                               LOGD("stop foreach callback for SUPPORTED_AUDIO_ENCODER");
+                               /*LOGD("stop foreach callback for SUPPORTED_AUDIO_ENCODER");*/
                        }
                        break;
                }
@@ -229,7 +409,7 @@ static void _client_user_callback(recorder_cb_info_s *cb_info, char *recv_msg, m
                        if (((recorder_supported_file_format_cb)cb_info->user_cb[event])((recorder_file_format_e)format, cb_info->user_data[event]) == false) {
                                cb_info->user_cb[event] = NULL;
                                cb_info->user_data[event] = NULL;
-                               LOGD("stop foreach callback for SUPPORTED_FILE_FORMAT");
+                               /*LOGD("stop foreach callback for SUPPORTED_FILE_FORMAT");*/
                        }
                        break;
                }
@@ -242,11 +422,11 @@ static void _client_user_callback(recorder_cb_info_s *cb_info, char *recv_msg, m
                        if (((recorder_supported_video_encoder_cb)cb_info->user_cb[event])((recorder_video_codec_e)codec, cb_info->user_data[event]) == false) {
                                cb_info->user_cb[event] = NULL;
                                cb_info->user_data[event] = NULL;
-                               LOGD("stop foreach callback for SUPPORTED_VIDEO_ENCODER");
+                               /*LOGD("stop foreach callback for SUPPORTED_VIDEO_ENCODER");*/
                        }
                        break;
                }
-       case MUSE_RECORDER_EVENT_TYPE_FOREACH_SUPPORTED_VIDEO_RESOLUTION:
+       default: /* MUSE_RECORDER_EVENT_TYPE_FOREACH_SUPPORTED_VIDEO_RESOLUTION */
                {
                        int width = 0;
                        int height = 0;
@@ -257,81 +437,70 @@ static void _client_user_callback(recorder_cb_info_s *cb_info, char *recv_msg, m
                        if (((recorder_supported_video_resolution_cb)cb_info->user_cb[event])(width, height, cb_info->user_data[event]) == false) {
                                cb_info->user_cb[event] = NULL;
                                cb_info->user_data[event] = NULL;
-                               LOGD("stop foreach callback for SUPPORTED_VIDEO_RESOLUTION");
+                               /*LOGD("stop foreach callback for SUPPORTED_VIDEO_RESOLUTION");*/
                        }
                        break;
                }
-
-       default:
-                       LOGE("Unknonw recorder event %d", event);
-                       break;
        }
 
+       g_mutex_unlock(&cb_info->user_cb_mutex[event]);
+
        return;
 }
 
 
-static bool _recorder_idle_event_callback(void *data)
+static gboolean _recorder_idle_event_callback(gpointer data)
 {
        recorder_cb_info_s *cb_info = NULL;
        recorder_idle_event_s *rec_idle_event = (recorder_idle_event_s *)data;
 
        if (rec_idle_event == NULL) {
                LOGE("rec_idle_event is NULL");
-               return false;
+               return FALSE;
        }
 
        /* lock event */
-       g_mutex_lock(&rec_idle_event->event_mutex);
+       g_mutex_lock(&g_rec_idle_event_lock);
 
        cb_info = rec_idle_event->cb_info;
        if (cb_info == NULL) {
-               LOGW("recorder cb_info is NULL. event %d", rec_idle_event->event);
+               LOGW("recorder cb_info is NULL. event %p %d", rec_idle_event, rec_idle_event->event);
+               g_mutex_unlock(&g_rec_idle_event_lock);
                goto IDLE_EVENT_CALLBACK_DONE;
        }
 
        /* remove event from list */
-       g_mutex_lock(&cb_info->idle_event_mutex);
        if (cb_info->idle_event_list)
                cb_info->idle_event_list = g_list_remove(cb_info->idle_event_list, (gpointer)rec_idle_event);
 
-       /*LOGD("remove recorder idle event %p, %p", rec_idle_event, cb_info->idle_event_list);*/
-       g_mutex_unlock(&cb_info->idle_event_mutex);
+       g_mutex_unlock(&g_rec_idle_event_lock);
 
        /* user callback */
-       _client_user_callback(rec_idle_event->cb_info, rec_idle_event->recv_msg, rec_idle_event->event);
-
-       /* send signal for waiting thread */
-       g_cond_signal(&cb_info->idle_event_cond);
+       _recorder_client_user_callback(cb_info, rec_idle_event->recv_msg, rec_idle_event->event, -1);
 
 IDLE_EVENT_CALLBACK_DONE:
-       /* unlock and release event */
-       g_mutex_unlock(&rec_idle_event->event_mutex);
-       g_mutex_clear(&rec_idle_event->event_mutex);
-
+       /* release event */
        g_free(rec_idle_event);
        rec_idle_event = NULL;
 
-       return false;
+       return FALSE;
 }
 
 
-static void _recorder_remove_idle_event_all(recorder_cb_info_s *cb_info)
+static void _recorder_deactivate_idle_event_all(recorder_cb_info_s *cb_info)
 {
        recorder_idle_event_s *rec_idle_event = NULL;
-       gboolean ret = TRUE;
        GList *list = NULL;
-       gint64 end_time = 0;
 
        if (cb_info == NULL) {
                LOGE("cb_info is NULL");
                return;
        }
 
-       g_mutex_lock(&cb_info->idle_event_mutex);
+       g_mutex_lock(&g_rec_idle_event_lock);
 
        if (cb_info->idle_event_list == NULL) {
-               LOGD("No idle event is remained.");
+               LOGD("No event");
        } else {
                list = cb_info->idle_event_list;
 
@@ -340,48 +509,301 @@ static void _recorder_remove_idle_event_all(recorder_cb_info_s *cb_info)
                        list = g_list_next(list);
 
                        if (!rec_idle_event) {
-                               LOGW("Fail to remove idle event. The event is NULL");
-                       } else {
-                               if (g_mutex_trylock(&rec_idle_event->event_mutex)) {
-                                       ret = g_idle_remove_by_data(rec_idle_event);
+                               LOGW("The event is NULL");
+                               continue;
+                       }
 
-                                       LOGD("remove idle event [%p], ret[%d]", rec_idle_event, ret);
+                       if (g_idle_remove_by_data(rec_idle_event)) {
+                               LOGW("remove idle event %p done", rec_idle_event);
 
-                                       if (ret == FALSE) {
-                                               rec_idle_event->cb_info = NULL;
-                                               LOGW("idle callback for event %p will be called later", rec_idle_event);
-                                       }
+                               cb_info->idle_event_list = g_list_remove(cb_info->idle_event_list, (gpointer)rec_idle_event);
 
-                                       cb_info->idle_event_list = g_list_remove(cb_info->idle_event_list, (gpointer)rec_idle_event);
+                               g_free(rec_idle_event);
+                               rec_idle_event = NULL;
 
-                                       g_mutex_unlock(&rec_idle_event->event_mutex);
+                               continue;
+                       }
 
-                                       if (ret == TRUE) {
-                                               g_mutex_clear(&rec_idle_event->event_mutex);
+                       LOGW("set NULL cb_info for event %p %d, it will be freed on idle callback",
+                               rec_idle_event, rec_idle_event->event);
 
-                                               g_free(rec_idle_event);
-                                               rec_idle_event = NULL;
+                       rec_idle_event->cb_info = NULL;
 
-                                               LOGD("remove idle event done");
-                                       }
-                               } else {
-                                       LOGW("event lock failed. it's being called...");
+                       cb_info->idle_event_list = g_list_remove(cb_info->idle_event_list, (gpointer)rec_idle_event);
+               }
 
-                                       end_time = g_get_monotonic_time() + G_TIME_SPAN_MILLISECOND * 100;
+               g_list_free(cb_info->idle_event_list);
+               cb_info->idle_event_list = NULL;
+       }
 
-                                       if (g_cond_wait_until(&cb_info->idle_event_cond, &cb_info->idle_event_mutex, end_time))
-                                               LOGW("signal received");
-                                       else
-                                               LOGW("timeout");
-                               }
+       g_mutex_unlock(&g_rec_idle_event_lock);
+
+       return;
+}
+
+
+static void __recorder_add_msg_to_queue(recorder_cb_info_s *cb_info, int api, int event, int event_class, char *msg, int tfd)
+{
+       recorder_message_s *rec_msg = NULL;
+       recorder_msg_handler_info_s *msg_handler_info = NULL;
+
+       if (!cb_info || !msg) {
+               LOGE("NULL pointer %p %p", cb_info, msg);
+               return;
+       }
+
+       rec_msg = g_new0(recorder_message_s, 1);
+       if (!rec_msg) {
+               LOGE("failed to alloc rec_msg for [%s]", msg);
+               return;
+       }
+
+       rec_msg->api = api;
+       rec_msg->event = event;
+       rec_msg->event_class = event_class;
+       rec_msg->tfd = tfd;
+
+       strncpy(rec_msg->recv_msg, msg, sizeof(rec_msg->recv_msg) - 1);
+
+       /*LOGD("add recorder message to queue : api %d, event %d, event_class %d", api, event, event_class);*/
+
+       if (event == MUSE_RECORDER_EVENT_TYPE_AUDIO_STREAM)
+               msg_handler_info = &cb_info->audio_stream_cb_info;
+       else if (event == MUSE_RECORDER_EVENT_TYPE_MUXED_STREAM)
+               msg_handler_info = &cb_info->muxed_stream_cb_info;
+       else
+               msg_handler_info = &cb_info->msg_handler_info;
+
+       g_mutex_lock(&msg_handler_info->mutex);
+       g_queue_push_tail(msg_handler_info->queue, (gpointer)rec_msg);
+       g_cond_signal(&msg_handler_info->cond);
+       g_mutex_unlock(&msg_handler_info->mutex);
+
+       rec_msg = NULL;
+
+       return;
+}
+
+
+static void __recorder_get_api_operation(int api, recorder_cb_info_s *cb_info, char *msg)
+{
+       if (!cb_info || !msg) {
+               LOGE("NULL pointer %p %p", cb_info, msg);
+               return;
+       }
+
+       switch (api) {
+       case MUSE_RECORDER_API_GET_STATE:
+               {
+                       int get_state = 0;
+                       muse_recorder_msg_get(get_state, msg);
+                       cb_info->get_int_value[_RECORDER_GET_INT_STATE] = get_state;
+               }
+               break;
+       case MUSE_RECORDER_API_GET_VIDEO_RESOLUTION:
+               {
+                       int get_width = 0;
+                       int get_height = 0;
+                       muse_recorder_msg_get(get_width, msg);
+                       muse_recorder_msg_get(get_height, msg);
+                       cb_info->get_int_value[_RECORDER_GET_INT_VIDEO_RESOLUTION] = get_width << 16;
+                       cb_info->get_int_value[_RECORDER_GET_INT_VIDEO_RESOLUTION] |= get_height;
+               }
+               break;
+       case MUSE_RECORDER_API_GET_FILE_FORMAT:
+               {
+                       int get_format = 0;
+                       muse_recorder_msg_get(get_format, msg);
+                       cb_info->get_int_value[_RECORDER_GET_INT_FILE_FORMAT] = get_format;
+               }
+               break;
+       case MUSE_RECORDER_API_GET_AUDIO_ENCODER:
+               {
+                       int get_codec = 0;
+                       muse_recorder_msg_get(get_codec, msg);
+                       cb_info->get_int_value[_RECORDER_GET_INT_AUDIO_ENCODER] = get_codec;
+               }
+               break;
+       case MUSE_RECORDER_API_GET_VIDEO_ENCODER:
+               {
+                       int get_codec = 0;
+                       muse_recorder_msg_get(get_codec, msg);
+                       cb_info->get_int_value[_RECORDER_GET_INT_VIDEO_ENCODER] = get_codec;
+               }
+               break;
+       case MUSE_RECORDER_API_ATTR_GET_SIZE_LIMIT:
+               {
+                       int get_kbyte = 0;
+                       muse_recorder_msg_get(get_kbyte, msg);
+                       cb_info->get_int_value[_RECORDER_GET_INT_SIZE_LIMIT] = get_kbyte;
+               }
+               break;
+       case MUSE_RECORDER_API_ATTR_GET_TIME_LIMIT:
+               {
+                       int get_second = 0;
+                       muse_recorder_msg_get(get_second, msg);
+                       cb_info->get_int_value[_RECORDER_GET_INT_TIME_LIMIT] = get_second;
+               }
+               break;
+       case MUSE_RECORDER_API_ATTR_GET_AUDIO_DEVICE:
+               {
+                       int get_device = 0;
+                       muse_recorder_msg_get(get_device, msg);
+                       cb_info->get_int_value[_RECORDER_GET_INT_AUDIO_DEVICE] = get_device;
+               }
+               break;
+       case MUSE_RECORDER_API_ATTR_GET_AUDIO_SAMPLERATE:
+               {
+                       int get_samplerate = 0;
+                       muse_recorder_msg_get(get_samplerate, msg);
+                       cb_info->get_int_value[_RECORDER_GET_INT_AUDIO_SAMPLERATE] = get_samplerate;
+               }
+               break;
+       case MUSE_RECORDER_API_ATTR_GET_AUDIO_ENCODER_BITRATE:
+               {
+                       int get_bitrate = 0;
+                       muse_recorder_msg_get(get_bitrate, msg);
+                       cb_info->get_int_value[_RECORDER_GET_INT_AUDIO_ENCODER_BITRATE] = get_bitrate;
+               }
+               break;
+       case MUSE_RECORDER_API_ATTR_GET_VIDEO_ENCODER_BITRATE:
+               {
+                       int get_bitrate = 0;
+                       muse_recorder_msg_get(get_bitrate, msg);
+                       cb_info->get_int_value[_RECORDER_GET_INT_VIDEO_ENCODER_BITRATE] = get_bitrate;
+               }
+               break;
+       case MUSE_RECORDER_API_ATTR_GET_RECORDING_MOTION_RATE:
+               {
+                       double get_rate = 0;
+                       muse_recorder_msg_get_double(get_rate, msg);
+                       cb_info->get_double_value[_RECORDER_GET_DOUBLE_RECORDING_MOTION_RATE] = get_rate;
+               }
+               break;
+       case MUSE_RECORDER_API_ATTR_GET_AUDIO_CHANNEL:
+               {
+                       int get_channel_count = 0;
+                       muse_recorder_msg_get(get_channel_count, msg);
+                       cb_info->get_int_value[_RECORDER_GET_INT_AUDIO_CHANNEL] = get_channel_count;
+               }
+               break;
+       case MUSE_RECORDER_API_ATTR_GET_ORIENTATION_TAG:
+               {
+                       int get_orientation = 0;
+                       muse_recorder_msg_get(get_orientation, msg);
+                       cb_info->get_int_value[_RECORDER_GET_INT_ORIENTATION_TAG] = get_orientation;
+               }
+               break;
+       case MUSE_RECORDER_API_GET_AUDIO_LEVEL:
+               {
+                       double get_level = 0.0;
+                       muse_recorder_msg_get_double(get_level, msg);
+                       cb_info->get_double_value[_RECORDER_GET_DOUBLE_AUDIO_LEVEL] = get_level;
+               }
+               break;
+       case MUSE_RECORDER_API_GET_FILENAME:
+               {
+                       char get_filename[MUSE_RECORDER_MSG_MAX_LENGTH] = {'\0',};
+                       muse_recorder_msg_get_string(get_filename, msg);
+                       if (cb_info->get_filename) {
+                               free(cb_info->get_filename);
+                               cb_info->get_filename = NULL;
                        }
+                       cb_info->get_filename = strdup(get_filename);
                }
+               break;
+       default:
+               break;
+       }
 
-               g_list_free(cb_info->idle_event_list);
-               cb_info->idle_event_list = NULL;
+       return;
+}
+
+
+static void __recorder_process_msg(recorder_cb_info_s *cb_info, char *msg, int tfd)
+{
+       int ret = RECORDER_ERROR_NONE;
+       int api = -1;
+       int api_class = -1;
+       int event = -1;
+       int event_class = -1;
+
+       if (!cb_info || !msg) {
+               LOGE("invalid ptr %p %p", cb_info, msg);
+               return;
+       }
+
+       /*LOGD("msg [%s]", msg);*/
+
+       if (!muse_recorder_msg_get(api, msg)) {
+               LOGE("failed to get recorder api");
+               return;
        }
 
-       g_mutex_unlock(&cb_info->idle_event_mutex);
+       if (api == MUSE_RECORDER_CB_EVENT) {
+               if (!muse_recorder_msg_get(event, msg) ||
+                       !muse_recorder_msg_get(event_class, msg)) {
+                       LOGE("failed to get event or event_class [%s]", msg);
+                       return;
+               }
+       } else {
+               if (!muse_recorder_msg_get(api_class, msg)) {
+                       LOGE("failed to get api_class [%s]", msg);
+                       return;
+               }
+       }
+
+       if (api_class == MUSE_RECORDER_API_CLASS_IMMEDIATE) {
+               if (api >= MUSE_RECORDER_API_MAX) {
+                       LOGE("invalid api %d", api);
+                       return;
+               }
+
+               if (!muse_recorder_msg_get(ret, msg)) {
+                       LOGE("failed to get recorder ret");
+                       return;
+               }
+
+               g_mutex_lock(&cb_info->api_mutex[api]);
+
+               if (api == MUSE_RECORDER_API_GET_DEVICE_STATE) {
+                       g_atomic_int_set(&cb_info->msg_recv_running, 0);
+                       LOGD("get device state done. close client cb handler");
+               } else {
+                       switch (api) {
+                       case MUSE_RECORDER_API_CREATE:
+                               if (ret != RECORDER_ERROR_NONE) {
+                                       g_atomic_int_set(&cb_info->msg_recv_running, 0);
+                                       LOGE("create error 0x%x. closing..", ret);
+                               }
+                               break;
+                       case MUSE_RECORDER_API_DESTROY:
+                               if (ret == RECORDER_ERROR_NONE) {
+                                       g_atomic_int_set(&cb_info->msg_recv_running, 0);
+                                       LOGD("destroy done. closing..");
+                               }
+                               break;
+                       default:
+                               __recorder_get_api_operation(api, cb_info, msg);
+                               break;
+                       }
+               }
+
+               if (cb_info->api_waiting[api] > 0) {
+                       cb_info->api_ret[api] = ret;
+                       cb_info->api_activating[api] = TRUE;
+
+                       g_cond_signal(&cb_info->api_cond[api]);
+               } else {
+                       LOGE("no waiting for api [%d]", api);
+               }
+
+               g_mutex_unlock(&cb_info->api_mutex[api]);
+       } else if (api_class == MUSE_RECORDER_API_CLASS_THREAD_SUB || api == MUSE_RECORDER_CB_EVENT) {
+               __recorder_add_msg_to_queue(cb_info, api, event, event_class, msg, tfd);
+       } else {
+               LOGW("unknown recorder api %d and api_class %d", api, api_class);
+       }
 
        return;
 }
@@ -389,93 +811,90 @@ static void _recorder_remove_idle_event_all(recorder_cb_info_s *cb_info)
 
 static void *_recorder_msg_handler_func(gpointer data)
 {
-       int ret = 0;
        int api = 0;
-       int event = 0;
-       int event_class = 0;
+       int type = 0;
        recorder_message_s *rec_msg = NULL;
        recorder_idle_event_s *rec_idle_event = NULL;
-       recorder_cb_info_s *cb_info = (recorder_cb_info_s *)data;
+       recorder_msg_handler_info_s *handler_info = (recorder_msg_handler_info_s *)data;
+       recorder_cb_info_s *cb_info = NULL;
 
-       if (cb_info == NULL) {
-               LOGE("cb_info NULL");
+       if (!handler_info || !handler_info->cb_info) {
+               LOGE("NULL handler %p", handler_info);
                return NULL;
        }
 
-       LOGD("start");
+       cb_info = (recorder_cb_info_s *)handler_info->cb_info;
+       type = handler_info->type;
+
+       LOGD("t:%d start", type);
 
-       g_mutex_lock(&cb_info->msg_handler_mutex);
+       g_mutex_lock(&handler_info->mutex);
 
-       while (g_atomic_int_get(&cb_info->msg_handler_running)) {
-               if (g_queue_is_empty(cb_info->msg_queue)) {
-                       LOGD("signal wait...");
-                       g_cond_wait(&cb_info->msg_handler_cond, &cb_info->msg_handler_mutex);
-                       LOGD("signal received");
+       while (g_atomic_int_get(&handler_info->running)) {
+               if (g_queue_is_empty(handler_info->queue)) {
+                       /*LOGD("signal wait...");*/
+                       g_cond_wait(&handler_info->cond, &handler_info->mutex);
+                       /*LOGD("signal received");*/
 
-                       if (g_atomic_int_get(&cb_info->msg_handler_running) == 0) {
+                       if (g_atomic_int_get(&handler_info->running) == 0) {
                                LOGD("stop event thread");
                                break;
                        }
                }
 
-               rec_msg = (recorder_message_s *)g_queue_pop_head(cb_info->msg_queue);
-               g_mutex_unlock(&cb_info->msg_handler_mutex);
+               rec_msg = (recorder_message_s *)g_queue_pop_head(handler_info->queue);
+               g_mutex_unlock(&handler_info->mutex);
                if (rec_msg == NULL) {
                        LOGE("NULL message");
-                       g_mutex_lock(&cb_info->msg_handler_mutex);
+                       g_mutex_lock(&handler_info->mutex);
                        continue;
                }
+
                api = rec_msg->api;
+
                if (api < MUSE_RECORDER_API_MAX) {
+                       int ret = 0;
+
                        g_mutex_lock(&cb_info->api_mutex[api]);
+
                        if (muse_recorder_msg_get(ret, rec_msg->recv_msg)) {
-                               cb_info->api_ret[api] = ret;
-                               cb_info->api_activating[api] = 1;
+                               if (cb_info->api_waiting[api] > 0) {
+                                       cb_info->api_ret[api] = ret;
+                                       cb_info->api_activating[api] = TRUE;
 
-                               LOGD("recorder api %d - return 0x%x", ret);
+                                       /*LOGD("recorder api %d - return 0x%x", api, ret);*/
 
-                               g_cond_signal(&cb_info->api_cond[api]);
+                                       g_cond_signal(&cb_info->api_cond[api]);
+                               } else {
+                                       LOGE("no waiting for api [%d]", api);
+                               }
                        } else {
-                               LOGE("failed to get ret for api %d, msg %s", rec_msg->api, rec_msg->recv_msg);
+                               LOGE("t:%d failed to get ret for api %d, msg %s", type, api, rec_msg->recv_msg);
                        }
 
                        g_mutex_unlock(&cb_info->api_mutex[api]);
                } else if (api == MUSE_RECORDER_CB_EVENT) {
-                       event = -1;
-                       event_class = -1;
-
-                       if (!muse_recorder_msg_get(event, rec_msg->recv_msg) ||
-                           !muse_recorder_msg_get(event_class, rec_msg->recv_msg)) {
-                               LOGE("failed to get recorder event %d, class %d", event, event_class);
-
-                               g_free(rec_msg);
-                               rec_msg = NULL;
-
-                               g_mutex_lock(&cb_info->msg_handler_mutex);
-                               continue;
-                       }
-
-                       switch (event_class) {
+                       switch (rec_msg->event_class) {
                        case MUSE_RECORDER_EVENT_CLASS_THREAD_SUB:
-                               _client_user_callback(cb_info, rec_msg->recv_msg, event);
+                               _recorder_client_user_callback(cb_info, rec_msg->recv_msg, rec_msg->event, rec_msg->tfd);
                                break;
                        case MUSE_RECORDER_EVENT_CLASS_THREAD_MAIN:
                                rec_idle_event = g_new0(recorder_idle_event_s, 1);
                                if (rec_idle_event == NULL) {
-                                       LOGE("rec_idle_event alloc failed");
+                                       LOGE("event alloc failed");
                                        break;
                                }
 
-                               rec_idle_event->event = event;
+                               rec_idle_event->event = rec_msg->event;
                                rec_idle_event->cb_info = cb_info;
-                               g_mutex_init(&rec_idle_event->event_mutex);
-                               memcpy(rec_idle_event->recv_msg, rec_msg->recv_msg, sizeof(rec_idle_event->recv_msg));
 
-                               LOGD("add recorder event[%d, %p] to IDLE", event, rec_idle_event);
+                               strncpy(rec_idle_event->recv_msg, rec_msg->recv_msg, sizeof(rec_idle_event->recv_msg));
 
-                               g_mutex_lock(&cb_info->idle_event_mutex);
+                               /*LOGD("add recorder event[%d, %p] to IDLE", rec_msg->event, rec_idle_event);*/
+
+                               g_mutex_lock(&g_rec_idle_event_lock);
                                cb_info->idle_event_list = g_list_append(cb_info->idle_event_list, (gpointer)rec_idle_event);
-                               g_mutex_unlock(&cb_info->idle_event_mutex);
+                               g_mutex_unlock(&g_rec_idle_event_lock);
 
                                g_idle_add_full(G_PRIORITY_DEFAULT,
                                        (GSourceFunc)_recorder_idle_event_callback,
@@ -483,32 +902,32 @@ static void *_recorder_msg_handler_func(gpointer data)
                                        NULL);
                                break;
                        default:
-                               LOGE("unknown recorder event class %d", event_class);
+                               LOGE("unknown event class %d", rec_msg->event_class);
                                break;
                        }
                } else {
-                       LOGE("unknown recorder api[%d] message", api);
+                       LOGE("unknown api[%d] message", api);
                }
 
                g_free(rec_msg);
                rec_msg = NULL;
 
-               g_mutex_lock(&cb_info->msg_handler_mutex);
+               g_mutex_lock(&handler_info->mutex);
        }
 
        /* remove remained event */
-       while (!g_queue_is_empty(cb_info->msg_queue)) {
-               rec_msg = (recorder_message_s *)g_queue_pop_head(cb_info->msg_queue);
+       while (!g_queue_is_empty(handler_info->queue)) {
+               rec_msg = (recorder_message_s *)g_queue_pop_head(handler_info->queue);
                if (rec_msg) {
-                       LOGD("remove recorder message %p", rec_msg);
+                       LOGD("remove message %p", rec_msg);
                        free(rec_msg);
                        rec_msg = NULL;
                } else {
-                       LOGW("NULL recorder message");
+                       LOGW("NULL message");
                }
        }
 
-       g_mutex_unlock(&cb_info->msg_handler_mutex);
+       g_mutex_unlock(&handler_info->mutex);
 
        LOGD("return");
 
@@ -518,15 +937,9 @@ static void *_recorder_msg_handler_func(gpointer data)
 
 static void *_recorder_msg_recv_func(gpointer data)
 {
-       int i = 0;
-       int ret = 0;
-       int api = 0;
-       int api_class = 0;
-       int num_token = 0;
-       int str_pos = 0;
-       int prev_pos = 0;
+       int recv_length = 0;
+       int tfd[MUSE_NUM_FD] = {-1, -1, -1, -1};
        char *recv_msg = NULL;
-       char **parse_str = NULL;
        recorder_cb_info_s *cb_info = (recorder_cb_info_s *)data;
 
        if (cb_info == NULL) {
@@ -536,144 +949,152 @@ static void *_recorder_msg_recv_func(gpointer data)
 
        LOGD("start");
 
-       parse_str = (char **)malloc(sizeof(char *) * RECORDER_PARSE_STRING_SIZE);
-       if (parse_str == NULL) {
-               LOGE("parse_str malloc failed");
-               return NULL;
-       }
-
-       for (i = 0 ; i < RECORDER_PARSE_STRING_SIZE ; i++) {
-               parse_str[i] = (char *)malloc(sizeof(char) * MUSE_RECORDER_MSG_MAX_LENGTH);
-               if (parse_str[i] == NULL) {
-                       LOGE("parse_str[%d] malloc failed", i);
-                       goto CB_HANDLER_EXIT;
-               }
-       }
-
        recv_msg = cb_info->recv_msg;
 
        while (g_atomic_int_get(&cb_info->msg_recv_running)) {
-               ret = muse_core_ipc_recv_msg(cb_info->fd, recv_msg);
-               if (ret <= 0)
+               /* tfd[0] is only used. */
+               tfd[0] = -1;
+
+               recv_length = muse_core_msg_recv_fd(cb_info->fd, recv_msg, MUSE_MSG_MAX_LENGTH, tfd);
+               if (recv_length <= 0) {
+//LCOV_EXCL_START
+                       cb_info->is_server_connected = FALSE;
+                       LOGE("receive msg failed - server disconnected");
                        break;
-               recv_msg[ret] = '\0';
-
-               str_pos = 0;
-               prev_pos = 0;
-               num_token = 0;
-
-               /*LOGD("recvMSg : %s, length : %d", recv_msg, ret);*/
-
-               /* Need to split the combined entering msgs.
-                   This module supports up to 200 combined msgs. */
-               for (str_pos = 0; str_pos < ret; str_pos++) {
-                       if (recv_msg[str_pos] == '}') {
-                               memset(parse_str[num_token], 0x0, sizeof(char) * MUSE_RECORDER_MSG_MAX_LENGTH);
-                               strncpy(parse_str[num_token], recv_msg + prev_pos, str_pos - prev_pos + 1);
-                               LOGD("splitted msg : [%s], Index : %d", parse_str[num_token], num_token);
-                               prev_pos = str_pos+1;
-                               num_token++;
-                       }
+//LCOV_EXCL_STOP
                }
 
-               /*LOGD("num_token : %d", num_token);*/
-
-               /* Re-construct to the useful single msg. */
-               for (i = 0; i < num_token; i++) {
-                       if (i >= RECORDER_PARSE_STRING_SIZE) {
-                               LOGE("invalid token index %d", i);
-                               break;
-                       }
-
-                       api = -1;
-                       api_class = -1;
+               recv_msg[recv_length] = '\0';
 
-                       if (!muse_recorder_msg_get(api, parse_str[i])) {
-                               LOGE("failed to get recorder api");
-                               continue;
-                       }
+               /*LOGD("recv msg : %s, length : %d", recv_msg, recv_length);*/
 
-                       if (api != MUSE_RECORDER_CB_EVENT) {
-                               LOGD("check api_class");
-                               if (muse_recorder_msg_get(api_class, parse_str[i]))
-                                       LOGD("recorder api_class[%d]", api_class);
-                       }
+               __recorder_process_msg(cb_info, recv_msg, tfd[0]);
+       }
 
-                       if (api_class == MUSE_RECORDER_API_CLASS_IMMEDIATE) {
-                               g_mutex_lock(&cb_info->api_mutex[api]);
+       LOGD("client cb exit - server connected %d", cb_info->is_server_connected);
 
-                               if (!muse_recorder_msg_get(ret, parse_str[i])) {
-                                       LOGE("failed to get recorder ret");
-                                       g_mutex_unlock(&cb_info->api_mutex[api]);
-                                       continue;
-                               }
+       if (!cb_info->is_server_connected) {
+//LCOV_EXCL_START
+               /* send error msg for server disconnection */
+               char *error_msg = muse_core_msg_new(MUSE_RECORDER_CB_EVENT,
+                       MUSE_TYPE_INT, "error", RECORDER_ERROR_SERVICE_DISCONNECTED,
+                       MUSE_TYPE_INT, "current_state", RECORDER_STATE_NONE,
+                       NULL);
 
-                               cb_info->api_ret[api] = ret;
-                               cb_info->api_activating[api] = 1;
-
-                               if (api == MUSE_RECORDER_API_CREATE) {
-                                       if (ret != RECORDER_ERROR_NONE) {
-                                               g_atomic_int_set(&cb_info->msg_recv_running, 0);
-                                               LOGE("recorder create error 0x%x. close client cb handler", ret);
-                                       }
-                               } else if (api == MUSE_RECORDER_API_DESTROY) {
-                                       if (ret == RECORDER_ERROR_NONE) {
-                                               g_atomic_int_set(&cb_info->msg_recv_running, 0);
-                                               LOGD("recorder destroy done. close client cb handler");
-                                       }
-                               }
+               if (!error_msg) {
+                       LOGE("error_msg failed");
+                       goto CB_HANDLER_EXIT;
+               }
 
-                               g_cond_signal(&cb_info->api_cond[api]);
-                               g_mutex_unlock(&cb_info->api_mutex[api]);
-                       } else if (api_class == MUSE_RECORDER_API_CLASS_THREAD_SUB ||
-                                       api == MUSE_RECORDER_CB_EVENT) {
-                               recorder_message_s *rec_msg = g_new0(recorder_message_s, 1);
-                               if (rec_msg == NULL) {
-                                       LOGE("failed to alloc rec_msg");
-                                       continue;
-                               }
+               LOGE("add error msg for service disconnection done");
 
-                               rec_msg->api = api;
-                               memcpy(rec_msg->recv_msg, parse_str[i], sizeof(rec_msg->recv_msg));
+               __recorder_add_msg_to_queue(cb_info,
+                       MUSE_RECORDER_CB_EVENT,
+                       MUSE_RECORDER_EVENT_TYPE_ERROR,
+                       MUSE_RECORDER_EVENT_CLASS_THREAD_MAIN,
+                       error_msg,
+                       -1);
 
-                               LOGD("add recorder message to queue : api %d", api);
+               muse_core_msg_free(error_msg);
+               error_msg = NULL;
 
-                               g_mutex_lock(&cb_info->msg_handler_mutex);
-                               g_queue_push_tail(cb_info->msg_queue, (gpointer)rec_msg);
-                               g_cond_signal(&cb_info->msg_handler_cond);
-                               g_mutex_unlock(&cb_info->msg_handler_mutex);
-                       } else {
-                               LOGW("unknown recorder api %d and api_class %d", api, api_class);
-                       }
-               }
+               LOGE("add error msg for service disconnection done");
+//LCOV_EXCL_STOP
        }
 
-       LOGD("client cb exit");
-
 CB_HANDLER_EXIT:
-       if (parse_str) {
-               for (i = 0 ; i < RECORDER_PARSE_STRING_SIZE ; i++) {
-                       if (parse_str[i]) {
-                               free(parse_str[i]);
-                               parse_str[i] = NULL;
-                       }
-               }
-
-               free(parse_str);
-               parse_str = NULL;
-       }
-
        return NULL;
 }
 
-static recorder_cb_info_s *_client_callback_new(gint sockfd)
-{
-       recorder_cb_info_s *cb_info = NULL;
-       gint *tmp_activating = NULL;
-       gint *tmp_ret = NULL;
-       gint i = 0;
 
-       g_return_val_if_fail(sockfd > 0, NULL);
+static bool __create_msg_handler_thread(recorder_msg_handler_info_s *handler_info,
+       int type, const char *thread_name, recorder_cb_info_s *cb_info)
+{
+       if (!handler_info || !thread_name || !cb_info) {
+               LOGE("t:%d NULL %p %p %p",
+                       type, handler_info, thread_name, cb_info);
+               return false;
+       }
+
+       LOGD("t:%d", type);
+
+       handler_info->type = type;
+       handler_info->queue = g_queue_new();
+       if (handler_info->queue == NULL) {
+               LOGE("t:%d queue failed", type);
+               return false;
+       }
+
+       g_mutex_init(&handler_info->mutex);
+       g_cond_init(&handler_info->cond);
+
+       handler_info->cb_info = (void *)cb_info;
+       g_atomic_int_set(&handler_info->running, 1);
+
+       handler_info->thread = g_thread_try_new(thread_name,
+               _recorder_msg_handler_func, (gpointer)handler_info, NULL);
+       if (handler_info->thread == NULL) {
+//LCOV_EXCL_START
+               LOGE("t:%d thread failed", type);
+
+               g_mutex_clear(&handler_info->mutex);
+               g_cond_clear(&handler_info->cond);
+               g_queue_free(handler_info->queue);
+               handler_info->queue = NULL;
+
+               return false;
+//LCOV_EXCL_STOP
+       }
+
+       LOGD("t:%d done", type);
+
+       return true;
+}
+
+
+static void __destroy_msg_handler_thread(recorder_msg_handler_info_s *handler_info)
+{
+       int type = 0;
+
+       if (!handler_info) {
+               LOGE("NULL handler");
+               return;
+       }
+
+       if (!handler_info->thread) {
+               LOGW("thread is not created");
+               return;
+       }
+
+       type = handler_info->type;
+
+       LOGD("t:%d thread %p", type, handler_info->thread);
+
+       g_mutex_lock(&handler_info->mutex);
+       g_atomic_int_set(&handler_info->running, 0);
+       g_cond_signal(&handler_info->cond);
+       g_mutex_unlock(&handler_info->mutex);
+
+       g_thread_join(handler_info->thread);
+       handler_info->thread = NULL;
+
+       g_mutex_clear(&handler_info->mutex);
+       g_cond_clear(&handler_info->cond);
+       g_queue_free(handler_info->queue);
+       handler_info->queue = NULL;
+
+       LOGD("t:%d done", type);
+
+       return;
+}
+
+
+static recorder_cb_info_s *_recorder_client_callback_new(gint sockfd)
+{
+       recorder_cb_info_s *cb_info = NULL;
+       gint i = 0;
+
+       g_return_val_if_fail(sockfd > 0, NULL);
 
        cb_info = g_new0(recorder_cb_info_s, 1);
        if (cb_info == NULL) {
@@ -681,139 +1102,214 @@ static recorder_cb_info_s *_client_callback_new(gint sockfd)
                goto ErrorExit;
        }
 
-       g_mutex_init(&cb_info->msg_handler_mutex);
-       g_cond_init(&cb_info->msg_handler_cond);
-       g_mutex_init(&cb_info->idle_event_mutex);
-       g_cond_init(&cb_info->idle_event_cond);
+       cb_info->api_waiting[MUSE_RECORDER_API_CREATE] = 1;
 
        for (i = 0 ; i < MUSE_RECORDER_API_MAX ; i++) {
                g_mutex_init(&cb_info->api_mutex[i]);
                g_cond_init(&cb_info->api_cond[i]);
        }
 
-       tmp_activating = g_new0(gint, MUSE_RECORDER_API_MAX);
-       if (tmp_activating == NULL) {
-               LOGE("tmp_activating failed");
-               goto ErrorExit;
-       }
+       for (i = 0 ; i < MUSE_RECORDER_EVENT_TYPE_NUM ; i++)
+               g_mutex_init(&cb_info->user_cb_mutex[i]);
 
-       tmp_ret = g_new0(gint, MUSE_RECORDER_API_MAX);
-       if (tmp_ret == NULL) {
-               LOGE("tmp_ret failed");
+       /* message handler thread */
+       if (!__create_msg_handler_thread(&cb_info->msg_handler_info,
+               _RECORDER_MESSAGE_HANDLER_TYPE_GENERAL, "recorder_msg_handler", cb_info)) {
+               LOGE("msg_handler_info failed");
                goto ErrorExit;
        }
 
-       cb_info->msg_queue = g_queue_new();
-       if (cb_info->msg_queue == NULL) {
-               LOGE("msg_queue new failed");
+       /* message handler thread for audio stream callback */
+       if (!__create_msg_handler_thread(&cb_info->audio_stream_cb_info,
+               _RECORDER_MESSAGE_HANDLER_TYPE_AUDIO_STREAM_CB, "recorder_msg_handler:audio_stream_cb", cb_info)) {
+               LOGE("audio_stream_cb_info failed");
                goto ErrorExit;
        }
 
-       g_atomic_int_set(&cb_info->msg_handler_running, 1);
-       cb_info->msg_handler_thread = g_thread_try_new("recorder_msg_handler",
-               _recorder_msg_handler_func,
-               (gpointer)cb_info,
-               NULL);
-       if (cb_info->msg_handler_thread == NULL) {
-               LOGE("message handler thread creation failed");
+       /* message handler thread for muxed stream callback */
+       if (!__create_msg_handler_thread(&cb_info->muxed_stream_cb_info,
+               _RECORDER_MESSAGE_HANDLER_TYPE_MUXED_STREAM_CB, "recorder_msg_handler:muxed_stream_cb", cb_info)) {
+               LOGE("muxed_stream_cb_info failed");
                goto ErrorExit;
        }
 
        cb_info->fd = sockfd;
-       cb_info->api_activating = tmp_activating;
-       cb_info->api_ret = tmp_ret;
 
+       /* message receive thread */
        g_atomic_int_set(&cb_info->msg_recv_running, 1);
        cb_info->msg_recv_thread = g_thread_try_new("recorder_msg_recv",
-               _recorder_msg_recv_func,
-               (gpointer)cb_info,
-               NULL);
+               _recorder_msg_recv_func, (gpointer)cb_info, NULL);
        if (cb_info->msg_recv_thread == NULL) {
                LOGE("message receive thread creation failed");
                goto ErrorExit;
        }
 
-       return cb_info;
-
+       cb_info->is_server_connected = TRUE;
 
+       return cb_info;
+//LCOV_EXCL_START
 ErrorExit:
        if (cb_info) {
-               if (cb_info->msg_handler_thread) {
-                       g_mutex_lock(&cb_info->msg_handler_mutex);
-                       g_atomic_int_set(&cb_info->msg_handler_running, 0);
-                       g_cond_signal(&cb_info->msg_handler_cond);
-                       g_mutex_unlock(&cb_info->msg_handler_mutex);
+               __destroy_msg_handler_thread(&cb_info->msg_handler_info);
+               __destroy_msg_handler_thread(&cb_info->audio_stream_cb_info);
+               __destroy_msg_handler_thread(&cb_info->muxed_stream_cb_info);
 
-                       g_thread_join(cb_info->msg_handler_thread);
-                       g_thread_unref(cb_info->msg_handler_thread);
-                       cb_info->msg_handler_thread = NULL;
-               }
+               for (i = 0 ; i < MUSE_RECORDER_EVENT_TYPE_NUM ; i++)
+                       g_mutex_clear(&cb_info->user_cb_mutex[i]);
 
                for (i = 0 ; i < MUSE_RECORDER_API_MAX ; i++) {
                        g_mutex_clear(&cb_info->api_mutex[i]);
                        g_cond_clear(&cb_info->api_cond[i]);
                }
 
-               g_mutex_clear(&cb_info->msg_handler_mutex);
-               g_cond_clear(&cb_info->msg_handler_cond);
-               g_mutex_clear(&cb_info->idle_event_mutex);
-               g_cond_clear(&cb_info->idle_event_cond);
-
-               if (cb_info->msg_queue) {
-                       g_queue_free(cb_info->msg_queue);
-                       cb_info->msg_queue = NULL;
-               }
-
                g_free(cb_info);
                cb_info = NULL;
        }
 
-       if (tmp_activating) {
-               g_free(tmp_activating);
-               tmp_activating = NULL;
-       }
-       if (tmp_ret) {
-               g_free(tmp_ret);
-               tmp_ret = NULL;
-       }
-
        return NULL;
+//LCOV_EXCL_STOP
 }
 
-static int client_wait_for_cb_return(muse_recorder_api_e api, recorder_cb_info_s *cb_info, int time_out)
+static int _recorder_client_wait_for_cb_return(muse_recorder_api_e api, recorder_cb_info_s *cb_info, int time_out)
 {
        int ret = RECORDER_ERROR_NONE;
        gint64 end_time;
 
-       LOGD("Enter api : %d", api);
+       /*LOGD("Enter api : %d", api);*/
+
+       if (!cb_info->is_server_connected) {
+               LOGE("server is disconnected");
+               return RECORDER_ERROR_SERVICE_DISCONNECTED;
+       }
 
        g_mutex_lock(&(cb_info->api_mutex[api]));
 
-       if (cb_info->api_activating[api] == 0) {
-               end_time = g_get_monotonic_time() + time_out * G_TIME_SPAN_SECOND;
-               if (g_cond_wait_until(&(cb_info->api_cond[api]), &(cb_info->api_mutex[api]), end_time)) {
-                       ret = cb_info->api_ret[api];
-                       cb_info->api_activating[api] = 0;
+       LOGD("api [%d], timeout [%d sec]", api, time_out);
 
-                       LOGD("return value : 0x%x", ret);
-               } else {
-                       ret = RECORDER_ERROR_INVALID_OPERATION;
+       end_time = g_get_monotonic_time() + time_out * G_TIME_SPAN_SECOND;
 
+       while (!cb_info->api_activating[api]) {
+               if (time_out == RECORDER_CB_NO_TIMEOUT) {
+                       g_cond_wait(&(cb_info->api_cond[api]), &(cb_info->api_mutex[api]));
+                       LOGW("api %d returned 0x%x", api, cb_info->api_ret[api]);
+               } else if (!g_cond_wait_until(&(cb_info->api_cond[api]), &(cb_info->api_mutex[api]), end_time)) {
                        LOGE("api %d was TIMED OUT!", api);
+                       ret = RECORDER_ERROR_INVALID_OPERATION;
+                       goto _CB_RETURN_END;
                }
-       } else {
-               ret = cb_info->api_ret[api];
-               cb_info->api_activating[api] = 0;
 
-               LOGD("condition is already checked for the api[%d], return[0x%x]", api, ret);
+               if (!cb_info->api_activating[api])
+                       LOGW("invalid signal received, wait again...");
        }
 
+       ret = cb_info->api_ret[api];
+       cb_info->api_activating[api] = FALSE;
+
+_CB_RETURN_END:
        g_mutex_unlock(&(cb_info->api_mutex[api]));
 
+       if (ret != RECORDER_ERROR_NONE)
+               LOGE("ERROR : api %d - ret 0x%x", api, ret);
+
        return ret;
 }
 
-static void _client_callback_destroy(recorder_cb_info_s *cb_info)
+
+static int _recorder_msg_send(int api, recorder_cb_info_s *cb_info, int *ret, int timeout)
+{
+       int send_ret = 0;
+       char *msg = NULL;
+
+       if (!cb_info || !ret) {
+               LOGE("invalid pointer for api %d - %p %p", api, cb_info, ret);
+               return RECORDER_ERROR_INVALID_PARAMETER;
+       }
+
+       msg = muse_core_msg_new(api, NULL);
+       if (!msg) {
+               LOGE("msg creation failed: api %d", api);
+               return RECORDER_ERROR_OUT_OF_MEMORY;
+       }
+
+       /*LOGD("send msg %s", msg);*/
+
+       if (cb_info->is_server_connected) {
+               __recorder_update_api_waiting(cb_info, api, 1);
+               send_ret = muse_core_msg_send(cb_info->fd, msg);
+       }
+
+       if (send_ret < 0) {
+               LOGE("message send failed");
+               *ret = RECORDER_ERROR_INVALID_OPERATION;
+       } else {
+               *ret = _recorder_client_wait_for_cb_return(api, cb_info, timeout);
+       }
+
+       __recorder_update_api_waiting(cb_info, api, -1);
+
+       muse_core_msg_free(msg);
+
+       return RECORDER_ERROR_NONE;
+}
+
+
+static int _recorder_msg_send_param1(int api, recorder_cb_info_s *cb_info, int *ret, recorder_msg_param *param)
+{
+       int send_ret = 0;
+       char *msg = NULL;
+
+       if (!cb_info || !ret || !param) {
+               LOGE("invalid pointer for api %d - %p %p %p", api, cb_info, ret, param);
+               return RECORDER_ERROR_INVALID_PARAMETER;
+       }
+
+       /*LOGD("type %d, name %s", param->type, param->name);*/
+
+       switch (param->type) {
+       case MUSE_TYPE_INT:
+               msg = muse_core_msg_new(api, param->type, param->name, param->value.value_INT, NULL);
+               break;
+       case MUSE_TYPE_DOUBLE:
+               msg = muse_core_msg_new(api, param->type, param->name, param->value.value_DOUBLE, NULL);
+               break;
+       case MUSE_TYPE_STRING:
+               msg = muse_core_msg_new(api, param->type, param->name, param->value.value_STRING, NULL);
+               break;
+       default:
+               LOGE("unknown type %d", param->type);
+               break;
+       }
+
+       if (!msg) {
+               LOGE("msg creation failed: api %d, type %d, param name %s",
+                       api, param->type, param->name);
+               return RECORDER_ERROR_OUT_OF_MEMORY;
+       }
+
+       /*LOGD("send msg %s", msg);*/
+
+       if (cb_info->is_server_connected) {
+               __recorder_update_api_waiting(cb_info, api, 1);
+
+               send_ret = muse_core_msg_send(cb_info->fd, msg);
+       }
+
+       if (send_ret < 0) {
+               LOGE("message send failed");
+               *ret = RECORDER_ERROR_INVALID_OPERATION;
+       } else {
+               *ret = _recorder_client_wait_for_cb_return(api, cb_info, RECORDER_CB_TIMEOUT);
+       }
+
+       __recorder_update_api_waiting(cb_info, api, -1);
+
+       muse_core_msg_free(msg);
+
+       return RECORDER_ERROR_NONE;
+}
+
+
+static void _recorder_client_callback_destroy(recorder_cb_info_s *cb_info)
 {
        gint i = 0;
 
@@ -822,36 +1318,24 @@ static void _client_callback_destroy(recorder_cb_info_s *cb_info)
        LOGD("MSG receive thread[%p] destroy", cb_info->msg_recv_thread);
 
        g_thread_join(cb_info->msg_recv_thread);
-       g_thread_unref(cb_info->msg_recv_thread);
        cb_info->msg_recv_thread = NULL;
 
-       LOGD("msg thread removed");
-
-       g_mutex_lock(&cb_info->msg_handler_mutex);
-       g_atomic_int_set(&cb_info->msg_handler_running, 0);
-       g_cond_signal(&cb_info->msg_handler_cond);
-       g_mutex_unlock(&cb_info->msg_handler_mutex);
+       LOGD("msg_recv thread removed");
 
-       g_thread_join(cb_info->msg_handler_thread);
-       g_thread_unref(cb_info->msg_handler_thread);
-       cb_info->msg_handler_thread = NULL;
+       __destroy_msg_handler_thread(&cb_info->msg_handler_info);
+       __destroy_msg_handler_thread(&cb_info->audio_stream_cb_info);
+       __destroy_msg_handler_thread(&cb_info->muxed_stream_cb_info);
 
-       g_queue_free(cb_info->msg_queue);
-       cb_info->msg_queue = NULL;
-       g_mutex_clear(&cb_info->msg_handler_mutex);
-       g_cond_clear(&cb_info->msg_handler_cond);
-       g_mutex_clear(&cb_info->idle_event_mutex);
-       g_cond_clear(&cb_info->idle_event_cond);
+       for (i = 0 ; i < MUSE_RECORDER_EVENT_TYPE_NUM ; i++)
+               g_mutex_clear(&cb_info->user_cb_mutex[i]);
 
        for (i = 0 ; i < MUSE_RECORDER_API_MAX ; i++) {
                g_mutex_clear(&cb_info->api_mutex[i]);
                g_cond_clear(&cb_info->api_cond[i]);
        }
 
-       LOGD("event thread removed");
-
        if (cb_info->fd > -1) {
-               muse_core_connection_close(cb_info->fd);
+               muse_client_close(cb_info->fd);
                cb_info->fd = -1;
        }
 
@@ -859,13 +1343,9 @@ static void _client_callback_destroy(recorder_cb_info_s *cb_info)
                tbm_bufmgr_deinit(cb_info->bufmgr);
                cb_info->bufmgr = NULL;
        }
-       if (cb_info->api_activating) {
-               g_free(cb_info->api_activating);
-               cb_info->api_activating = NULL;
-       }
-       if (cb_info->api_ret) {
-               g_free(cb_info->api_ret);
-               cb_info->api_ret = NULL;
+       if (cb_info->get_filename) {
+               free(cb_info->get_filename);
+               cb_info->get_filename = NULL;
        }
 
        g_free(cb_info);
@@ -874,13 +1354,14 @@ static void _client_callback_destroy(recorder_cb_info_s *cb_info)
        return;
 }
 
-static int _recorder_storage_device_supported_cb(int storage_id, storage_type_e type, storage_state_e state, const char *path, void *user_data)
+
+static bool _recorder_storage_device_supported_cb(int storage_id, storage_type_e type, storage_state_e state, const char *path, void *user_data)
 {
        char **root_directory = (char **)user_data;
 
        if (root_directory == NULL) {
                LOGE("user data is NULL");
-               return FALSE;
+               return false;
        }
 
        LOGD("storage id %d, type %d, state %d, path %s",
@@ -895,16 +1376,16 @@ static int _recorder_storage_device_supported_cb(int storage_id, storage_type_e
                *root_directory = strdup(path);
                if (*root_directory) {
                        LOGD("get root directory %s", *root_directory);
-                       return FALSE;
+                       return false;
                } else {
-                       LOGE("strdup %s failed");
+                       LOGE("strdup %s failed", path);
                }
        }
 
-       return TRUE;
+       return true;
 }
 
-static int _client_get_root_directory(char **root_directory)
+static int _recorder_client_get_root_directory(char **root_directory)
 {
        int ret = STORAGE_ERROR_NONE;
 
@@ -927,12 +1408,15 @@ static int _recorder_create_common(recorder_h *recorder, muse_recorder_type_e ty
        int ret = RECORDER_ERROR_NONE;
        int destroy_ret = RECORDER_ERROR_NONE;
        int sock_fd = -1;
+       int module_index = -1;
+       int send_ret = 0;
        char *send_msg = NULL;
        char *root_directory = NULL;
        intptr_t camera_handle = 0;
        intptr_t handle = 0;
        tbm_bufmgr bufmgr = NULL;
        recorder_cli_s *pc = NULL;
+       recorder_msg_param param;
 
        LOGD("Enter - type %d", type);
 
@@ -958,84 +1442,124 @@ static int _recorder_create_common(recorder_h *recorder, muse_recorder_type_e ty
                goto _ERR_RECORDER_EXIT;
        }
 
-       sock_fd = muse_core_client_new();
+       sock_fd = muse_client_new();
        if (sock_fd < 0) {
-               LOGE("muse_core_client_new failed - returned fd %d", sock_fd);
+//LCOV_EXCL_START
+               LOGE("muse_client_new failed - returned fd %d", sock_fd);
+               ret = RECORDER_ERROR_INVALID_OPERATION;
+               goto _ERR_RECORDER_EXIT;
+//LCOV_EXCL_STOP
+       }
+
+       if (muse_client_get_module_index(MODULE_NAME, &module_index) != MM_ERROR_NONE) {
+               LOGE("muse client get module index failed");
                ret = RECORDER_ERROR_INVALID_OPERATION;
                goto _ERR_RECORDER_EXIT;
        }
 
        if (type == MUSE_RECORDER_TYPE_AUDIO) {
-               send_msg = muse_core_msg_json_factory_new(MUSE_RECORDER_API_CREATE,
-                       MUSE_TYPE_INT, "module", MUSE_RECORDER,
+               send_msg = muse_core_msg_new(MUSE_RECORDER_API_CREATE,
+                       MUSE_TYPE_INT, "module", module_index,
                        MUSE_TYPE_INT, PARAM_RECORDER_TYPE, MUSE_RECORDER_TYPE_AUDIO,
                        MUSE_TYPE_INT, "pid", getpid(),
-                       0);
+                       NULL);
        } else {
                pc->camera = camera;
                camera_handle = (intptr_t)((camera_cli_s *)camera)->remote_handle;
-               send_msg = muse_core_msg_json_factory_new(MUSE_RECORDER_API_CREATE,
-                       MUSE_TYPE_INT, "module", MUSE_RECORDER,
+               send_msg = muse_core_msg_new(MUSE_RECORDER_API_CREATE,
+                       MUSE_TYPE_INT, "module", module_index,
                        MUSE_TYPE_INT, PARAM_RECORDER_TYPE, MUSE_RECORDER_TYPE_VIDEO,
+                       MUSE_TYPE_INT, "pid", getpid(),
                        MUSE_TYPE_POINTER, "camera_handle", camera_handle,
-                       0);
+                       NULL);
+       }
+
+       if (!send_msg) {
+//LCOV_EXCL_START
+               LOGE("NULL msg");
+               ret = RECORDER_ERROR_OUT_OF_MEMORY;
+               goto _ERR_RECORDER_EXIT;
+//LCOV_EXCL_STOP
        }
 
        LOGD("sock_fd : %d, msg : %s", sock_fd, send_msg);
 
-       muse_core_ipc_send_msg(sock_fd, send_msg);
-       muse_core_msg_json_factory_free(send_msg);
+       send_ret = muse_core_msg_send(sock_fd, send_msg);
+
+       muse_core_msg_free(send_msg);
+       send_msg = NULL;
+
+       if (send_ret < 0) {
+//LCOV_EXCL_START
+               LOGE("send msg failed %d", errno);
+               ret = RECORDER_ERROR_INVALID_OPERATION;
+               goto _ERR_RECORDER_EXIT;
+//LCOV_EXCL_STOP
+       }
 
-       pc->cb_info = _client_callback_new(sock_fd);
+       pc->cb_info = _recorder_client_callback_new(sock_fd);
        if (pc->cb_info == NULL) {
                ret = RECORDER_ERROR_OUT_OF_MEMORY;
                goto _ERR_RECORDER_EXIT;
        }
 
-       ret = client_wait_for_cb_return(MUSE_RECORDER_API_CREATE, pc->cb_info, RECORDER_CALLBACK_TIME_OUT);
-       if (ret == RECORDER_ERROR_NONE) {
-               muse_recorder_msg_get_pointer(handle, pc->cb_info->recv_msg);
-               if (handle == 0) {
-                       LOGE("Receiving Handle Failed!!");
-                       goto _ERR_RECORDER_EXIT;
-               }
+       sock_fd = -1;
 
-               if (!_client_get_root_directory(&root_directory) || root_directory == NULL) {
-                       LOGE("failed to get root directory of internal storage");
-                       ret = RECORDER_ERROR_INVALID_OPERATION;
-                       goto _ERR_RECORDER_AFTER_CREATE;
-               }
+       ret = _recorder_client_wait_for_cb_return(MUSE_RECORDER_API_CREATE, pc->cb_info, RECORDER_CB_TIMEOUT);
 
-               LOGD("set root directory [%s]", root_directory);
+       pc->cb_info->api_waiting[MUSE_RECORDER_API_CREATE] = 0;
 
-               muse_recorder_msg_send1(MUSE_RECORDER_API_ATTR_SET_ROOT_DIRECTORY,
-                       sock_fd, pc->cb_info, ret, STRING, root_directory);
-               if (ret != RECORDER_ERROR_NONE) {
-                       LOGE("failed to set root directory %s", root_directory);
-                       ret = RECORDER_ERROR_INVALID_OPERATION;
-                       goto _ERR_RECORDER_AFTER_CREATE;
-               }
+       if (ret != RECORDER_ERROR_NONE) {
+               LOGE("API_CREATE failed 0x%x", ret);
+               goto _ERR_RECORDER_EXIT;
+       }
 
-               free(root_directory);
-               root_directory = NULL;
+       muse_recorder_msg_get_pointer(handle, pc->cb_info->recv_msg);
+       if (handle == 0) {
+//LCOV_EXCL_START
+               LOGE("Receiving Handle Failed!!");
+               ret = RECORDER_ERROR_INVALID_OPERATION;
+               goto _ERR_RECORDER_AFTER_CREATE;
+//LCOV_EXCL_STOP
+       }
+
+       if (!_recorder_client_get_root_directory(&root_directory) || root_directory == NULL) {
+//LCOV_EXCL_START
+               LOGE("failed to get root directory of internal storage");
+               ret = RECORDER_ERROR_INVALID_OPERATION;
+               goto _ERR_RECORDER_AFTER_CREATE;
+//LCOV_EXCL_STOP
+       }
 
-               pc->remote_handle = handle;
-               pc->cb_info->bufmgr = bufmgr;
+       LOGD("root directory [%s]", root_directory);
 
-               LOGD("recorder[type %d] %p create success : remote handle 0x%x",
-                    type, pc, pc->remote_handle);
+       RECORDER_MSG_PARAM_SET(param, STRING, root_directory);
 
-               *recorder = (recorder_h) pc;
-       } else {
-               goto _ERR_RECORDER_EXIT;
+       _recorder_msg_send_param1(MUSE_RECORDER_API_ATTR_SET_ROOT_DIRECTORY, pc->cb_info, &ret, &param);
+
+       if (ret != RECORDER_ERROR_NONE) {
+               LOGE("failed to set root directory %s", root_directory);
+               ret = RECORDER_ERROR_INVALID_OPERATION;
+               goto _ERR_RECORDER_AFTER_CREATE;
        }
 
+       free(root_directory);
+       root_directory = NULL;
+
+       pc->remote_handle = handle;
+       pc->cb_info->bufmgr = bufmgr;
+
+       LOGD("recorder[type %d] %p create success : remote handle 0x%td",
+               type, pc, pc->remote_handle);
+
+       *recorder = (recorder_h)pc;
+
        LOGD("done");
 
        return RECORDER_ERROR_NONE;
-
+//LCOV_EXCL_START
 _ERR_RECORDER_AFTER_CREATE:
-       muse_recorder_msg_send(MUSE_RECORDER_API_DESTROY, sock_fd, pc->cb_info, destroy_ret);
+       _recorder_msg_send(MUSE_RECORDER_API_DESTROY, pc->cb_info, &destroy_ret, RECORDER_CB_TIMEOUT);
        LOGE("destroy return 0x%x", destroy_ret);
 
 _ERR_RECORDER_EXIT:
@@ -1047,9 +1571,14 @@ _ERR_RECORDER_EXIT:
                root_directory = NULL;
        }
 
+       if (sock_fd > -1) {
+               muse_client_close(sock_fd);
+               sock_fd = -1;
+       }
+
        if (pc) {
                if (pc->cb_info) {
-                       _client_callback_destroy(pc->cb_info);
+                       _recorder_client_callback_destroy(pc->cb_info);
                        pc->cb_info = NULL;
                }
                g_free(pc);
@@ -1057,8 +1586,10 @@ _ERR_RECORDER_EXIT:
        }
 
        return ret;
+//LCOV_EXCL_STOP
 }
 
+
 int recorder_create_videorecorder(camera_h camera, recorder_h *recorder)
 {
        return _recorder_create_common(recorder, MUSE_RECORDER_TYPE_VIDEO, camera);
@@ -1070,39 +1601,31 @@ int recorder_create_audiorecorder(recorder_h *recorder)
        return _recorder_create_common(recorder, MUSE_RECORDER_TYPE_AUDIO, NULL);
 }
 
+
 int recorder_get_state(recorder_h recorder, recorder_state_e *state)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
+       int ret = RECORDER_ERROR_NONE;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+       muse_recorder_api_e api = MUSE_RECORDER_API_GET_STATE;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
+
        if (state == NULL) {
                LOGE("NULL pointer state");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
 
-       int ret = RECORDER_ERROR_NONE;
-
-       recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       muse_recorder_api_e api = MUSE_RECORDER_API_GET_STATE;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       sock_fd = pc->cb_info->fd;
-       int get_state;
-
-       LOGD("Enter, remote_handle : %x", pc->remote_handle);
+       LOGD("Enter, remote_handle : %td", pc->remote_handle);
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
 
-       if (ret == RECORDER_ERROR_NONE) {
-               muse_recorder_msg_get(get_state, pc->cb_info->recv_msg);
-               *state = (recorder_state_e)get_state;
-       }
+       if (ret == RECORDER_ERROR_NONE)
+               *state = (recorder_state_e)pc->cb_info->get_int_value[_RECORDER_GET_INT_STATE];
 
-       LOGD("ret : 0x%x, get_state : %d", ret, get_state);
+       LOGD("ret : 0x%x, state : %d", ret, *state);
 
        return ret;
 }
@@ -1110,28 +1633,25 @@ int recorder_get_state(recorder_h recorder, recorder_state_e *state)
 
 int recorder_destroy(recorder_h recorder)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
        muse_recorder_api_e api = MUSE_RECORDER_API_DESTROY;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd = 0;
 
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
 
-       sock_fd = pc->cb_info->fd;
-
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       if (pc->cb_info->is_server_connected)
+               _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+       else
+               LOGW("server disconnected. release resource without send message.");
+
        if (ret == RECORDER_ERROR_NONE) {
-               _recorder_remove_idle_event_all(pc->cb_info);
-               _client_callback_destroy(pc->cb_info);
+               _recorder_deactivate_idle_event_all(pc->cb_info);
+               _recorder_client_callback_destroy(pc->cb_info);
                g_free(pc);
                pc = NULL;
        }
@@ -1144,24 +1664,18 @@ int recorder_destroy(recorder_h recorder)
 
 int recorder_prepare(recorder_h recorder)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-
        int ret = RECORDER_ERROR_NONE;
        muse_recorder_api_e api = MUSE_RECORDER_API_PREPARE;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
 
        LOGD("ret : 0x%x", ret);
 
@@ -1177,24 +1691,17 @@ int recorder_unprepare(recorder_h recorder)
        int ret = RECORDER_ERROR_NONE;
        muse_recorder_api_e api = MUSE_RECORDER_API_UNPREPARE;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
        camera_state_e camera_state = CAMERA_STATE_NONE;
 
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
 
-       sock_fd = pc->cb_info->fd;
-
        LOGD("ENTER");
 
        if (pc->camera) {
+//LCOV_EXCL_START
                ret = camera_get_state(pc->camera, &camera_state);
                if (ret != CAMERA_ERROR_NONE) {
                        LOGE("failed to get camera state 0x%x", ret);
@@ -1208,9 +1715,10 @@ int recorder_unprepare(recorder_h recorder)
                                return RECORDER_ERROR_INVALID_OPERATION;
                        }
                }
+//LCOV_EXCL_STOP
        }
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
 
        LOGD("ret : 0x%x", ret);
 
@@ -1223,23 +1731,17 @@ int recorder_start(recorder_h recorder)
        int ret = RECORDER_ERROR_NONE;
        muse_recorder_api_e api = MUSE_RECORDER_API_START;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
        recorder_state_e current_state = RECORDER_STATE_NONE;
 
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
 
        LOGD("ENTER");
 
        if (pc->camera) {
+//LCOV_EXCL_START
                ret = recorder_get_state(recorder, &current_state);
                if (ret != RECORDER_ERROR_NONE) {
                        LOGE("failed to get current state 0x%x", ret);
@@ -1253,9 +1755,10 @@ int recorder_start(recorder_h recorder)
                                return RECORDER_ERROR_INVALID_OPERATION;
                        }
                }
+//LCOV_EXCL_STOP
        }
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_NO_TIMEOUT);
 
        if (pc->camera && current_state == RECORDER_STATE_READY)
                camera_start_evas_rendering(pc->camera);
@@ -1268,24 +1771,21 @@ int recorder_start(recorder_h recorder)
 
 int recorder_pause(recorder_h recorder)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
        muse_recorder_api_e api = MUSE_RECORDER_API_PAUSE;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
@@ -1295,23 +1795,17 @@ int recorder_commit(recorder_h recorder)
        int ret = RECORDER_ERROR_NONE;
        muse_recorder_api_e api = MUSE_RECORDER_API_COMMIT;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
        recorder_state_e current_state = RECORDER_STATE_NONE;
 
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
 
        LOGD("ENTER");
 
        if (pc->camera) {
+//LCOV_EXCL_START
                ret = recorder_get_state(recorder, &current_state);
                if (ret != RECORDER_ERROR_NONE) {
                        LOGE("failed to get current state 0x%x", ret);
@@ -1325,9 +1819,10 @@ int recorder_commit(recorder_h recorder)
                                return RECORDER_ERROR_INVALID_OPERATION;
                        }
                }
+//LCOV_EXCL_STOP
        }
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
 
        if (pc->camera && current_state >= RECORDER_STATE_RECORDING)
                camera_start_evas_rendering(pc->camera);
@@ -1343,21 +1838,13 @@ int recorder_cancel(recorder_h recorder)
        int ret = RECORDER_ERROR_NONE;
        muse_recorder_api_e api = MUSE_RECORDER_API_CANCEL;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
        recorder_state_e current_state = RECORDER_STATE_NONE;
 
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
 
-       sock_fd = pc->cb_info->fd;
-
        LOGD("ENTER");
 
        if (pc->camera) {
@@ -1376,7 +1863,7 @@ int recorder_cancel(recorder_h recorder)
                }
        }
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
 
        if (pc->camera && current_state >= RECORDER_STATE_RECORDING)
                camera_start_evas_rendering(pc->camera);
@@ -1389,65 +1876,78 @@ int recorder_cancel(recorder_h recorder)
 
 int recorder_set_video_resolution(recorder_h recorder, int width, int height)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
+       int send_ret = 0;
+       char *send_msg = NULL;
        muse_recorder_api_e api = MUSE_RECORDER_API_SET_VIDEO_RESOLUTION;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send2(api,
-               sock_fd,
-               pc->cb_info,
-               ret,
-               INT, width,
-               INT, height);
+       send_msg = muse_core_msg_new(api,
+               MUSE_TYPE_INT, "width", width,
+               MUSE_TYPE_INT, "height", height,
+               NULL);
+       if (send_msg) {
+               if (pc->cb_info->is_server_connected) {
+                       __recorder_update_api_waiting(pc->cb_info, api, 1);
+
+                       send_ret = muse_core_msg_send(pc->cb_info->fd, send_msg);
+               }
+
+               if (send_ret < 0) {
+                       LOGE("message send failed");
+                       ret = RECORDER_ERROR_INVALID_OPERATION;
+               } else {
+                       ret = _recorder_client_wait_for_cb_return(api, pc->cb_info, RECORDER_CB_TIMEOUT);
+               }
+
+               __recorder_update_api_waiting(pc->cb_info, api, -1);
+
+               muse_core_msg_free(send_msg);
+       } else {
+               LOGE("failed to create msg");
+               ret = RECORDER_ERROR_OUT_OF_MEMORY;
+       }
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_get_video_resolution(recorder_h recorder, int *width, int *height)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
+       int ret = RECORDER_ERROR_NONE;
+       muse_recorder_api_e api = MUSE_RECORDER_API_GET_VIDEO_RESOLUTION;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
+
        if (!width || !height) {
                LOGE("NULL pointer width = [%p], height = [%p]", width, height);
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       int ret = RECORDER_ERROR_NONE;
-       muse_recorder_api_e api = MUSE_RECORDER_API_GET_VIDEO_RESOLUTION;
-       recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       sock_fd = pc->cb_info->fd;
-       int get_width;
-       int get_height;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
        if (ret == RECORDER_ERROR_NONE) {
-               muse_recorder_msg_get(get_width, pc->cb_info->recv_msg);
-               muse_recorder_msg_get(get_height, pc->cb_info->recv_msg);
-               *width = get_width;
-               *height = get_height;
+               *width = pc->cb_info->get_int_value[_RECORDER_GET_INT_VIDEO_RESOLUTION] >> 16;
+               *height = (0x0000ffff & pc->cb_info->get_int_value[_RECORDER_GET_INT_VIDEO_RESOLUTION]);
        }
-       LOGD("ret : 0x%x", ret);
+
+       LOGD("ret : 0x%x, %dx%d", ret, *width, *height);
+
        return ret;
 }
 
@@ -1455,66 +1955,63 @@ int recorder_get_video_resolution(recorder_h recorder, int *width, int *height)
 int recorder_foreach_supported_video_resolution(recorder_h recorder,
        recorder_supported_video_resolution_cb foreach_cb, void *user_data)
 {
-       if (recorder == NULL || foreach_cb == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
-
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
        muse_recorder_api_e api = MUSE_RECORDER_API_FOREACH_SUPPORTED_VIDEO_RESOLUTION;
 
-       LOGD("Enter, handle :%x", pc->remote_handle);
-
-       int sock_fd;
-       if (pc->cb_info == NULL) {
+       if (!pc || !pc->cb_info || foreach_cb == NULL) {
                LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
+
+       LOGD("Enter, handle :%td", pc->remote_handle);
+
        pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_FOREACH_SUPPORTED_VIDEO_RESOLUTION] = foreach_cb;
        pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_FOREACH_SUPPORTED_VIDEO_RESOLUTION] = user_data;
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_get_audio_level(recorder_h recorder, double *level)
 {
-       if (recorder == NULL || level == NULL) {
-               LOGE("NULL pointer %p %p", recorder, level);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-
        int ret = RECORDER_ERROR_NONE;
        muse_recorder_api_e api = MUSE_RECORDER_API_GET_AUDIO_LEVEL;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+
+       if (!pc || !pc->cb_info || level == NULL) {
+               LOGE("NULL pointer %p %p", pc, level);
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
-       double get_level;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
-       if (ret == RECORDER_ERROR_NONE) {
-               muse_recorder_msg_get_double(get_level, pc->cb_info->recv_msg);
-               *level = get_level;
-       }
-       LOGD("ret : 0x%x", ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE)
+               *level = pc->cb_info->get_double_value[_RECORDER_GET_DOUBLE_AUDIO_LEVEL];
+
+       LOGD("ret : 0x%x, level %lf", ret, *level);
+
        return ret;
 }
 
 
-int recorder_set_filename(recorder_h recorder,  const char *filename)
+int recorder_set_filename(recorder_h recorder, const char *filename)
 {
-       if (recorder == NULL) {
-               LOGE("handle is NULL");
+       int ret = RECORDER_ERROR_NONE;
+       size_t length = 0;
+       muse_recorder_api_e api = MUSE_RECORDER_API_SET_FILENAME;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+       recorder_msg_param param;
+       char set_filename[RECORDER_FILENAME_MAX] = {'\0',};
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
 
@@ -1522,28 +2019,45 @@ int recorder_set_filename(recorder_h recorder,  const char *filename)
                LOGE("filename is NULL");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       int ret = RECORDER_ERROR_NONE;
-       muse_recorder_api_e api = MUSE_RECORDER_API_SET_FILENAME;
-       recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+
+       LOGD("ENTER [%s]", filename);
+
+       length = strlen(filename);
+
+       if (length >= RECORDER_FILENAME_MAX - 1) {
+               LOGE("too long file name [%zu]", length);
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
 
-       LOGD("ENTER");
+       if (storage_get_origin_internal_path(filename, RECORDER_FILENAME_MAX, set_filename) < 0) {
+               /* Cannot convert. Use original path. */
+               strncpy(set_filename, filename, length + 1);
+               pc->cb_info->is_filename_converted = FALSE;
+       } else {
+               /* Converted. Use converted path. */
+               LOGD("Converted filename : %s -> %s", filename, set_filename);
+               pc->cb_info->is_filename_converted = TRUE;
+       }
+
+       RECORDER_MSG_PARAM_SET(param, STRING, set_filename);
+
+       _recorder_msg_send_param1(api, pc->cb_info, &ret, &param);
 
-       muse_recorder_msg_send1(api, sock_fd, pc->cb_info, ret, STRING, filename);
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_get_filename(recorder_h recorder,  char **filename)
 {
-       if (recorder == NULL) {
-               LOGE("handle is NULL");
+       int ret = RECORDER_ERROR_NONE;
+       muse_recorder_api_e api = MUSE_RECORDER_API_GET_FILENAME;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+       char compat_filename[RECORDER_FILENAME_MAX] = {0, };
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
 
@@ -1551,24 +2065,24 @@ int recorder_get_filename(recorder_h recorder,  char **filename)
                LOGE("filename is NULL");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       int ret = RECORDER_ERROR_NONE;
-       muse_recorder_api_e api = MUSE_RECORDER_API_GET_FILENAME;
-       recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       sock_fd = pc->cb_info->fd;
-       char get_filename[MUSE_RECORDER_MSG_MAX_LENGTH] = {0,};
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
 
        if (ret == RECORDER_ERROR_NONE) {
-               muse_recorder_msg_get_string(get_filename, pc->cb_info->recv_msg);
-               *filename = strdup(get_filename);
+               if (pc->cb_info->is_filename_converted == FALSE ||
+                       storage_get_compat_internal_path(pc->cb_info->get_filename, RECORDER_FILENAME_MAX, compat_filename) < 0) {
+                       /* Use original path. */
+                       *filename = pc->cb_info->get_filename;
+               } else {
+                       /* Converted. Use converted path. */
+                       LOGD("Converted filename : %s -> %s", pc->cb_info->get_filename, compat_filename);
+                       *filename = strdup(compat_filename);
+                       free(pc->cb_info->get_filename);
+               }
+
+               pc->cb_info->get_filename = NULL;
        }
 
        LOGD("ret : 0x%x, filename : [%s]", ret, (*filename) ? *filename : "NULL");
@@ -1579,28 +2093,23 @@ int recorder_get_filename(recorder_h recorder,  char **filename)
 
 int recorder_set_file_format(recorder_h recorder, recorder_file_format_e format)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       if (format < RECORDER_FILE_FORMAT_3GP || format > RECORDER_FILE_FORMAT_M2TS) {
-               LOGE("invalid format %d", format);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
+       int set_format = (int)format;
        muse_recorder_api_e api = MUSE_RECORDER_API_SET_FILE_FORMAT;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       recorder_msg_param param;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
-       int set_format = (int)format;
 
        LOGD("ENTER, set_format : %d", set_format);
 
-       muse_recorder_msg_send1(api, sock_fd, pc->cb_info, ret, INT, set_format);
+       RECORDER_MSG_PARAM_SET(param, INT, set_format);
+
+       _recorder_msg_send_param1(api, pc->cb_info, &ret, &param);
+
        LOGD("ret : 0x%x", ret);
        return ret;
 }
@@ -1608,35 +2117,29 @@ int recorder_set_file_format(recorder_h recorder, recorder_file_format_e format)
 
 int recorder_get_file_format(recorder_h recorder, recorder_file_format_e *format)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
+       int ret = RECORDER_ERROR_NONE;
+       muse_recorder_api_e api = MUSE_RECORDER_API_GET_FILE_FORMAT;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
+
        if (format == NULL) {
                LOGE("NULL pointer data");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       int ret = RECORDER_ERROR_NONE;
-       muse_recorder_api_e api = MUSE_RECORDER_API_GET_FILE_FORMAT;
-       recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       sock_fd = pc->cb_info->fd;
-       int get_format;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE)
+               *format = (recorder_file_format_e)pc->cb_info->get_int_value[_RECORDER_GET_INT_FILE_FORMAT];
+
+       LOGD("ret : 0x%x, format %d", ret, *format);
 
-       if (ret == RECORDER_ERROR_NONE) {
-               muse_recorder_msg_get(get_format, pc->cb_info->recv_msg);
-               LOGD("get_fileformat : %d", get_format);
-               *format = (recorder_file_format_e)get_format;
-       }
-       LOGD("ret : 0x%x", ret);
        return ret;
 }
 
@@ -1645,25 +2148,18 @@ int recorder_set_sound_stream_info(recorder_h recorder, sound_stream_info_h stre
 {
        int ret = RECORDER_ERROR_NONE;
        muse_recorder_api_e api = MUSE_RECORDER_API_SET_SOUND_STREAM_INFO;
-       recorder_cli_s *pc = NULL;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
        bool is_available = false;
-       int sock_fd;
        int stream_index = 0;
        char *stream_type = NULL;
+       char *send_msg = NULL;
+       int send_ret = 0;
 
-       if (recorder == NULL || stream_info == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-
-       pc = (recorder_cli_s *)recorder;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       if (!pc || !pc->cb_info || stream_info == NULL) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
 
-       sock_fd = pc->cb_info->fd;
-
        LOGD("ENTER");
 
        ret = sound_manager_is_available_stream_information(stream_info, NATIVE_API_RECORDER, &is_available);
@@ -1682,941 +2178,1035 @@ int recorder_set_sound_stream_info(recorder_h recorder, sound_stream_info_h stre
 
        LOGD("sound manager return [0x%x]", ret);
 
-       if (ret == SOUND_MANAGER_ERROR_NONE)
-               muse_recorder_msg_send2(api, sock_fd, pc->cb_info, ret, STRING, stream_type, INT, stream_index);
-       else
+       if (ret == SOUND_MANAGER_ERROR_NONE) {
+               send_msg = muse_core_msg_new(api,
+                       MUSE_TYPE_STRING, "stream_type", stream_type,
+                       MUSE_TYPE_INT, "stream_index", stream_index,
+                       NULL);
+               if (send_msg) {
+                       if (pc->cb_info->is_server_connected) {
+                               __recorder_update_api_waiting(pc->cb_info, api, 1);
+
+                               send_ret = muse_core_msg_send(pc->cb_info->fd, send_msg);
+                       }
+
+                       if (send_ret < 0) {
+                               LOGE("message send failed");
+                               ret = RECORDER_ERROR_INVALID_OPERATION;
+                       } else {
+                               ret = _recorder_client_wait_for_cb_return(api, pc->cb_info, RECORDER_CB_TIMEOUT);
+                       }
+
+                       __recorder_update_api_waiting(pc->cb_info, api, -1);
+
+                       muse_core_msg_free(send_msg);
+               } else {
+                       LOGE("failed to create msg");
+                       ret = RECORDER_ERROR_OUT_OF_MEMORY;
+               }
+       } else {
                ret = RECORDER_ERROR_INVALID_OPERATION;
+       }
 
        return ret;
 }
 
 
-int recorder_set_state_changed_cb(recorder_h recorder, recorder_state_changed_cb callback, voiduser_data)
+int recorder_set_state_changed_cb(recorder_h recorder, recorder_state_changed_cb callback, void *user_data)
 {
-       if (recorder == NULL || callback == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
-
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
        muse_recorder_api_e api = MUSE_RECORDER_API_SET_STATE_CHANGED_CB;
 
-       LOGD("Enter, handle :%x", pc->remote_handle);
-
-       int sock_fd;
-       if (pc->cb_info == NULL) {
+       if (!pc || !pc->cb_info || callback == NULL) {
                LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
-       pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_STATE_CHANGE] = callback;
-       pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_STATE_CHANGE] = user_data;
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       LOGD("Enter, handle :%td", pc->remote_handle);
+
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE) {
+               g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_STATE_CHANGE]);
+
+               pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_STATE_CHANGE] = callback;
+               pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_STATE_CHANGE] = user_data;
+
+               g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_STATE_CHANGE]);
+       }
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_unset_state_changed_cb(recorder_h recorder)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
        muse_recorder_api_e api = MUSE_RECORDER_API_UNSET_STATE_CHANGED_CB;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE) {
+               g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_STATE_CHANGE]);
+
+               pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_STATE_CHANGE] = NULL;
+               pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_STATE_CHANGE] = NULL;
+
+               g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_STATE_CHANGE]);
+       }
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_set_interrupted_cb(recorder_h recorder, recorder_interrupted_cb callback, void *user_data)
 {
-       if (recorder == NULL || callback == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
-
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
        muse_recorder_api_e api = MUSE_RECORDER_API_SET_INTERRUPTED_CB;
 
-       LOGD("Enter, handle :%x", pc->remote_handle);
-
-       int sock_fd;
-       if (pc->cb_info == NULL) {
+       if (!pc || !pc->cb_info || callback == NULL) {
                LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
-       pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_INTERRUPTED] = callback;
-       pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_INTERRUPTED] = user_data;
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       LOGD("Enter, handle :%td", pc->remote_handle);
+
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE) {
+               g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_INTERRUPTED]);
+
+               pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_INTERRUPTED] = callback;
+               pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_INTERRUPTED] = user_data;
+
+               g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_INTERRUPTED]);
+       }
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_unset_interrupted_cb(recorder_h recorder)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
        muse_recorder_api_e api = MUSE_RECORDER_API_UNSET_INTERRUPTED_CB;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE) {
+               g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_INTERRUPTED]);
+
+               pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_INTERRUPTED] = NULL;
+               pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_INTERRUPTED] = NULL;
+
+               g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_INTERRUPTED]);
+       }
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
-int recorder_set_audio_stream_cb(recorder_h recorder, recorder_audio_stream_cb callback, void* user_data)
+int recorder_set_interrupt_started_cb(recorder_h recorder, recorder_interrupt_started_cb callback, void *user_data)
 {
-       if (recorder == NULL || callback == NULL) {
+       int ret = RECORDER_ERROR_NONE;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+       muse_recorder_api_e api = MUSE_RECORDER_API_SET_INTERRUPT_STARTED_CB;
+
+       if (!pc || !pc->cb_info || callback == NULL) {
                LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       int ret = RECORDER_ERROR_NONE;
 
-       recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       muse_recorder_api_e api = MUSE_RECORDER_API_SET_AUDIO_STREAM_CB;
+       LOGD("Enter, handle :%td", pc->remote_handle);
 
-       LOGD("Enter, handle :%x", pc->remote_handle);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
 
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
+       if (ret == RECORDER_ERROR_NONE) {
+               g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_INTERRUPT_STARTED]);
+
+               pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_INTERRUPT_STARTED] = callback;
+               pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_INTERRUPT_STARTED] = user_data;
+
+               g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_INTERRUPT_STARTED]);
        }
-       sock_fd = pc->cb_info->fd;
-       pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_AUDIO_STREAM] = callback;
-       pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_AUDIO_STREAM] = user_data;
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
-int recorder_unset_audio_stream_cb(recorder_h recorder)
+int recorder_unset_interrupt_started_cb(recorder_h recorder)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
-       muse_recorder_api_e api = MUSE_RECORDER_API_UNSET_AUDIO_STREAM_CB;
+       muse_recorder_api_e api = MUSE_RECORDER_API_UNSET_INTERRUPT_STARTED_CB;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE) {
+               g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_INTERRUPT_STARTED]);
+
+               pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_INTERRUPT_STARTED] = NULL;
+               pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_INTERRUPT_STARTED] = NULL;
+
+               g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_INTERRUPT_STARTED]);
+       }
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
-int recorder_set_error_cb(recorder_h recorder, recorder_error_cb callback, void *user_data)
+int recorder_set_audio_stream_cb(recorder_h recorder, recorder_audio_stream_cb callback, void *user_data)
 {
-       if (recorder == NULL || callback == NULL) {
+       int ret = RECORDER_ERROR_NONE;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+       muse_recorder_api_e api = MUSE_RECORDER_API_SET_AUDIO_STREAM_CB;
+
+       if (!pc || !pc->cb_info || callback == NULL) {
                LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       int ret = RECORDER_ERROR_NONE;
 
-       recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       muse_recorder_api_e api = MUSE_RECORDER_API_SET_ERROR_CB;
+       LOGD("Enter, handle :%td", pc->remote_handle);
 
-       LOGD("Enter, handle :%x", pc->remote_handle);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
 
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
+       if (ret == RECORDER_ERROR_NONE) {
+               g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_AUDIO_STREAM]);
+
+               pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_AUDIO_STREAM] = callback;
+               pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_AUDIO_STREAM] = user_data;
+
+               g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_AUDIO_STREAM]);
        }
-       sock_fd = pc->cb_info->fd;
-       pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_ERROR] = callback;
-       pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_ERROR] = user_data;
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
-int recorder_unset_error_cb(recorder_h recorder)
+int recorder_unset_audio_stream_cb(recorder_h recorder)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
-       muse_recorder_api_e api = MUSE_RECORDER_API_UNSET_ERROR_CB;
+       muse_recorder_api_e api = MUSE_RECORDER_API_UNSET_AUDIO_STREAM_CB;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE) {
+               g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_AUDIO_STREAM]);
+
+               pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_AUDIO_STREAM] = NULL;
+               pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_AUDIO_STREAM] = NULL;
+
+               g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_AUDIO_STREAM]);
+       }
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
-int recorder_set_recording_status_cb(recorder_h recorder, recorder_recording_status_cb callback, void* user_data)
+int recorder_set_muxed_stream_cb(recorder_h recorder, recorder_muxed_stream_cb callback, void *user_data)
 {
-       if (recorder == NULL || callback == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
-
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       muse_recorder_api_e api = MUSE_RECORDER_API_SET_RECORDING_STATUS_CB;
+       muse_recorder_api_e api = MUSE_RECORDER_API_SET_MUXED_STREAM_CB;
 
-       LOGD("Enter, handle :%x", pc->remote_handle);
-
-       int sock_fd;
-       if (pc->cb_info == NULL) {
+       if (!pc || !pc->cb_info || !callback) {
                LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
-       pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_RECORDING_STATUS] = callback;
-       pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_RECORDING_STATUS] = user_data;
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
-       LOGD("ret : 0x%x", ret);
-       return ret;
-}
+       LOGD("Enter, handle :%td", pc->remote_handle);
 
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
 
-int recorder_unset_recording_status_cb(recorder_h recorder)
+       if (ret == RECORDER_ERROR_NONE) {
+               g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_MUXED_STREAM]);
+
+               pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_MUXED_STREAM] = callback;
+               pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_MUXED_STREAM] = user_data;
+
+               g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_MUXED_STREAM]);
+       }
+
+       LOGD("ret : 0x%x", ret);
+
+       return ret;
+}
+
+
+int recorder_unset_muxed_stream_cb(recorder_h recorder)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
+       int ret = RECORDER_ERROR_NONE;
+       muse_recorder_api_e api = MUSE_RECORDER_API_UNSET_MUXED_STREAM_CB;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
+
+       LOGD("ENTER");
+
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE) {
+               g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_MUXED_STREAM]);
+
+               pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_MUXED_STREAM] = NULL;
+               pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_MUXED_STREAM] = NULL;
+
+               g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_MUXED_STREAM]);
+       }
+
+       LOGD("ret : 0x%x", ret);
+
+       return ret;
+}
+
+
+int recorder_set_error_cb(recorder_h recorder, recorder_error_cb callback, void *user_data)
+{
        int ret = RECORDER_ERROR_NONE;
-       muse_recorder_api_e api = MUSE_RECORDER_API_UNSET_RECORDING_STATUS_CB;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
+       muse_recorder_api_e api = MUSE_RECORDER_API_SET_ERROR_CB;
+
+       if (!pc || !pc->cb_info || callback == NULL) {
                LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
+
+       LOGD("Enter, handle :%td", pc->remote_handle);
+
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE) {
+               g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_ERROR]);
+
+               pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_ERROR] = callback;
+               pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_ERROR] = user_data;
+
+               g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_ERROR]);
+       }
+
+       LOGD("ret : 0x%x", ret);
+
+       return ret;
+}
+
+
+int recorder_unset_error_cb(recorder_h recorder)
+{
+       int ret = RECORDER_ERROR_NONE;
+       muse_recorder_api_e api = MUSE_RECORDER_API_UNSET_ERROR_CB;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
+               return RECORDER_ERROR_INVALID_PARAMETER;
+       }
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE) {
+               g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_ERROR]);
+
+               pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_ERROR] = NULL;
+               pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_ERROR] = NULL;
+
+               g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_ERROR]);
+       }
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
-int recorder_set_recording_limit_reached_cb(recorder_h recorder, recorder_recording_limit_reached_cb callback, void* user_data)
+int recorder_set_recording_status_cb(recorder_h recorder, recorder_recording_status_cb callback, void *user_data)
 {
-       if (recorder == NULL || callback == NULL) {
+       int ret = RECORDER_ERROR_NONE;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+       muse_recorder_api_e api = MUSE_RECORDER_API_SET_RECORDING_STATUS_CB;
+
+       if (!pc || !pc->cb_info || callback == NULL) {
                LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
+
+       LOGD("Enter, handle :%td", pc->remote_handle);
+
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE) {
+               g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_RECORDING_STATUS]);
+
+               pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_RECORDING_STATUS] = callback;
+               pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_RECORDING_STATUS] = user_data;
+
+               g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_RECORDING_STATUS]);
+       }
+
+       LOGD("ret : 0x%x", ret);
+
+       return ret;
+}
+
+
+int recorder_unset_recording_status_cb(recorder_h recorder)
+{
        int ret = RECORDER_ERROR_NONE;
+       muse_recorder_api_e api = MUSE_RECORDER_API_UNSET_RECORDING_STATUS_CB;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
+               return RECORDER_ERROR_INVALID_PARAMETER;
+       }
+
+       LOGD("ENTER");
+
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE) {
+               g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_RECORDING_STATUS]);
 
+               pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_RECORDING_STATUS] = NULL;
+               pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_RECORDING_STATUS] = NULL;
+
+               g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_RECORDING_STATUS]);
+       }
+
+       LOGD("ret : 0x%x", ret);
+
+       return ret;
+}
+
+
+int recorder_set_recording_limit_reached_cb(recorder_h recorder, recorder_recording_limit_reached_cb callback, void *user_data)
+{
+       int ret = RECORDER_ERROR_NONE;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
        muse_recorder_api_e api = MUSE_RECORDER_API_SET_RECORDING_LIMIT_REACHED_CB;
 
-       LOGD("Enter, handle :%x", pc->remote_handle);
-
-       int sock_fd;
-       if (pc->cb_info == NULL) {
+       if (!pc || !pc->cb_info || callback == NULL) {
                LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
-       pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_RECORDING_LIMITED] = callback;
-       pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_RECORDING_LIMITED] = user_data;
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE) {
+               g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_RECORDING_LIMITED]);
+
+               pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_RECORDING_LIMITED] = callback;
+               pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_RECORDING_LIMITED] = user_data;
+
+               g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_RECORDING_LIMITED]);
+       }
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_unset_recording_limit_reached_cb(recorder_h recorder)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
        muse_recorder_api_e api = MUSE_RECORDER_API_UNSET_RECORDING_LIMIT_REACHED_CB;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE) {
+               g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_RECORDING_LIMITED]);
+
+               pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_RECORDING_LIMITED] = NULL;
+               pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_RECORDING_LIMITED] = NULL;
+
+               g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_RECORDER_EVENT_TYPE_RECORDING_LIMITED]);
+       }
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_foreach_supported_file_format(recorder_h recorder, recorder_supported_file_format_cb foreach_cb, void *user_data)
 {
-       if (recorder == NULL || foreach_cb == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
-
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
        muse_recorder_api_e api = MUSE_RECORDER_API_FOREACH_SUPPORTED_FILE_FORMAT;
 
-       LOGD("Enter, handle :%x", pc->remote_handle);
-
-       int sock_fd;
-       if (pc->cb_info == NULL) {
+       if (!pc || !pc->cb_info || foreach_cb == NULL) {
                LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
+
+       LOGD("Enter, handle :%td", pc->remote_handle);
+
        pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_FOREACH_SUPPORTED_FILE_FORMAT] = foreach_cb;
        pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_FOREACH_SUPPORTED_FILE_FORMAT] = user_data;
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_attr_set_size_limit(recorder_h recorder, int kbyte)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
        muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_SET_SIZE_LIMIT;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       recorder_msg_param param;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send1(api,
-                                                       sock_fd,
-                                                       pc->cb_info,
-                                                       ret,
-                                                       INT, kbyte);
+       RECORDER_MSG_PARAM_SET(param, INT, kbyte);
+
+       _recorder_msg_send_param1(api, pc->cb_info, &ret, &param);
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_attr_set_time_limit(recorder_h recorder, int second)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
        muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_SET_TIME_LIMIT;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       recorder_msg_param param;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send1(api,
-                                                       sock_fd,
-                                                       pc->cb_info,
-                                                       ret,
-                                                       INT, second);
+       RECORDER_MSG_PARAM_SET(param, INT, second);
+
+       _recorder_msg_send_param1(api, pc->cb_info, &ret, &param);
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_attr_set_audio_device(recorder_h recorder, recorder_audio_device_e device)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
+       int set_device = (int)device;
        muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_SET_AUDIO_DEVICE;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       recorder_msg_param param;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       sock_fd = pc->cb_info->fd;
-       int set_device = (int)device;
+       };
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send1(api,
-                                                       sock_fd,
-                                                       pc->cb_info,
-                                                       ret,
-                                                       INT, set_device);
+       RECORDER_MSG_PARAM_SET(param, INT, set_device);
+
+       _recorder_msg_send_param1(api, pc->cb_info, &ret, &param);
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_set_audio_encoder(recorder_h recorder, recorder_audio_codec_e codec)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       if (codec != RECORDER_AUDIO_CODEC_DISABLE &&
-           (codec < RECORDER_AUDIO_CODEC_AMR || codec > RECORDER_AUDIO_CODEC_PCM)) {
-               LOGE("invalid parameter : codec %d", codec);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
+       int set_codec = (int)codec;
        muse_recorder_api_e api = MUSE_RECORDER_API_SET_AUDIO_ENCODER;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       recorder_msg_param param;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
-       int set_codec = (int)codec;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send1(api,
-                                                       sock_fd,
-                                                       pc->cb_info,
-                                                       ret,
-                                                       INT, set_codec);
+       RECORDER_MSG_PARAM_SET(param, INT, set_codec);
+
+       _recorder_msg_send_param1(api, pc->cb_info, &ret, &param);
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_get_audio_encoder(recorder_h recorder, recorder_audio_codec_e *codec)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
+       int ret = RECORDER_ERROR_NONE;
+       muse_recorder_api_e api = MUSE_RECORDER_API_GET_AUDIO_ENCODER;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
+
        if (codec == NULL) {
                LOGE("codec is NULL");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       int ret = RECORDER_ERROR_NONE;
-       muse_recorder_api_e api = MUSE_RECORDER_API_GET_AUDIO_ENCODER;
-       recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       sock_fd = pc->cb_info->fd;
-       int get_codec;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
-       if (ret == RECORDER_ERROR_NONE) {
-               muse_recorder_msg_get(get_codec, pc->cb_info->recv_msg);
-               *codec = (recorder_audio_codec_e)get_codec;
-       }
-       LOGD("ret : 0x%x", ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE)
+               *codec = (recorder_audio_codec_e)pc->cb_info->get_int_value[_RECORDER_GET_INT_AUDIO_ENCODER];
+
+       LOGD("ret : 0x%x, codec %d", ret, *codec);
+
        return ret;
 }
 
 
 int recorder_set_video_encoder(recorder_h recorder, recorder_video_codec_e codec)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       if (codec < RECORDER_VIDEO_CODEC_H263 || codec > RECORDER_VIDEO_CODEC_THEORA) {
-               LOGE("invalid codec %d", codec);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
+       int set_codec = (int)codec;
        muse_recorder_api_e api = MUSE_RECORDER_API_SET_VIDEO_ENCODER;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       recorder_msg_param param;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
-       int set_codec = (int)codec;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send1(api,
-                                                       sock_fd,
-                                                       pc->cb_info,
-                                                       ret,
-                                                       INT, set_codec);
+       RECORDER_MSG_PARAM_SET(param, INT, set_codec);
+
+       _recorder_msg_send_param1(api, pc->cb_info, &ret, &param);
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_get_video_encoder(recorder_h recorder, recorder_video_codec_e *codec)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
+       int ret = RECORDER_ERROR_NONE;
+       muse_recorder_api_e api = MUSE_RECORDER_API_GET_VIDEO_ENCODER;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
+
        if (codec == NULL) {
                LOGE("codec is NULL");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       int ret = RECORDER_ERROR_NONE;
-       muse_recorder_api_e api = MUSE_RECORDER_API_GET_VIDEO_ENCODER;
-       recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       sock_fd = pc->cb_info->fd;
-       int get_codec;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
-       if (ret == RECORDER_ERROR_NONE) {
-               muse_recorder_msg_get(get_codec, pc->cb_info->recv_msg);
-               *codec = (recorder_audio_codec_e)get_codec;
-       }
-       LOGD("ret : 0x%x", ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE)
+               *codec = (recorder_video_codec_e)pc->cb_info->get_int_value[_RECORDER_GET_INT_VIDEO_ENCODER];
+
+       LOGD("ret : 0x%x, codec %d", ret, *codec);
+
        return ret;
 }
 
 
 int recorder_attr_set_audio_samplerate(recorder_h recorder, int samplerate)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       if (samplerate < 1) {
-               LOGE("invalid samplerate %d", samplerate);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
        muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_SET_AUDIO_SAMPLERATE;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       recorder_msg_param param;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
 
        LOGD("ENTER, samplerate : %d", samplerate);
 
-       muse_recorder_msg_send1(api,
-                                                       sock_fd,
-                                                       pc->cb_info,
-                                                       ret,
-                                                       INT, samplerate);
-       LOGD("ret : 0x%x, samplerate : %d", ret, samplerate);
+       RECORDER_MSG_PARAM_SET(param, INT, samplerate);
+
+       _recorder_msg_send_param1(api, pc->cb_info, &ret, &param);
+
+       LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_attr_set_audio_encoder_bitrate(recorder_h recorder, int bitrate)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       if (bitrate < 1) {
-               LOGE("invalid bitrate %d", bitrate);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
        muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_SET_AUDIO_ENCODER_BITRATE;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       recorder_msg_param param;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send1(api,
-                                                       sock_fd,
-                                                       pc->cb_info,
-                                                       ret,
-                                                       INT, bitrate);
+       RECORDER_MSG_PARAM_SET(param, INT, bitrate);
+
+       _recorder_msg_send_param1(api, pc->cb_info, &ret, &param);
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_attr_set_video_encoder_bitrate(recorder_h recorder, int bitrate)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-
        int ret = RECORDER_ERROR_NONE;
        muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_SET_VIDEO_ENCODER_BITRATE;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       recorder_msg_param param;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send1(api,
-                                                       sock_fd,
-                                                       pc->cb_info,
-                                                       ret,
-                                                       INT, bitrate);
+       RECORDER_MSG_PARAM_SET(param, INT, bitrate);
+
+       _recorder_msg_send_param1(api, pc->cb_info, &ret, &param);
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_attr_get_size_limit(recorder_h recorder, int *kbyte)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
+       int ret = RECORDER_ERROR_NONE;
+       muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_GET_SIZE_LIMIT;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
+
        if (kbyte == NULL) {
                LOGE("NULL pointer kbyte");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       int ret = RECORDER_ERROR_NONE;
-       muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_GET_SIZE_LIMIT;
-       recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       sock_fd = pc->cb_info->fd;
-       int get_kbyte;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
-       if (ret == RECORDER_ERROR_NONE) {
-               muse_recorder_msg_get(get_kbyte, pc->cb_info->recv_msg);
-               *kbyte = get_kbyte;
-       }
-       LOGD("ret : 0x%x", ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE)
+               *kbyte = pc->cb_info->get_int_value[_RECORDER_GET_INT_SIZE_LIMIT];
+
+       LOGD("ret : 0x%x, %d kbyte", ret, *kbyte);
+
        return ret;
 }
 
 
 int recorder_attr_get_time_limit(recorder_h recorder, int *second)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
+       int ret = RECORDER_ERROR_NONE;
+       muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_GET_TIME_LIMIT;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
+
        if (second == NULL) {
                LOGE("NULL pointer second");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       int ret = RECORDER_ERROR_NONE;
-       muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_GET_TIME_LIMIT;
-       recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       sock_fd = pc->cb_info->fd;
-       int get_second;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
-       if (ret == RECORDER_ERROR_NONE) {
-               muse_recorder_msg_get(get_second, pc->cb_info->recv_msg);
-               *second = get_second;
-       }
-       LOGD("ret : 0x%x", ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE)
+               *second = pc->cb_info->get_int_value[_RECORDER_GET_INT_TIME_LIMIT];
+
+       LOGD("ret : 0x%x, %d second", ret, *second);
+
        return ret;
 }
 
 
 int recorder_attr_get_audio_device(recorder_h recorder, recorder_audio_device_e *device)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
+       int ret = RECORDER_ERROR_NONE;
+       muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_GET_AUDIO_DEVICE;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
+
        if (device == NULL) {
                LOGE("NULL pointer device");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       int ret = RECORDER_ERROR_NONE;
-       muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_GET_AUDIO_DEVICE;
-       recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       sock_fd = pc->cb_info->fd;
-       int get_device;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
-       if (ret == RECORDER_ERROR_NONE) {
-               muse_recorder_msg_get(get_device, pc->cb_info->recv_msg);
-               *device = (recorder_audio_device_e)get_device;
-       }
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE)
+               *device = (recorder_audio_device_e)pc->cb_info->get_int_value[_RECORDER_GET_INT_AUDIO_DEVICE];
+
+       LOGD("ret : 0x%x, device %d", ret, *device);
 
-       LOGD("ret : 0x%x", ret);
        return ret;
 }
 
 
 int recorder_attr_get_audio_samplerate(recorder_h recorder, int *samplerate)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
+       int ret = RECORDER_ERROR_NONE;
+       muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_GET_AUDIO_SAMPLERATE;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
+
        if (samplerate == NULL) {
                LOGE("NULL pointer handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       int ret = RECORDER_ERROR_NONE;
-       muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_GET_AUDIO_SAMPLERATE;
-       recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       sock_fd = pc->cb_info->fd;
-       int get_samplerate;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
-       if (ret == RECORDER_ERROR_NONE) {
-               muse_recorder_msg_get(get_samplerate, pc->cb_info->recv_msg);
-               *samplerate = get_samplerate;
-       }
-       LOGD("ret : 0x%x, get_samplerate : %d", ret, get_samplerate);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE)
+               *samplerate = pc->cb_info->get_int_value[_RECORDER_GET_INT_AUDIO_SAMPLERATE];
+
+       LOGD("ret : 0x%x, samplerate %d", ret, *samplerate);
+
        return ret;
 }
 
 
 int recorder_attr_get_audio_encoder_bitrate(recorder_h recorder, int *bitrate)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
+       int ret = RECORDER_ERROR_NONE;
+       muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_GET_AUDIO_ENCODER_BITRATE;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
+
        if (bitrate == NULL) {
                LOGE("NULL pointer");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       int ret = RECORDER_ERROR_NONE;
-       muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_GET_AUDIO_ENCODER_BITRATE;
-       recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       sock_fd = pc->cb_info->fd;
-       int get_bitrate;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
-       if (ret == RECORDER_ERROR_NONE) {
-               muse_recorder_msg_get(get_bitrate, pc->cb_info->recv_msg);
-               *bitrate = get_bitrate;
-       }
-       LOGD("ret : 0x%x", ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE)
+               *bitrate = pc->cb_info->get_int_value[_RECORDER_GET_INT_AUDIO_ENCODER_BITRATE];
+
+       LOGD("ret : 0x%x, bitrate %d", ret, *bitrate);
+
        return ret;
 }
 
 
 int recorder_attr_get_video_encoder_bitrate(recorder_h recorder, int *bitrate)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
+       int ret = RECORDER_ERROR_NONE;
+       muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_GET_VIDEO_ENCODER_BITRATE;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
+
        if (bitrate == NULL) {
                LOGE("NULL pointer");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       int ret = RECORDER_ERROR_NONE;
-       muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_GET_VIDEO_ENCODER_BITRATE;
-       recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       sock_fd = pc->cb_info->fd;
-       int get_bitrate;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
-       if (ret == RECORDER_ERROR_NONE) {
-               muse_recorder_msg_get(get_bitrate, pc->cb_info->recv_msg);
-               *bitrate = get_bitrate;
-       }
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE)
+               *bitrate = pc->cb_info->get_int_value[_RECORDER_GET_INT_VIDEO_ENCODER_BITRATE];
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_foreach_supported_audio_encoder(recorder_h recorder, recorder_supported_audio_encoder_cb foreach_cb, void *user_data)
 {
-       if (recorder == NULL || foreach_cb == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
-
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
        muse_recorder_api_e api = MUSE_RECORDER_API_FOREACH_SUPPORTED_AUDIO_ENCODER;
 
-       LOGD("Enter, handle :%x", pc->remote_handle);
-
-       int sock_fd;
-       if (pc->cb_info == NULL) {
+       if (!pc || !pc->cb_info || foreach_cb == NULL) {
                LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
+
+       LOGD("Enter, handle :%td", pc->remote_handle);
+
        pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_FOREACH_SUPPORTED_AUDIO_ENCODER] = foreach_cb;
        pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_FOREACH_SUPPORTED_AUDIO_ENCODER] = user_data;
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_foreach_supported_video_encoder(recorder_h recorder, recorder_supported_video_encoder_cb foreach_cb, void *user_data)
 {
-       if (recorder == NULL || foreach_cb == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
-
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
        muse_recorder_api_e api = MUSE_RECORDER_API_FOREACH_SUPPORTED_VIDEO_ENCODER;
 
-       LOGD("Enter, handle :%x", pc->remote_handle);
-
-       int sock_fd;
-       if (pc->cb_info == NULL) {
+       if (!pc || !pc->cb_info || foreach_cb == NULL) {
                LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
+
+       LOGD("Enter, handle :%td", pc->remote_handle);
+
        pc->cb_info->user_cb[MUSE_RECORDER_EVENT_TYPE_FOREACH_SUPPORTED_VIDEO_ENCODER] = foreach_cb;
        pc->cb_info->user_data[MUSE_RECORDER_EVENT_TYPE_FOREACH_SUPPORTED_VIDEO_ENCODER] = user_data;
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_attr_set_mute(recorder_h recorder, bool enable)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
+       int set_enable = (int)enable;
        muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_SET_MUTE;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       recorder_msg_param param;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
-       int set_enable = (int)enable;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send1(api, sock_fd, pc->cb_info, ret, INT, set_enable);
+       RECORDER_MSG_PARAM_SET(param, INT, set_enable);
+
+       _recorder_msg_send_param1(api, pc->cb_info, &ret, &param);
 
        LOGD("ret : 0x%x", ret);
 
@@ -2626,51 +3216,45 @@ int recorder_attr_set_mute(recorder_h recorder, bool enable)
 
 bool recorder_attr_is_muted(recorder_h recorder)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return false;
-       }
-       int ret = RECORDER_ERROR_NONE;
+       int ret = false;
        muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_IS_MUTED;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
+               return false;
        }
-       sock_fd = pc->cb_info->fd;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
-       LOGD("ret : 0x%x", ret);
-       return ret;
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_SERVICE_DISCONNECTED)
+               ret = false;
+
+       LOGD("ret : %d", ret);
+
+       return (bool)ret;
 }
 
 
 int recorder_attr_set_recording_motion_rate(recorder_h recorder, double rate)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
        muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_SET_RECORDING_MOTION_RATE;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       recorder_msg_param param;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
 
        LOGD("ENTER - %.20lf", rate);
 
-       muse_recorder_msg_send1(api,
-                                                       sock_fd,
-                                                       pc->cb_info,
-                                                       ret,
-                                                       DOUBLE, rate);
+       RECORDER_MSG_PARAM_SET(param, DOUBLE, rate);
+
+       _recorder_msg_send_param1(api, pc->cb_info, &ret, &param);
 
        LOGD("ret : 0x%x", ret);
 
@@ -2680,159 +3264,385 @@ int recorder_attr_set_recording_motion_rate(recorder_h recorder, double rate)
 
 int recorder_attr_get_recording_motion_rate(recorder_h recorder, double *rate)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
+       int ret = RECORDER_ERROR_NONE;
+       muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_GET_RECORDING_MOTION_RATE;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
+
        if (rate == NULL) {
                LOGE("rate is NULL");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       int ret = RECORDER_ERROR_NONE;
-       muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_GET_RECORDING_MOTION_RATE;
-       recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       sock_fd = pc->cb_info->fd;
-       double get_rate;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
-       if (ret == RECORDER_ERROR_NONE) {
-               muse_recorder_msg_get_double(get_rate, pc->cb_info->recv_msg);
-               *rate = get_rate;
-       }
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+       if (ret == RECORDER_ERROR_NONE)
+               *rate = pc->cb_info->get_double_value[_RECORDER_GET_DOUBLE_RECORDING_MOTION_RATE];
+
        LOGD("ret : 0x%x - rate %.20lf", ret, *rate);
+
        return ret;
 }
 
 
 int recorder_attr_set_audio_channel(recorder_h recorder, int channel_count)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
        muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_SET_AUDIO_CHANNEL;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       recorder_msg_param param;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send1(api,
-                                                       sock_fd,
-                                                       pc->cb_info,
-                                                       ret,
-                                                       INT, channel_count);
+       RECORDER_MSG_PARAM_SET(param, INT, channel_count);
+
+       _recorder_msg_send_param1(api, pc->cb_info, &ret, &param);
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int recorder_attr_get_audio_channel(recorder_h recorder, int *channel_count)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
+       int ret = RECORDER_ERROR_NONE;
+       muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_GET_AUDIO_CHANNEL;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
+
        if (channel_count == NULL) {
                LOGE("channel_count is NULL");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       int ret = RECORDER_ERROR_NONE;
-       muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_GET_AUDIO_CHANNEL;
-       recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       sock_fd = pc->cb_info->fd;
-       int get_channel_count;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
-       if (ret == RECORDER_ERROR_NONE) {
-               muse_recorder_msg_get(get_channel_count, pc->cb_info->recv_msg);
-               *channel_count = get_channel_count;
-       }
-       LOGD("ret : 0x%x", ret);
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE)
+               *channel_count = pc->cb_info->get_int_value[_RECORDER_GET_INT_AUDIO_CHANNEL];
+
+       LOGD("ret : 0x%x, channel count %d", ret, *channel_count);
+
        return ret;
 }
 
 
 int recorder_attr_set_orientation_tag(recorder_h recorder, recorder_rotation_e orientation)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       if (orientation > RECORDER_ROTATION_270) {
-               LOGE("invalid orientation %d", orientation);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
        int ret = RECORDER_ERROR_NONE;
+       int set_orientation = (int)orientation;
        muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_SET_ORIENTATION_TAG;
        recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       recorder_msg_param param;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
-       int set_orientation = (int)orientation;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send1(api,
-                                                       sock_fd,
-                                                       pc->cb_info,
-                                                       ret,
-                                                       INT, set_orientation);
+       RECORDER_MSG_PARAM_SET(param, INT, set_orientation);
+
+       _recorder_msg_send_param1(api, pc->cb_info, &ret, &param);
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }
 
 
 int  recorder_attr_get_orientation_tag(recorder_h recorder, recorder_rotation_e *orientation)
 {
-       if (recorder == NULL) {
-               LOGE("NULL pointer handle");
+       int ret = RECORDER_ERROR_NONE;
+       muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_GET_ORIENTATION_TAG;
+       recorder_cli_s *pc = (recorder_cli_s *)recorder;
+
+       if (!pc || !pc->cb_info) {
+               LOGE("NULL handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
+
        if (orientation == NULL) {
                LOGE("orientation is NULL");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
+
+       LOGD("ENTER");
+
+       _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT);
+
+       if (ret == RECORDER_ERROR_NONE)
+               *orientation = (recorder_rotation_e)pc->cb_info->get_int_value[_RECORDER_GET_INT_ORIENTATION_TAG];
+
+       LOGD("ret : 0x%x, orientation %d", ret, *orientation);
+
+       return ret;
+}
+
+
+int recorder_get_device_state(recorder_type_e type, recorder_device_state_e *state)
+{
        int ret = RECORDER_ERROR_NONE;
-       muse_recorder_api_e api = MUSE_RECORDER_API_ATTR_GET_ORIENTATION_TAG;
-       recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
-       if (pc->cb_info == NULL) {
-               LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
+       int sock_fd = -1;
+       int module_index = -1;
+       int get_device_state = 0;
+       char *send_msg = NULL;
+       char recv_msg[MUSE_RECORDER_MSG_MAX_LENGTH] = {'\0',};
+
+       if (!state) {
+               LOGE("NULL pointer");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
-       int get_orientation;
 
-       LOGD("ENTER");
+       LOGD("Enter - type %d", type);
+
+       sock_fd = muse_client_new();
+       if (sock_fd < 0) {
+//LCOV_EXCL_START
+               LOGE("muse_client_new failed - returned fd %d", sock_fd);
+               ret = RECORDER_ERROR_INVALID_OPERATION;
+               goto _GET_DEVICE_STATE_EXIT;
+//LCOV_EXCL_STOP
+       }
+
+       if (muse_client_get_module_index(MODULE_NAME, &module_index) != MM_ERROR_NONE) {
+               LOGE("muse client get module index failed");
+               ret = RECORDER_ERROR_INVALID_OPERATION;
+               goto _GET_DEVICE_STATE_EXIT;
+       }
+
+       send_msg = muse_core_msg_new(MUSE_RECORDER_API_GET_DEVICE_STATE,
+               MUSE_TYPE_INT, "module", module_index,
+               MUSE_TYPE_INT, PARAM_RECORDER_TYPE, type,
+               NULL);
+       if (!send_msg) {
+//LCOV_EXCL_START
+               LOGE("NULL msg");
+               ret = RECORDER_ERROR_OUT_OF_MEMORY;
+               goto _GET_DEVICE_STATE_EXIT;
+//LCOV_EXCL_STOP
+       }
+
+       LOGD("sock_fd : %d, msg : %s", sock_fd, send_msg);
+
+       ret = muse_core_msg_send(sock_fd, send_msg);
+
+       muse_core_msg_free(send_msg);
+       send_msg = NULL;
+
+       if (ret < 0) {
+//LCOV_EXCL_START
+               LOGE("send msg failed %d", errno);
+               ret = RECORDER_ERROR_INVALID_OPERATION;
+               goto _GET_DEVICE_STATE_EXIT;
+//LCOV_EXCL_STOP
+       }
+
+       ret = muse_core_msg_recv(sock_fd, recv_msg, MUSE_RECORDER_MSG_MAX_LENGTH);
+       if (ret <= 0) {
+//LCOV_EXCL_START
+               LOGE("recv msg failed %d", errno);
+               ret = RECORDER_ERROR_INVALID_OPERATION;
+               goto _GET_DEVICE_STATE_EXIT;
+//LCOV_EXCL_STOP
+       }
+
+       if (!muse_recorder_msg_get(ret, recv_msg)) {
+//LCOV_EXCL_START
+               LOGE("failed to get return value from msg [%s]", recv_msg);
+               ret = RECORDER_ERROR_INVALID_OPERATION;
+               goto _GET_DEVICE_STATE_EXIT;
+//LCOV_EXCL_STOP
+       }
 
-       muse_recorder_msg_send(api, sock_fd, pc->cb_info, ret);
        if (ret == RECORDER_ERROR_NONE) {
-               muse_recorder_msg_get(get_orientation, pc->cb_info->recv_msg);
-               *orientation = (recorder_rotation_e)get_orientation;
+               if (muse_recorder_msg_get(get_device_state, recv_msg)) {
+                       *state = (recorder_device_state_e)get_device_state;
+                       LOGD("device type %d state %d", type, *state);
+               } else {
+                       LOGE("failed to get device state from msg [%s]", recv_msg);
+                       ret = RECORDER_ERROR_INVALID_OPERATION;
+               }
+       } else {
+               LOGE("failed 0x%x", ret);
        }
-       LOGD("ret : 0x%x", ret);
+
+_GET_DEVICE_STATE_EXIT:
+       if (sock_fd > -1) {
+               muse_client_close(sock_fd);
+               sock_fd = -1;
+       }
+
+       return ret;
+}
+
+
+int recorder_add_device_state_changed_cb(recorder_device_state_changed_cb callback, void *user_data, int *cb_id)
+{
+       int ret = RECORDER_ERROR_NONE;
+       recorder_device_state_e state = RECORDER_DEVICE_STATE_IDLE;
+       recorder_cb_info *info = NULL;
+
+       if (!callback || !cb_id) {
+               LOGE("invalid pointer %p %p", callback, cb_id);
+               return RECORDER_ERROR_INVALID_PARAMETER;
+       }
+
+       g_mutex_lock(&g_rec_dev_state_changed_cb_lock);
+
+       /* check recorder support */
+       ret = recorder_get_device_state(RECORDER_TYPE_AUDIO, &state);
+       if (ret != RECORDER_ERROR_NONE) {
+               LOGE("get device state failed");
+               g_mutex_unlock(&g_rec_dev_state_changed_cb_lock);
+               return ret;
+       }
+
+       info = g_new0(recorder_cb_info, 1);
+       if (!info) {
+               LOGE("info failed");
+               ret = RECORDER_ERROR_OUT_OF_MEMORY;
+               goto _DONE;
+       }
+
+       info->id = ++g_rec_dev_state_changed_cb_id;
+       info->callback = (void *)callback;
+       info->user_data = user_data;
+
+       *cb_id = info->id;
+
+       /* subscribe dbus signal for camera state change */
+       if (!g_rec_dev_state_changed_cb_conn) {
+               g_rec_dev_state_changed_cb_conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, NULL);
+               if (!g_rec_dev_state_changed_cb_conn) {
+                       LOGE("failed to get gdbus connection");
+                       ret = RECORDER_ERROR_INVALID_OPERATION;
+                       goto _DONE;
+               }
+
+               LOGD("subscribe signal %s - %s - %s",
+                       MM_CAMCORDER_DBUS_OBJECT,
+                       MM_CAMCORDER_DBUS_INTERFACE_RECORDER,
+                       MM_CAMCORDER_DBUS_SIGNAL_STATE_CHANGED);
+
+               g_rec_dev_state_changed_cb_subscribe_id = g_dbus_connection_signal_subscribe(g_rec_dev_state_changed_cb_conn,
+                       NULL, MM_CAMCORDER_DBUS_INTERFACE_RECORDER, MM_CAMCORDER_DBUS_SIGNAL_STATE_CHANGED, MM_CAMCORDER_DBUS_OBJECT, NULL,
+                       G_DBUS_SIGNAL_FLAGS_NONE, (GDBusSignalCallback)__recorder_device_state_changed_cb, NULL, NULL);
+               if (!g_rec_dev_state_changed_cb_subscribe_id) {
+                       LOGE("failed to get gdbus connection");
+                       ret = RECORDER_ERROR_INVALID_OPERATION;
+                       goto _DONE;
+               }
+
+               LOGD("signal subscribe id %u", g_rec_dev_state_changed_cb_subscribe_id);
+       }
+
+       g_rec_dev_state_changed_cb_list = g_list_prepend(g_rec_dev_state_changed_cb_list, (gpointer)info);
+
+       LOGD("callback id %d", info->id);
+
+_DONE:
+       if (ret != RECORDER_ERROR_NONE) {
+//LCOV_EXCL_START
+               if (info) {
+                       g_free(info);
+                       info = NULL;
+               }
+
+               if (g_rec_dev_state_changed_cb_conn) {
+                       g_object_unref(g_rec_dev_state_changed_cb_conn);
+                       g_rec_dev_state_changed_cb_conn = NULL;
+               }
+//LCOV_EXCL_STOP
+       }
+
+       g_mutex_unlock(&g_rec_dev_state_changed_cb_lock);
+
+       return ret;
+}
+
+
+int recorder_remove_device_state_changed_cb(int cb_id)
+{
+       int ret = RECORDER_ERROR_NONE;
+       recorder_device_state_e state = RECORDER_DEVICE_STATE_IDLE;
+       GList *tmp_list = NULL;
+       recorder_cb_info *info = NULL;
+
+       /* check recorder support */
+       ret = recorder_get_device_state(RECORDER_TYPE_AUDIO, &state);
+       if (ret != RECORDER_ERROR_NONE) {
+               LOGE("get device state failed");
+               return ret;
+       }
+
+       g_mutex_lock(&g_rec_dev_state_changed_cb_lock);
+
+       if (!g_rec_dev_state_changed_cb_list) {
+               LOGE("there is no callback info");
+               ret = RECORDER_ERROR_INVALID_OPERATION;
+               goto _DONE;
+       }
+
+       tmp_list = g_rec_dev_state_changed_cb_list;
+
+       do {
+               info = tmp_list->data;
+               tmp_list = tmp_list->next;
+
+               if (!info) {
+                       LOGW("NULL info");
+                       continue;
+               }
+
+               if (info->id == cb_id) {
+                       g_rec_dev_state_changed_cb_list = g_list_remove(g_rec_dev_state_changed_cb_list, info);
+
+                       g_free(info);
+                       info = NULL;
+
+                       if (!g_rec_dev_state_changed_cb_list) {
+                               /* no remained callback */
+                               if (g_rec_dev_state_changed_cb_conn) {
+                                       /* unsubscribe signal */
+                                       g_dbus_connection_signal_unsubscribe(g_rec_dev_state_changed_cb_conn, g_rec_dev_state_changed_cb_subscribe_id);
+                                       g_rec_dev_state_changed_cb_subscribe_id = 0;
+
+                                       /* unref connection */
+                                       g_object_unref(g_rec_dev_state_changed_cb_conn);
+                                       g_rec_dev_state_changed_cb_conn = NULL;
+                               }
+                       }
+
+                       LOGD("id %d callback removed", cb_id);
+                       ret = RECORDER_ERROR_NONE;
+
+                       goto _DONE;
+               }
+       } while (tmp_list);
+
+       LOGE("id %d callback not found", cb_id);
+       ret = RECORDER_ERROR_INVALID_PARAMETER;
+
+_DONE:
+       g_mutex_unlock(&g_rec_dev_state_changed_cb_lock);
+
        return ret;
 }