[Release version 0.10.59] Update code for recording commit function - avoid time...
[platform/core/multimedia/libmm-camcorder.git] / src / mm_camcorder_internal.c
index c1847d8..80783a6 100644 (file)
 #include <mm_session.h>
 #include <mm_session_private.h>
 
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
 #include <murphy/common/glib-glue.h>
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
 
-/*---------------------------------------------------------------------------------------
-|    GLOBAL VARIABLE DEFINITIONS for internal                                          |
----------------------------------------------------------------------------------------*/
-int g_mm_camcorder_type = -255;
-struct sigaction mm_camcorder_int_old_action;
-struct sigaction mm_camcorder_abrt_old_action;
-struct sigaction mm_camcorder_segv_old_action;
-struct sigaction mm_camcorder_term_old_action;
-struct sigaction mm_camcorder_sys_old_action;
+#ifdef _MMCAMCORDER_RM_SUPPORT
+#include <aul.h>
+#endif /* _MMCAMCORDER_RM_SUPPORT */
 
 /*---------------------------------------------------------------------------------------
 |    LOCAL VARIABLE DEFINITIONS for internal                                           |
@@ -64,6 +60,13 @@ struct sigaction mm_camcorder_sys_old_action;
 #define __MMCAMCORDER_SOUND_WAIT_TIMEOUT        3
 #define __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN   64
 
+#define DPM_ALLOWED                             1
+#define DPM_DISALLOWED                          0
+
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+#define __MMCAMCORDER_RESOURCE_WAIT_TIME        5
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
+
 
 /*---------------------------------------------------------------------------------------
 |    LOCAL FUNCTION PROTOTYPES:                                                                |
@@ -79,13 +82,14 @@ static gint     __mmcamcorder_gst_handle_core_error(MMHandleType handle, int cod
 static gint     __mmcamcorder_gst_handle_resource_warning(MMHandleType handle, GstMessage *message , GError *error);
 static gboolean __mmcamcorder_handle_gst_warning(MMHandleType handle, GstMessage *message, GError *error);
 
+#ifdef _MMCAMCORDER_RM_SUPPORT
+rm_cb_result _mmcamcorder_rm_callback(int handle, rm_callback_type event_src,
+        rm_device_request_s *info, void *cb_data);
+#endif /* _MMCAMCORDER_RM_SUPPORT */
 #ifdef _MMCAMCORDER_USE_SET_ATTR_CB
 static gboolean __mmcamcorder_set_attr_to_camsensor_cb(gpointer data);
 #endif /* _MMCAMCORDER_USE_SET_ATTR_CB */
 
-static void __mm_camcorder_signal_handler(int signo);
-static void _mmcamcorder_constructor() __attribute__((constructor));
-
 /*=======================================================================================
 |  FUNCTION DEFINITIONS                                                                        |
 =======================================================================================*/
@@ -93,100 +97,6 @@ static void _mmcamcorder_constructor() __attribute__((constructor));
 |    GLOBAL FUNCTION DEFINITIONS:                                                      |
 ---------------------------------------------------------------------------------------*/
 
-
-static void __mm_camcorder_signal_handler(int signo)
-{
-       pid_t my_pid = getpid();
-       pid_t vconf_recorder_pid = -1;
-       pid_t vconf_camera_pid = -1;
-       int vconf_flash_state = VCONFKEY_CAMERA_FLASH_STATE_OFF;
-
-       _mmcam_dbg_warn("start - signo [%d], pid [%d], device type [%d]", signo, my_pid, g_mm_camcorder_type);
-
-       /* reset vconf key */
-       switch (g_mm_camcorder_type) {
-       case MM_VIDEO_DEVICE_NONE:
-               vconf_get_int(VCONFKEY_RECORDER_PID, (int *)&vconf_recorder_pid);
-               if (my_pid == vconf_recorder_pid) {
-                       vconf_set_int(VCONFKEY_RECORDER_STATE, VCONFKEY_RECORDER_STATE_NULL);
-                       vconf_set_int(VCONFKEY_RECORDER_PID, -1);
-                       _mmcam_dbg_warn("set recorder state NULL");
-               } else {
-                       _mmcam_dbg_warn("different pid : my[%d] vconf[%d]", my_pid, vconf_recorder_pid);
-               }
-               break;
-       case MM_VIDEO_DEVICE_CAMERA0:
-       case MM_VIDEO_DEVICE_CAMERA1:
-               vconf_get_int(VCONFKEY_CAMERA_FLASH_STATE, &vconf_flash_state);
-               vconf_get_int(VCONFKEY_CAMERA_PID, (int *)&vconf_camera_pid);
-               if (my_pid == vconf_camera_pid &&
-                       vconf_flash_state == VCONFKEY_CAMERA_FLASH_STATE_ON) {
-                       vconf_set_int(VCONFKEY_CAMERA_FLASH_STATE, VCONFKEY_CAMERA_FLASH_STATE_OFF);
-                       vconf_set_int(VCONFKEY_CAMERA_PID, -1);
-                       _mmcam_dbg_warn("set camera flash state OFF");
-               }
-
-               vconf_set_int(VCONFKEY_CAMERA_STATE, VCONFKEY_CAMERA_STATE_NULL);
-               _mmcam_dbg_warn("set camera state NULL");
-               break;
-       default:
-               _mmcam_dbg_warn("unknown type [%d]", g_mm_camcorder_type);
-               break;
-       }
-
-       /* call old signal handler */
-       switch (signo) {
-       case SIGINT:
-               sigaction(SIGINT, &mm_camcorder_int_old_action, NULL);
-               raise(signo);
-               break;
-       case SIGABRT:
-               sigaction(SIGABRT, &mm_camcorder_abrt_old_action, NULL);
-               raise(signo);
-               break;
-       case SIGSEGV:
-               sigaction(SIGSEGV, &mm_camcorder_segv_old_action, NULL);
-               raise(signo);
-               break;
-       case SIGTERM:
-               sigaction(SIGTERM, &mm_camcorder_term_old_action, NULL);
-               raise(signo);
-               break;
-       case SIGSYS:
-               sigaction(SIGSYS, &mm_camcorder_sys_old_action, NULL);
-               raise(signo);
-               break;
-       default:
-               break;
-       }
-
-       _mmcam_dbg_warn("done");
-
-       return;
-}
-
-
-static void _mmcamcorder_constructor()
-{
-       struct sigaction mm_camcorder_action;
-       mm_camcorder_action.sa_handler = __mm_camcorder_signal_handler;
-       mm_camcorder_action.sa_flags = SA_NOCLDSTOP;
-
-       _mmcam_dbg_warn("start");
-
-       sigemptyset(&mm_camcorder_action.sa_mask);
-
-       sigaction(SIGINT, &mm_camcorder_action, &mm_camcorder_int_old_action);
-       sigaction(SIGABRT, &mm_camcorder_action, &mm_camcorder_abrt_old_action);
-       sigaction(SIGSEGV, &mm_camcorder_action, &mm_camcorder_segv_old_action);
-       sigaction(SIGTERM, &mm_camcorder_action, &mm_camcorder_term_old_action);
-       sigaction(SIGSYS, &mm_camcorder_action, &mm_camcorder_sys_old_action);
-
-       _mmcam_dbg_warn("done");
-
-       return;
-}
-
 /* Internal command functions {*/
 int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
 {
@@ -223,33 +133,44 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
        hcamcorder->capture_in_recording = FALSE;
        hcamcorder->session_type = MM_SESSION_TYPE_MEDIA;
 
-       pthread_mutex_init(&((hcamcorder->mtsafe).lock), NULL);
-       pthread_cond_init(&((hcamcorder->mtsafe).cond), NULL);
-       pthread_mutex_init(&((hcamcorder->mtsafe).cmd_lock), NULL);
-       pthread_mutex_init(&((hcamcorder->mtsafe).asm_lock), NULL);
-       pthread_mutex_init(&((hcamcorder->mtsafe).state_lock), NULL);
-       pthread_mutex_init(&((hcamcorder->mtsafe).gst_state_lock), NULL);
-       pthread_mutex_init(&((hcamcorder->mtsafe).gst_encode_state_lock), NULL);
-       pthread_mutex_init(&((hcamcorder->mtsafe).message_cb_lock), NULL);
-       pthread_mutex_init(&((hcamcorder->mtsafe).vcapture_cb_lock), NULL);
-       pthread_mutex_init(&((hcamcorder->mtsafe).vstream_cb_lock), NULL);
-       pthread_mutex_init(&((hcamcorder->mtsafe).astream_cb_lock), NULL);
-
-       pthread_mutex_init(&(hcamcorder->sound_lock), NULL);
-       pthread_cond_init(&(hcamcorder->sound_cond), NULL);
-       pthread_mutex_init(&(hcamcorder->restart_preview_lock), NULL);
+       g_mutex_init(&(hcamcorder->mtsafe).lock);
+       g_cond_init(&(hcamcorder->mtsafe).cond);
+       g_mutex_init(&(hcamcorder->mtsafe).cmd_lock);
+       g_cond_init(&(hcamcorder->mtsafe).cmd_cond);
+       g_mutex_init(&(hcamcorder->mtsafe).asm_lock);
+       g_mutex_init(&(hcamcorder->mtsafe).state_lock);
+       g_mutex_init(&(hcamcorder->mtsafe).gst_state_lock);
+       g_mutex_init(&(hcamcorder->mtsafe).gst_encode_state_lock);
+       g_mutex_init(&(hcamcorder->mtsafe).message_cb_lock);
+       g_mutex_init(&(hcamcorder->mtsafe).vcapture_cb_lock);
+       g_mutex_init(&(hcamcorder->mtsafe).vstream_cb_lock);
+       g_mutex_init(&(hcamcorder->mtsafe).astream_cb_lock);
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+       g_cond_init(&(hcamcorder->mtsafe).resource_cond);
+       g_mutex_init(&(hcamcorder->mtsafe).resource_lock);
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
+
+       g_mutex_init(&hcamcorder->restart_preview_lock);
 
        /* Sound mutex/cond init */
-       pthread_mutex_init(&(hcamcorder->snd_info.open_mutex), NULL);
-       pthread_cond_init(&(hcamcorder->snd_info.open_cond), NULL);
+       g_mutex_init(&hcamcorder->snd_info.open_mutex);
+       g_cond_init(&hcamcorder->snd_info.open_cond);
+       g_mutex_init(&hcamcorder->snd_info.play_mutex);
+       g_cond_init(&hcamcorder->snd_info.play_cond);
 
        /* init for sound thread */
-       pthread_mutex_init(&(hcamcorder->task_thread_lock), NULL);
-       pthread_cond_init(&(hcamcorder->task_thread_cond), NULL);
+       g_mutex_init(&hcamcorder->task_thread_lock);
+       g_cond_init(&hcamcorder->task_thread_cond);
        hcamcorder->task_thread_state = _MMCAMCORDER_SOUND_STATE_NONE;
 
        /* create task thread */
-       pthread_create(&(hcamcorder->task_thread), NULL, _mmcamcorder_util_task_thread_func, (void *)hcamcorder);
+       hcamcorder->task_thread = g_thread_try_new("MMCAM_TASK_THREAD",
+               (GThreadFunc)_mmcamcorder_util_task_thread_func, (gpointer)hcamcorder, NULL);
+       if (hcamcorder->task_thread == NULL) {
+               _mmcam_dbg_err("_mmcamcorder_create::failed to create task thread");
+               ret = MM_ERROR_CAMCORDER_RESOURCE_CREATION;
+               goto _ERR_DEFAULT_VALUE_INIT;
+       }
 
        if (info->videodev_type < MM_VIDEO_DEVICE_NONE ||
            info->videodev_type >= MM_VIDEO_DEVICE_NUM) {
@@ -290,12 +211,9 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
        }
 
        /* Get Camera Configure information from Camcorder INI file */
-       _mmcamcorder_conf_get_info((MMHandleType)hcamcorder, CONFIGURE_TYPE_MAIN, CONFIGURE_MAIN_FILE, &hcamcorder->conf_main);
-
-       if (!(hcamcorder->conf_main)) {
-               _mmcam_dbg_err( "Failed to get configure(main) info." );
-
-               ret = MM_ERROR_CAMCORDER_CREATE_CONFIGURE;
+       ret = _mmcamcorder_conf_get_info((MMHandleType)hcamcorder, CONFIGURE_TYPE_MAIN, CONFIGURE_MAIN_FILE, &hcamcorder->conf_main);
+       if (ret != MM_ERROR_NONE) {
+               _mmcam_dbg_err("Failed to get configure(main) info.");
                goto _ERR_DEFAULT_VALUE_INIT;
        }
 
@@ -307,6 +225,19 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
                goto _ERR_DEFAULT_VALUE_INIT;
        }
 
+       /* get DPM context for camera/microphone restriction */
+       hcamcorder->dpm_context = dpm_context_create();
+       if (hcamcorder->dpm_context) {
+               hcamcorder->dpm_policy = dpm_context_acquire_restriction_policy(hcamcorder->dpm_context);
+               if (hcamcorder->dpm_policy == NULL) {
+                       _mmcam_dbg_err("dpm_context_acquire_restriction_policy failed");
+                       dpm_context_destroy(hcamcorder->dpm_context);
+                       hcamcorder->dpm_context = NULL;
+               }
+       }
+
+       _mmcam_dbg_warn("DPM context %p, policy %p", hcamcorder->dpm_context, hcamcorder->dpm_policy);
+
        if (info->videodev_type != MM_VIDEO_DEVICE_NONE) {
                _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main,
                                                CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
@@ -338,17 +269,15 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
 
                        _mmcam_dbg_log("videodev_type : [%d], ConfCtrlPath : [%s]", info->videodev_type, ConfCtrlFile);
 
-                       _mmcamcorder_conf_get_info((MMHandleType)hcamcorder, CONFIGURE_TYPE_CTRL, ConfCtrlFile, &hcamcorder->conf_ctrl);
+                       ret = _mmcamcorder_conf_get_info((MMHandleType)hcamcorder, CONFIGURE_TYPE_CTRL, ConfCtrlFile, &hcamcorder->conf_ctrl);
+                       if (ret != MM_ERROR_NONE) {
+                               _mmcam_dbg_err("Failed to get configure(control) info.");
+                               goto _ERR_DEFAULT_VALUE_INIT;
+                       }
 /*
                        _mmcamcorder_conf_print_info(&hcamcorder->conf_main);
                        _mmcamcorder_conf_print_info(&hcamcorder->conf_ctrl);
 */
-                       if (!(hcamcorder->conf_ctrl)) {
-                               _mmcam_dbg_err( "Failed to get configure(control) info." );
-                               ret = MM_ERROR_CAMCORDER_CREATE_CONFIGURE;
-                               goto _ERR_DEFAULT_VALUE_INIT;
-                       }
-
                        ret = _mmcamcorder_init_convert_table((MMHandleType)hcamcorder);
                        if (ret != MM_ERROR_NONE) {
                                _mmcam_dbg_warn("converting table initialize error!!");
@@ -356,7 +285,7 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
                                goto _ERR_DEFAULT_VALUE_INIT;
                        }
 
-                       ret = _mmcamcorder_init_attr_from_configure((MMHandleType)hcamcorder, MM_CAMCONVERT_CATEGORY_CAMERA|MM_CAMCONVERT_CATEGORY_DISPLAY);
+                       ret = _mmcamcorder_init_attr_from_configure((MMHandleType)hcamcorder, MM_CAMCONVERT_CATEGORY_ALL);
                        if (ret != MM_ERROR_NONE) {
                                _mmcam_dbg_warn("converting table initialize error!!");
                                ret = MM_ERROR_CAMCORDER_INTERNAL;
@@ -421,6 +350,12 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
                                                        "SupportMediaPacketPreviewCb",
                                                        &(hcamcorder->support_media_packet_preview_cb));
 
+                       /* Get UseVideoconvert value from INI */
+                       _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main,
+                                                       CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT,
+                                                       "UseVideoconvert",
+                                                       &hcamcorder->use_videoconvert);
+
                        ret = mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL,
                                                    MMCAM_CAMERA_WIDTH, &resolution_width,
                                                    MMCAM_CAMERA_HEIGHT, &resolution_height,
@@ -428,9 +363,10 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
 
                        mm_camcorder_get_fps_list_by_resolution((MMHandleType)hcamcorder, resolution_width, resolution_height, &fps_info);
 
-                       _mmcam_dbg_log("UseZeroCopyFormat : %d", hcamcorder->use_zero_copy_format);
-                       _mmcam_dbg_log("SupportMediaPacketPreviewCb : %d", hcamcorder->support_media_packet_preview_cb);
-                       _mmcam_dbg_log("res : %d X %d, Default FPS by resolution  : %d", resolution_width, resolution_height, fps_info.int_array.def);
+                       _mmcam_dbg_log("UseZeroCopyFormat %d, UseVideoconvert %d, SupportMediaPacketPreviewCb %d",
+                               hcamcorder->use_zero_copy_format, hcamcorder->use_videoconvert, hcamcorder->support_media_packet_preview_cb);
+                       _mmcam_dbg_log("res : %d X %d, Default FPS by resolution  : %d",
+                               resolution_width, resolution_height, fps_info.int_array.def);
 
                        if (camera_facing_direction == 1) {
                                if (rcmd_dpy_rotation == MM_DISPLAY_ROTATION_270 || rcmd_dpy_rotation == MM_DISPLAY_ROTATION_90) {
@@ -438,7 +374,7 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
                                } else {
                                        camera_default_flip = MM_FLIP_HORIZONTAL;
                                }
-                               _mmcam_dbg_log("camera_default_flip : [%d]",camera_default_flip);
+                               _mmcam_dbg_log("camera_default_flip : [%d]", camera_default_flip);
                        }
 
                        mm_camcorder_set_attributes((MMHandleType)hcamcorder, &err_attr_name,
@@ -456,8 +392,7 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
                                                    NULL);
                        if (err_attr_name) {
                                _mmcam_dbg_err("Set %s FAILED.", err_attr_name);
-                               free(err_attr_name);
-                               err_attr_name = NULL;
+                               SAFE_FREE(err_attr_name);
                                ret = MM_ERROR_CAMCORDER_INTERNAL;
                                goto _ERR_DEFAULT_VALUE_INIT;
                        }
@@ -468,8 +403,7 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
                                                    NULL);
                        if (err_attr_name) {
                                _mmcam_dbg_err("Get brightness FAILED.");
-                               free(err_attr_name);
-                               err_attr_name = NULL;
+                               SAFE_FREE(err_attr_name);
                                ret = MM_ERROR_CAMCORDER_INTERNAL;
                                goto _ERR_DEFAULT_VALUE_INIT;
                        }
@@ -478,6 +412,18 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
                        _mmcam_dbg_log( "Disable Configure Control system." );
                        hcamcorder->conf_ctrl = NULL;
                }
+
+               /* add DPM camera policy changed callback */
+               if (hcamcorder->dpm_context) {
+                       if (dpm_context_add_policy_changed_cb(hcamcorder->dpm_context,
+                               "camera", _mmcamcorder_dpm_camera_policy_changed_cb,
+                               (void *)hcamcorder, &hcamcorder->dpm_camera_cb_id) != DPM_ERROR_NONE) {
+                               _mmcam_dbg_err("add DPM changed cb failed, keep going...");
+                               hcamcorder->dpm_camera_cb_id = 0;
+                       }
+
+                       _mmcam_dbg_log("DPM camera changed cb id %d", hcamcorder->dpm_camera_cb_id);
+               }
        } else {
                _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main,
                                                    CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
@@ -488,21 +434,20 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
                                                    NULL);
                if (err_attr_name) {
                        _mmcam_dbg_err("Set %s FAILED.", err_attr_name);
-                       free(err_attr_name);
-                       err_attr_name = NULL;
+                       SAFE_FREE(err_attr_name);
                        ret = MM_ERROR_CAMCORDER_INTERNAL;
                        goto _ERR_DEFAULT_VALUE_INIT;
                }
 
                ret = _mmcamcorder_init_attr_from_configure((MMHandleType)hcamcorder, MM_CAMCONVERT_CATEGORY_AUDIO);
                if (ret != MM_ERROR_NONE) {
-                       _mmcam_dbg_warn("init attribute from configure error : 0x%x", ret);
-                       ret = MM_ERROR_CAMCORDER_INTERNAL;
+                       _mmcam_dbg_err("there is no audio device");
+                       ret = MM_ERROR_CAMCORDER_NOT_SUPPORTED;
                        goto _ERR_DEFAULT_VALUE_INIT;
                }
        }
 
-
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
        /* initialize resource manager */
        ret = _mmcamcorder_resource_manager_init(&hcamcorder->resource_manager, (void *)hcamcorder);
        if (ret != MM_ERROR_NONE) {
@@ -510,6 +455,7 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
                ret = MM_ERROR_CAMCORDER_INTERNAL;
                goto _ERR_DEFAULT_VALUE_INIT;
        }
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
 
        traceBegin(TTRACE_TAG_CAMERA, "MMCAMCORDER:CREATE:INIT_GSTREAMER");
 
@@ -574,14 +520,16 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
 
        _mmcam_dbg_log("created handle %p", hcamcorder);
 
-       /* set device type */
-       g_mm_camcorder_type = info->videodev_type;
-
        *handle = (MMHandleType)hcamcorder;
 
        return MM_ERROR_NONE;
 
 _ERR_DEFAULT_VALUE_INIT:
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+       /* de-initialize resource manager */
+       _mmcamcorder_resource_manager_deinit(&hcamcorder->resource_manager);
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
+
        /* unregister sound focus */
        if (hcamcorder->sound_focus_register && hcamcorder->sound_focus_id > 0) {
                if (MM_ERROR_NONE != mm_sound_unregister_focus(hcamcorder->sound_focus_id)) {
@@ -594,6 +542,28 @@ _ERR_DEFAULT_VALUE_INIT:
                               hcamcorder->sound_focus_register, hcamcorder->sound_focus_id);
        }
 
+       /* release DPM related handle */
+       if (hcamcorder->dpm_context) {
+               _mmcam_dbg_log("release DPM context %p, camera changed cb id %d",
+                       hcamcorder->dpm_context, hcamcorder->dpm_camera_cb_id);
+
+               /* remove camera policy changed callback */
+               if (hcamcorder->dpm_camera_cb_id > 0) {
+                       dpm_context_remove_policy_changed_cb(hcamcorder->dpm_context, hcamcorder->dpm_camera_cb_id);
+                       hcamcorder->dpm_camera_cb_id = 0;
+               } else {
+                       _mmcam_dbg_warn("invalid dpm camera cb id %d", hcamcorder->dpm_camera_cb_id);
+               }
+
+               if (hcamcorder->dpm_policy) {
+                       dpm_context_release_restriction_policy(hcamcorder->dpm_context, hcamcorder->dpm_policy);
+                       hcamcorder->dpm_policy = NULL;
+               }
+
+               dpm_context_destroy(hcamcorder->dpm_context);
+               hcamcorder->dpm_context = NULL;
+       }
+
        /* Remove attributes */
        if (hcamcorder->attributes) {
                _mmcamcorder_dealloc_attribute((MMHandleType)hcamcorder, hcamcorder->attributes);
@@ -601,30 +571,33 @@ _ERR_DEFAULT_VALUE_INIT:
        }
 
        /* Release lock, cond */
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).lock));
-       pthread_cond_destroy(&((hcamcorder->mtsafe).cond));
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).cmd_lock));
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).asm_lock));
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).state_lock));
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).gst_state_lock));
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).gst_encode_state_lock));
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).message_cb_lock));
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).vcapture_cb_lock));
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).vstream_cb_lock));
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).astream_cb_lock));
-
-       pthread_mutex_destroy(&(hcamcorder->sound_lock));
-       pthread_cond_destroy(&(hcamcorder->sound_cond));
-       pthread_mutex_destroy(&(hcamcorder->snd_info.open_mutex));
-       pthread_cond_destroy(&(hcamcorder->snd_info.open_cond));
-       pthread_mutex_destroy(&(hcamcorder->restart_preview_lock));
+       g_mutex_clear(&(hcamcorder->mtsafe).lock);
+       g_cond_clear(&(hcamcorder->mtsafe).cond);
+       g_mutex_clear(&(hcamcorder->mtsafe).cmd_lock);
+       g_cond_clear(&(hcamcorder->mtsafe).cmd_cond);
+       g_mutex_clear(&(hcamcorder->mtsafe).asm_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).state_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).gst_state_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).gst_encode_state_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).message_cb_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).vcapture_cb_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).vstream_cb_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).astream_cb_lock);
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+       g_cond_clear(&(hcamcorder->mtsafe).resource_cond);
+       g_mutex_clear(&(hcamcorder->mtsafe).resource_lock);
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
+
+       g_mutex_clear(&hcamcorder->snd_info.open_mutex);
+       g_cond_clear(&hcamcorder->snd_info.open_cond);
+       g_mutex_clear(&hcamcorder->restart_preview_lock);
 
        if (hcamcorder->conf_ctrl) {
-               _mmcamcorder_conf_release_info(handle, &hcamcorder->conf_ctrl);
+               _mmcamcorder_conf_release_info((MMHandleType)hcamcorder, &hcamcorder->conf_ctrl);
        }
 
        if (hcamcorder->conf_main) {
-               _mmcamcorder_conf_release_info(handle, &hcamcorder->conf_main);
+               _mmcamcorder_conf_release_info((MMHandleType)hcamcorder, &hcamcorder->conf_main);
        }
 
        if (hcamcorder->model_name) {
@@ -638,15 +611,16 @@ _ERR_DEFAULT_VALUE_INIT:
        }
 
        if (hcamcorder->task_thread) {
-               pthread_mutex_lock(&(hcamcorder->task_thread_lock));
+               g_mutex_lock(&hcamcorder->task_thread_lock);
                _mmcam_dbg_log("send signal for task thread exit");
                hcamcorder->task_thread_state = _MMCAMCORDER_TASK_THREAD_STATE_EXIT;
-               pthread_cond_signal(&(hcamcorder->task_thread_cond));
-               pthread_mutex_unlock(&(hcamcorder->task_thread_lock));
-               pthread_join(hcamcorder->task_thread, NULL);
+               g_cond_signal(&hcamcorder->task_thread_cond);
+               g_mutex_unlock(&hcamcorder->task_thread_lock);
+               g_thread_join(hcamcorder->task_thread);
+               hcamcorder->task_thread = NULL;
        }
-       pthread_mutex_destroy(&(hcamcorder->task_thread_lock));
-       pthread_cond_destroy(&(hcamcorder->task_thread_cond));
+       g_mutex_clear(&hcamcorder->task_thread_lock);
+       g_cond_clear(&hcamcorder->task_thread_cond);
 
        /* Release handle */
        memset(hcamcorder, 0x00, sizeof(mmf_camcorder_t));
@@ -661,6 +635,9 @@ int _mmcamcorder_destroy(MMHandleType handle)
        int ret = MM_ERROR_NONE;
        int state = MM_CAMCORDER_STATE_NONE;
        int state_FROM = MM_CAMCORDER_STATE_NULL;
+#ifdef _MMCAMCORDER_RM_SUPPORT
+       int iret = RM_OK;
+#endif /* _MMCAMCORDER_RM_SUPPORT */
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
@@ -686,33 +663,14 @@ int _mmcamcorder_destroy(MMHandleType handle)
        }
 
        /* set exit state for sound thread */
-       pthread_mutex_lock(&(hcamcorder->task_thread_lock));
+       g_mutex_lock(&hcamcorder->task_thread_lock);
        _mmcam_dbg_log("send signal for task thread exit");
        hcamcorder->task_thread_state = _MMCAMCORDER_TASK_THREAD_STATE_EXIT;
-       pthread_cond_signal(&(hcamcorder->task_thread_cond));
-       pthread_mutex_unlock(&(hcamcorder->task_thread_lock));
-
-       pthread_mutex_lock(&(hcamcorder->sound_lock));
-       while (hcamcorder->capture_sound_count > 0) {
-               struct timespec timeout;
-               struct timeval tv;
+       g_cond_signal(&hcamcorder->task_thread_cond);
+       g_mutex_unlock(&hcamcorder->task_thread_lock);
 
-               gettimeofday(&tv, NULL);
-               timeout.tv_sec = tv.tv_sec + __MMCAMCORDER_SOUND_WAIT_TIMEOUT;
-               timeout.tv_nsec = tv.tv_usec * 1000;
-
-               _mmcam_dbg_warn("capture_sound_count[%d] is not zero. wait signal...",
-                               hcamcorder->capture_sound_count);
-
-               if (!pthread_cond_timedwait(&(hcamcorder->sound_cond), &(hcamcorder->sound_lock), &timeout)) {
-                       _mmcam_dbg_warn("signal received. check again...");
-               } else {
-                       hcamcorder->capture_sound_count = 0;
-                       _mmcam_dbg_err("capture sound completion wait time out");
-                       break;
-               }
-       }
-       pthread_mutex_unlock(&(hcamcorder->sound_lock));
+       /* wait for completion of sound play */
+       _mmcamcorder_sound_solo_play_wait(handle);
 
        /* Release SubContext and pipeline */
        if (hcamcorder->sub_context) {
@@ -724,11 +682,13 @@ int _mmcamcorder_destroy(MMHandleType handle)
                hcamcorder->sub_context = NULL;
        }
 
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
        /* de-initialize resource manager */
        ret = _mmcamcorder_resource_manager_deinit(&hcamcorder->resource_manager);
-       if (!ret) {
-               _mmcam_dbg_err("failed to de-initialize resource manager");
+       if (ret != MM_ERROR_NONE) {
+               _mmcam_dbg_err("failed to de-initialize resource manager 0x%x", ret);
        }
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
 
        /* Remove idle function which is not called yet */
        if (hcamcorder->setting_event_id) {
@@ -737,29 +697,6 @@ int _mmcamcorder_destroy(MMHandleType handle)
                hcamcorder->setting_event_id = 0;
        }
 
-       /* check current strobe mode */
-       if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
-               pid_t my_pid = getpid();
-               int camera_pid = -1;
-               vconf_get_int(VCONFKEY_CAMERA_PID, &camera_pid);
-
-               if (camera_pid > -1 && my_pid == camera_pid) {
-                       int strobe_mode = MM_CAMCORDER_STROBE_MODE_OFF;
-
-                       vconf_set_int(VCONFKEY_CAMERA_PID, -1);
-                       _mmcam_dbg_log("reset camera pid");
-
-                       mm_camcorder_get_attributes(handle, NULL,
-                                                   MMCAM_STROBE_MODE, &strobe_mode,
-                                                   NULL);
-                       if (strobe_mode != MM_CAMCORDER_STROBE_MODE_OFF) {
-                               /* set OFF state of vconf key */
-                               vconf_set_int(VCONFKEY_CAMERA_FLASH_STATE, VCONFKEY_CAMERA_FLASH_STATE_OFF);
-                               _mmcam_dbg_log("reset flash state");
-                       }
-               }
-       }
-
        /* Remove attributes */
        if (hcamcorder->attributes) {
                _mmcamcorder_dealloc_attribute(handle, hcamcorder->attributes);
@@ -797,6 +734,14 @@ int _mmcamcorder_destroy(MMHandleType handle)
                _mmcam_dbg_log("no need to unregister sound focus.[%d, id %d]",
                               hcamcorder->sound_focus_register, hcamcorder->sound_focus_id);
        }
+#ifdef _MMCAMCORDER_RM_SUPPORT
+       if (hcamcorder->rm_handle != 0) {
+               iret = rm_unregister(hcamcorder->rm_handle);
+               if (iret != RM_OK)
+                       _mmcam_dbg_err("rm_unregister() failed");
+               hcamcorder->rm_handle = 0;
+       }
+#endif /* _MMCAMCORDER_RM_SUPPORT */
 
        /* release model_name */
        if (hcamcorder->model_name) {
@@ -809,32 +754,58 @@ int _mmcamcorder_destroy(MMHandleType handle)
                hcamcorder->software_version = NULL;
        }
 
+       /* release DPM related handle */
+       if (hcamcorder->dpm_context) {
+               _mmcam_dbg_log("release DPM context %p, camera changed cb id %d",
+                       hcamcorder->dpm_context, hcamcorder->dpm_camera_cb_id);
+
+               /* remove camera policy changed callback */
+               if (hcamcorder->dpm_camera_cb_id > 0) {
+                       dpm_context_remove_policy_changed_cb(hcamcorder->dpm_context, hcamcorder->dpm_camera_cb_id);
+                       hcamcorder->dpm_camera_cb_id = 0;
+               } else {
+                       _mmcam_dbg_warn("invalid dpm camera cb id %d", hcamcorder->dpm_camera_cb_id);
+               }
+
+               if (hcamcorder->dpm_policy) {
+                       dpm_context_release_restriction_policy(hcamcorder->dpm_context, hcamcorder->dpm_policy);
+                       hcamcorder->dpm_policy = NULL;
+               }
+
+               dpm_context_destroy(hcamcorder->dpm_context);
+               hcamcorder->dpm_context = NULL;
+       }
+
        /* join task thread */
        _mmcam_dbg_log("task thread join");
-       pthread_join(hcamcorder->task_thread, NULL);
+       g_thread_join(hcamcorder->task_thread);
+       hcamcorder->task_thread = NULL;
 
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
        /* Release lock, cond */
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).lock));
-       pthread_cond_destroy(&((hcamcorder->mtsafe).cond));
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).cmd_lock));
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).asm_lock));
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).state_lock));
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).gst_state_lock));
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).gst_encode_state_lock));
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).message_cb_lock));
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).vcapture_cb_lock));
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).vstream_cb_lock));
-       pthread_mutex_destroy(&((hcamcorder->mtsafe).astream_cb_lock));
-
-       pthread_mutex_destroy(&(hcamcorder->sound_lock));
-       pthread_cond_destroy(&(hcamcorder->sound_cond));
-       pthread_mutex_destroy(&(hcamcorder->snd_info.open_mutex));
-       pthread_cond_destroy(&(hcamcorder->snd_info.open_cond));
-       pthread_mutex_destroy(&(hcamcorder->restart_preview_lock));
-       pthread_mutex_destroy(&(hcamcorder->task_thread_lock));
-       pthread_cond_destroy(&(hcamcorder->task_thread_cond));
+       g_mutex_clear(&(hcamcorder->mtsafe).lock);
+       g_cond_clear(&(hcamcorder->mtsafe).cond);
+       g_mutex_clear(&(hcamcorder->mtsafe).cmd_lock);
+       g_cond_clear(&(hcamcorder->mtsafe).cmd_cond);
+       g_mutex_clear(&(hcamcorder->mtsafe).asm_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).state_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).gst_state_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).gst_encode_state_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).message_cb_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).vcapture_cb_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).vstream_cb_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).astream_cb_lock);
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+       g_cond_clear(&(hcamcorder->mtsafe).resource_cond);
+       g_mutex_clear(&(hcamcorder->mtsafe).resource_lock);
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
+
+       g_mutex_clear(&hcamcorder->snd_info.open_mutex);
+       g_cond_clear(&hcamcorder->snd_info.open_cond);
+       g_mutex_clear(&hcamcorder->restart_preview_lock);
+       g_mutex_clear(&hcamcorder->task_thread_lock);
+       g_cond_clear(&hcamcorder->task_thread_cond);
 
        /* Release handle */
        memset(hcamcorder, 0x00, sizeof(mmf_camcorder_t));
@@ -860,17 +831,19 @@ int _mmcamcorder_realize(MMHandleType handle)
 {
        int ret = MM_ERROR_NONE;
        int ret_sound = MM_ERROR_NONE;
-       int ret_resource = MM_ERROR_NONE;
        int state = MM_CAMCORDER_STATE_NONE;
        int state_FROM = MM_CAMCORDER_STATE_NULL;
        int state_TO = MM_CAMCORDER_STATE_READY;
-       int display_surface_type = MM_DISPLAY_SURFACE_X;
+       int display_surface_type = MM_DISPLAY_SURFACE_OVERLAY;
        int pid_for_sound_focus = 0;
        double motion_rate = _MMCAMCORDER_DEFAULT_RECORDING_MOTION_RATE;
        char *videosink_element_type = NULL;
        const char *videosink_name = NULL;
        char *socket_path = NULL;
        int socket_path_len;
+#ifdef _MMCAMCORDER_RM_SUPPORT
+               int iret = RM_OK;
+#endif /* _MMCAMCORDER_RM_SUPPORT */
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
@@ -903,42 +876,9 @@ int _mmcamcorder_realize(MMHandleType handle)
        _mmcam_dbg_log("Profile mode [%d]", hcamcorder->type);
 
        mm_camcorder_get_attributes(handle, NULL,
-                                   MMCAM_DISPLAY_SURFACE, &display_surface_type,
-                                   MMCAM_CAMERA_RECORDING_MOTION_RATE, &motion_rate,
-                                   MMCAM_DISPLAY_SOCKET_PATH, &socket_path, &socket_path_len,
-                                   NULL);
-
-       /* set camera/recorder state to vconf key */
-       if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
-               int vconf_camera_state = 0;
-
-               /* get current camera state of vconf key */
-               vconf_get_int(VCONFKEY_CAMERA_STATE, &vconf_camera_state);
-               if (vconf_set_int(VCONFKEY_CAMERA_STATE, VCONFKEY_CAMERA_STATE_OPEN)) {
-                       _mmcam_dbg_log("VCONF ERROR %s : cur %d",strerror(errno),errno);
-                       if(errno == EPERM || errno == EACCES) {
-                               ret = MM_ERROR_COMMON_INVALID_PERMISSION;
-                               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
-                       }
-               }
-               _mmcam_dbg_log("VCONFKEY_CAMERA_STATE prev %d -> cur %d",
-                              vconf_camera_state, VCONFKEY_CAMERA_STATE_OPEN);
-       } else {
-               int vconf_recorder_state = 0;
-
-               /* get current recorder state of vconf key */
-               vconf_get_int(VCONFKEY_RECORDER_STATE, &vconf_recorder_state);
-               if (vconf_set_int(VCONFKEY_RECORDER_STATE, VCONFKEY_RECORDER_STATE_CREATED)) {
-                       _mmcam_dbg_log("VCONF ERROR %s : cur %d",strerror(errno),errno);
-                       if (errno == EPERM || errno == EACCES) {
-                               ret = MM_ERROR_COMMON_INVALID_PERMISSION;
-                               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
-                       }
-               }
-
-               _mmcam_dbg_log("VCONFKEY_RECORDER_STATE prev %d -> cur %d",
-                              vconf_recorder_state, VCONFKEY_RECORDER_STATE_CREATED);
-       }
+               MMCAM_DISPLAY_SURFACE, &display_surface_type,
+               MMCAM_CAMERA_RECORDING_MOTION_RATE, &motion_rate,
+               NULL);
 
        /* sound focus */
        if (hcamcorder->sound_focus_register) {
@@ -996,6 +936,79 @@ int _mmcamcorder_realize(MMHandleType handle)
                _mmcam_dbg_log("no need to register sound focus");
        }
 
+#ifdef _MMCAMCORDER_RM_SUPPORT
+       int preview_format = MM_PIXEL_FORMAT_NV12;
+       int qret = RM_OK;
+       int qret_avail = RM_OK;
+       rm_consumer_info rci;
+       int app_pid = 0;
+       int resource_count = 0;
+
+       mm_camcorder_get_attributes(handle, NULL,
+                                   MMCAM_PID_FOR_SOUND_FOCUS, &app_pid,
+                                   NULL);
+       rci.app_pid = app_pid;
+       aul_app_get_appid_bypid(rci.app_pid, rci.app_id, sizeof(rci.app_id));
+
+       /* RM register */
+       if (hcamcorder->rm_handle == 0) {
+               iret = rm_register((rm_resource_cb)_mmcamcorder_rm_callback, (void*)hcamcorder,
+                           &(hcamcorder->rm_handle), &rci);
+               if (iret != RM_OK) {
+                       _mmcam_dbg_err("rm_register fail");
+                       ret = MM_ERROR_POLICY_BLOCKED;
+                       goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+               }
+       }
+
+       mm_camcorder_get_attributes(handle, NULL,
+                                                               MMCAM_CAMERA_FORMAT, &preview_format,
+                                                               NULL);
+
+       if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO && preview_format == MM_PIXEL_FORMAT_ENCODED_H264) {
+
+               resource_count = 0;
+               memset(&hcamcorder->request_resources, 0x0, sizeof(rm_category_request_s));
+               memset(&hcamcorder->returned_devices, 0x0, sizeof(rm_device_return_s));
+               hcamcorder->request_resources.state[resource_count] = RM_STATE_EXCLUSIVE;
+               hcamcorder->request_resources.category_id[resource_count] = RM_CATEGORY_VIDEO_DECODER;
+               _mmcam_dbg_log("request video decoder resource - device category 0x%x",hcamcorder->request_resources.category_id[resource_count]);
+
+               resource_count++;
+               hcamcorder->request_resources.state[resource_count] = RM_STATE_EXCLUSIVE;
+               hcamcorder->request_resources.category_id[resource_count] = RM_CATEGORY_SCALER;
+               hcamcorder->request_resources.request_num = resource_count + 1;
+               _mmcam_dbg_log("request scaler resource - device category 0x%x",hcamcorder->request_resources.category_id[resource_count]);
+
+
+               qret = rm_query(hcamcorder->rm_handle, RM_QUERY_ALLOCATION, &(hcamcorder->request_resources), &qret_avail);
+
+               if (qret != RM_OK || qret_avail != RM_OK) {
+                       _mmcam_dbg_log("Resource manager main device request fail");
+
+                       resource_count = 0;
+                       hcamcorder->request_resources.category_id[resource_count] = RM_CATEGORY_VIDEO_DECODER_SUB;
+                       _mmcam_dbg_log("request video decoder resource - device category 0x%x",hcamcorder->request_resources.category_id[resource_count]);
+
+                       resource_count++;
+                       hcamcorder->request_resources.category_id[resource_count] = RM_CATEGORY_SCALER_SUB;
+                       _mmcam_dbg_log("request scaler resource - device category 0x%x",hcamcorder->request_resources.category_id[resource_count]);
+               }
+
+               resource_count++;
+               hcamcorder->request_resources.state[resource_count] = RM_STATE_EXCLUSIVE;
+               hcamcorder->request_resources.category_id[resource_count] = RM_CATEGORY_CAMERA;
+               hcamcorder->request_resources.request_num = resource_count + 1;
+               _mmcam_dbg_log("request camera resource - device category 0x%x",hcamcorder->request_resources.category_id[resource_count]);
+
+               iret = rm_allocate_resources(hcamcorder->rm_handle, &(hcamcorder->request_resources), &hcamcorder->returned_devices);
+               if (iret != RM_OK) {
+                       _mmcam_dbg_err("Resource allocation request failed");
+                       ret = MM_ERROR_POLICY_BLOCKED;
+                       goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+           }
+       }
+#endif /* _MMCAMCORDER_RM_SUPPORT */
 
        /* alloc sub context */
        hcamcorder->sub_context = _mmcamcorder_alloc_subcontext(hcamcorder->type);
@@ -1024,30 +1037,32 @@ int _mmcamcorder_realize(MMHandleType handle)
                _mmcam_dbg_warn("SupportDualStream [%d]", hcamcorder->sub_context->info_video->support_dual_stream);
        }
 
-       if (socket_path == NULL) {
-               _mmcam_dbg_warn("Socket Path is not properly set, -> to NullSink.");
+       switch (display_surface_type) {
+       case MM_DISPLAY_SURFACE_OVERLAY:
+               videosink_element_type = strdup("VideosinkElementOverlay");
+               break;
+       case MM_DISPLAY_SURFACE_EVAS:
+               videosink_element_type = strdup("VideosinkElementEvas");
+               break;
+       case MM_DISPLAY_SURFACE_GL:
+               videosink_element_type = strdup("VideosinkElementGL");
+               break;
+       case MM_DISPLAY_SURFACE_NULL:
                videosink_element_type = strdup("VideosinkElementNull");
-       } else {
-               switch (display_surface_type) {
-               case MM_DISPLAY_SURFACE_X:
-                       videosink_element_type = strdup("VideosinkElementX");
-                       break;
-               case MM_DISPLAY_SURFACE_EVAS:
-                       videosink_element_type = strdup("VideosinkElementEvas");
-                       break;
-               case MM_DISPLAY_SURFACE_GL:
-                       videosink_element_type = strdup("VideosinkElementGL");
-                       break;
-               case MM_DISPLAY_SURFACE_NULL:
+               break;
+       case MM_DISPLAY_SURFACE_REMOTE:
+               mm_camcorder_get_attributes(handle, NULL,
+                       MMCAM_DISPLAY_SOCKET_PATH, &socket_path, &socket_path_len,
+                       NULL);
+               if (socket_path == NULL) {
+                       _mmcam_dbg_warn("REMOTE surface, but socket path is NULL -> to NullSink");
                        videosink_element_type = strdup("VideosinkElementNull");
-                       break;
-               case MM_DISPLAY_SURFACE_REMOTE:
+               } else
                        videosink_element_type = strdup("VideosinkElementRemote");
-                       break;
-               default:
-                       videosink_element_type = strdup("VideosinkElementX");
-                       break;
-               }
+               break;
+       default:
+               videosink_element_type = strdup("VideosinkElementOverlay");
+               break;
        }
 
        /* check string of videosink element */
@@ -1084,8 +1099,32 @@ int _mmcamcorder_realize(MMHandleType handle)
        _mmcam_dbg_log("Support sensor encoded capture : %d", hcamcorder->sub_context->SensorEncodedCapture);
 
        if (hcamcorder->type == MM_CAMCORDER_MODE_VIDEO_CAPTURE) {
+               int dpm_camera_state = DPM_ALLOWED;
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+               gint64 end_time = 0;
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
+
+               /* check camera policy from DPM */
+               if (hcamcorder->dpm_policy) {
+                       if (dpm_restriction_get_camera_state(hcamcorder->dpm_policy, &dpm_camera_state) == DPM_ERROR_NONE) {
+                               _mmcam_dbg_log("DPM camera state %d", dpm_camera_state);
+                               if (dpm_camera_state == DPM_DISALLOWED) {
+                                       _mmcam_dbg_err("CAMERA DISALLOWED by DPM");
+                                       ret = MM_ERROR_POLICY_RESTRICTED;
+                                       goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+                               }
+                       } else {
+                               _mmcam_dbg_err("get DPM camera state failed, keep going...");
+                       }
+               } else {
+                       _mmcam_dbg_warn("NULL dpm_policy");
+               }
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+               hcamcorder->resource_manager.acquire_count = 0;
+
                /* prepare resource manager for camera */
-               if((_mmcamcorder_resource_manager_prepare(&hcamcorder->resource_manager, RESOURCE_TYPE_CAMERA))) {
+               ret = _mmcamcorder_resource_manager_prepare(&hcamcorder->resource_manager, MM_CAMCORDER_RESOURCE_TYPE_CAMERA);
+               if (ret != MM_ERROR_NONE) {
                        _mmcam_dbg_err("could not prepare for camera resource");
                        ret = MM_ERROR_CAMCORDER_INTERNAL;
                        goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
@@ -1093,21 +1132,50 @@ int _mmcamcorder_realize(MMHandleType handle)
 
                /* prepare resource manager for "video_overlay only if display surface is X" */
                mm_camcorder_get_attributes(handle, NULL,
-                                            MMCAM_DISPLAY_SURFACE, &display_surface_type,
-                                            NULL);
-               if(display_surface_type == MM_DISPLAY_SURFACE_X) {
-                       if((_mmcamcorder_resource_manager_prepare(&hcamcorder->resource_manager, RESOURCE_TYPE_VIDEO_OVERLAY))) {
+                       MMCAM_DISPLAY_SURFACE, &display_surface_type,
+                       NULL);
+
+               if (display_surface_type == MM_DISPLAY_SURFACE_OVERLAY) {
+                       ret = _mmcamcorder_resource_manager_prepare(&hcamcorder->resource_manager, MM_CAMCORDER_RESOURCE_TYPE_VIDEO_OVERLAY);
+                       if(ret != MM_ERROR_NONE) {
                                _mmcam_dbg_err("could not prepare for video overlay resource");
                                ret = MM_ERROR_CAMCORDER_INTERNAL;
                                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
                        }
                }
+
                /* acquire resources */
-               if((hcamcorder->resource_manager.rset && _mmcamcorder_resource_manager_acquire(&hcamcorder->resource_manager))) {
+               _MMCAMCORDER_LOCK_RESOURCE(hcamcorder);
+
+               if (hcamcorder->resource_manager.rset && _mmcamcorder_resource_manager_acquire(&hcamcorder->resource_manager)) {
+                       _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
+
                        _mmcam_dbg_err("could not acquire resources");
+
                        _mmcamcorder_resource_manager_unprepare(&hcamcorder->resource_manager);
                        goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
                }
+
+               if (hcamcorder->resource_manager.acquire_count > 0) {
+                       _mmcam_dbg_warn("wait for resource state change");
+
+                       /* wait for resource state change */
+                       end_time = g_get_monotonic_time() + (__MMCAMCORDER_RESOURCE_WAIT_TIME * G_TIME_SPAN_SECOND);
+
+                       if (_MMCAMCORDER_RESOURCE_WAIT_UNTIL(hcamcorder, end_time)) {
+                               _mmcam_dbg_warn("signal received");
+                       } else {
+                               _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
+                               _mmcam_dbg_err("timeout");
+                               ret = MM_ERROR_RESOURCE_INTERNAL;
+                               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+                       }
+               } else {
+                       _mmcam_dbg_log("already all acquired");
+               }
+
+               _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
        }
 
        /* create pipeline */
@@ -1146,9 +1214,10 @@ int _mmcamcorder_realize(MMHandleType handle)
        return MM_ERROR_NONE;
 
 _ERR_CAMCORDER_CMD:
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
        /* release hw resources */
        if (hcamcorder->type == MM_CAMCORDER_MODE_VIDEO_CAPTURE) {
-               ret_resource = _mmcamcorder_resource_manager_release(&hcamcorder->resource_manager);
+               int ret_resource = _mmcamcorder_resource_manager_release(&hcamcorder->resource_manager);
                if (ret_resource == MM_ERROR_RESOURCE_INVALID_STATE) {
                        _mmcam_dbg_warn("it could be in the middle of resource callback or there's no acquired resource");
                }
@@ -1160,26 +1229,7 @@ _ERR_CAMCORDER_CMD:
                        _mmcam_dbg_err("failed to unprepare resource manager, ret_resource(0x%x)", ret_resource);
                }
        }
-       /* rollback camera state to vconf key */
-       if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
-               int vconf_camera_state = 0;
-
-               /* get current camera state of vconf key */
-               vconf_get_int(VCONFKEY_CAMERA_STATE, &vconf_camera_state);
-               vconf_set_int(VCONFKEY_CAMERA_STATE, VCONFKEY_CAMERA_STATE_NULL);
-
-               _mmcam_dbg_log("VCONFKEY_CAMERA_STATE prev %d -> cur %d",
-                              vconf_camera_state, VCONFKEY_CAMERA_STATE_NULL);
-       } else {
-               int vconf_recorder_state = 0;
-
-               /* get current recorder state of vconf key */
-               vconf_get_int(VCONFKEY_RECORDER_STATE, &vconf_recorder_state);
-               vconf_set_int(VCONFKEY_RECORDER_STATE, VCONFKEY_RECORDER_STATE_NULL);
-
-               _mmcam_dbg_log("VCONFKEY_RECORDER_STATE prev %d -> cur %d",
-                              vconf_recorder_state, VCONFKEY_RECORDER_STATE_NULL);
-       }
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
 
 _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
@@ -1205,6 +1255,27 @@ _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
                                }
                }
        }
+#ifdef _MMCAMCORDER_RM_SUPPORT
+       if (hcamcorder->rm_handle) {
+               if (hcamcorder->returned_devices.allocated_num > 0) {
+                       int idx = 0;
+                       rm_device_request_s requested;
+                       memset(&requested, 0x0, sizeof(rm_device_request_s));
+                       requested.request_num = hcamcorder->returned_devices.allocated_num;
+                       for (idx = 0; idx < requested.request_num; idx++) {
+                               requested.device_id[idx] = hcamcorder->returned_devices.device_id[idx];
+                       }
+                       iret = rm_deallocate_resources(hcamcorder->rm_handle, &requested);
+                       if (iret != RM_OK)
+                               _mmcam_dbg_err("Resource deallocation request failed ");
+               }
+               /* unregister RM */
+               int ires = rm_unregister(hcamcorder->rm_handle);
+               if (ires != RM_OK)
+                       _mmcam_dbg_err("rm_unregister() failed");
+               hcamcorder->rm_handle = 0;
+       }
+#endif /* _MMCAMCORDER_RM_SUPPORT*/
 
 _ERR_CAMCORDER_CMD_PRECON:
        _mmcam_dbg_err("Realize fail (type %d, state %d, ret %x)",
@@ -1253,13 +1324,14 @@ int _mmcamcorder_unrealize(MMHandleType handle)
                hcamcorder->sub_context = NULL;
        }
 
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
        if (hcamcorder->type == MM_CAMCORDER_MODE_VIDEO_CAPTURE) {
+               /* release resource */
                ret = _mmcamcorder_resource_manager_release(&hcamcorder->resource_manager);
                if (ret == MM_ERROR_RESOURCE_INVALID_STATE) {
                        _mmcam_dbg_warn("it could be in the middle of resource callback or there's no acquired resource");
                        ret = MM_ERROR_NONE;
-               }
-               else if (ret != MM_ERROR_NONE) {
+               } else if (ret != MM_ERROR_NONE) {
                        _mmcam_dbg_err("failed to release resource, ret(0x%x)", ret);
                        ret = MM_ERROR_CAMCORDER_INTERNAL;
                        goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
@@ -1269,6 +1341,23 @@ int _mmcamcorder_unrealize(MMHandleType handle)
                        _mmcam_dbg_err("failed to unprepare resource manager, ret(0x%x)", ret);
                }
        }
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
+
+#ifdef _MMCAMCORDER_RM_SUPPORT
+       if (hcamcorder->rm_handle && (hcamcorder->returned_devices.allocated_num > 0)) {
+                       int iret = RM_OK;
+                       int idx = 0;
+                       rm_device_request_s requested;
+                       memset(&requested, 0x0, sizeof(rm_device_request_s));
+                       requested.request_num = hcamcorder->returned_devices.allocated_num;
+                       for (idx = 0; idx < requested.request_num; idx++) {
+                               requested.device_id[idx] = hcamcorder->returned_devices.device_id[idx];
+                       }
+                       iret = rm_deallocate_resources(hcamcorder->rm_handle, &requested);
+                       if (iret != RM_OK)
+                               _mmcam_dbg_err("Resource deallocation request failed ");
+               }
+#endif /* _MMCAMCORDER_RM_SUPPORT*/
 
        /* Deinitialize main context member */
        hcamcorder->command = NULL;
@@ -1312,27 +1401,6 @@ int _mmcamcorder_unrealize(MMHandleType handle)
                }
        }
 
-       /* set camera state to vconf key */
-       if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
-               int vconf_camera_state = 0;
-
-               /* get current camera state of vconf key */
-               vconf_get_int(VCONFKEY_CAMERA_STATE, &vconf_camera_state);
-               vconf_set_int(VCONFKEY_CAMERA_STATE, VCONFKEY_CAMERA_STATE_NULL);
-
-               _mmcam_dbg_log("VCONFKEY_CAMERA_STATE prev %d -> cur %d",
-                              vconf_camera_state, VCONFKEY_CAMERA_STATE_NULL);
-       } else {
-               int vconf_recorder_state = 0;
-
-               /* get current recorder state of vconf key */
-               vconf_get_int(VCONFKEY_RECORDER_STATE, &vconf_recorder_state);
-               vconf_set_int(VCONFKEY_RECORDER_STATE, VCONFKEY_RECORDER_STATE_NULL);
-
-               _mmcam_dbg_log("VCONFKEY_RECORDER_STATE prev %d -> cur %d",
-                              vconf_recorder_state, VCONFKEY_RECORDER_STATE_NULL);
-       }
-
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
        _mmcamcorder_set_state(handle, state_TO);
@@ -1389,6 +1457,19 @@ int _mmcamcorder_start(MMHandleType handle)
 
        /* set attributes related sensor */
        if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
+               /* init for gdbus */
+               hcamcorder->gdbus_conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, NULL);
+               if (hcamcorder->gdbus_conn == NULL) {
+                       _mmcam_dbg_err("failed to get gdbus");
+                       ret = MM_ERROR_CAMCORDER_RESOURCE_CREATION;
+                       goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+               }
+
+               g_mutex_init(&hcamcorder->gdbus_info_sound.sync_mutex);
+               g_cond_init(&hcamcorder->gdbus_info_sound.sync_cond);
+               g_mutex_init(&hcamcorder->gdbus_info_solo_sound.sync_mutex);
+               g_cond_init(&hcamcorder->gdbus_info_solo_sound.sync_cond);
+
                _mmcamcorder_set_attribute_to_camsensor(handle);
        }
 
@@ -1404,24 +1485,21 @@ int _mmcamcorder_start(MMHandleType handle)
 
        _mmcamcorder_set_state(handle, state_TO);
 
-       if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
-               int vconf_camera_state = 0;
-
-               /* check camera state of vconf key */
-               vconf_get_int(VCONFKEY_CAMERA_STATE, &vconf_camera_state);
-
-               /* set camera state to vconf key */
-               vconf_set_int(VCONFKEY_CAMERA_STATE, VCONFKEY_CAMERA_STATE_PREVIEW);
-
-               _mmcam_dbg_log("VCONFKEY_CAMERA_STATE prev %d -> cur %d",
-                              vconf_camera_state, VCONFKEY_CAMERA_STATE_PREVIEW);
-       }
-
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
        return MM_ERROR_NONE;
 
 _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
+       if (hcamcorder->gdbus_conn) {
+               g_object_unref(hcamcorder->gdbus_conn);
+               hcamcorder->gdbus_conn = NULL;
+
+               g_mutex_clear(&hcamcorder->gdbus_info_sound.sync_mutex);
+               g_cond_clear(&hcamcorder->gdbus_info_sound.sync_cond);
+               g_mutex_clear(&hcamcorder->gdbus_info_solo_sound.sync_mutex);
+               g_cond_clear(&hcamcorder->gdbus_info_solo_sound.sync_cond);
+       }
+
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
 _ERR_CAMCORDER_CMD_PRECON:
@@ -1477,16 +1555,31 @@ int _mmcamcorder_stop(MMHandleType handle)
        _mmcamcorder_set_state(handle, state_TO);
 
        if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
-               int vconf_camera_state = 0;
-
-               /* check camera state of vconf key */
-               vconf_get_int(VCONFKEY_CAMERA_STATE, &vconf_camera_state);
+               g_mutex_lock(&hcamcorder->gdbus_info_sound.sync_mutex);
+               if (hcamcorder->gdbus_info_sound.subscribe_id > 0) {
+                       _mmcam_dbg_warn("subscribe_id[%u] is remained. remove it.",
+                               hcamcorder->gdbus_info_sound.subscribe_id);
+                       g_dbus_connection_signal_unsubscribe(hcamcorder->gdbus_conn,
+                               hcamcorder->gdbus_info_sound.subscribe_id);
+               }
+               g_mutex_unlock(&hcamcorder->gdbus_info_sound.sync_mutex);
+
+               g_mutex_lock(&hcamcorder->gdbus_info_solo_sound.sync_mutex);
+               if (hcamcorder->gdbus_info_solo_sound.subscribe_id > 0) {
+                       _mmcam_dbg_warn("subscribe_id[%u] is remained. remove it.",
+                               hcamcorder->gdbus_info_solo_sound.subscribe_id);
+                       g_dbus_connection_signal_unsubscribe(hcamcorder->gdbus_conn,
+                               hcamcorder->gdbus_info_solo_sound.subscribe_id);
+               }
+               g_mutex_unlock(&hcamcorder->gdbus_info_solo_sound.sync_mutex);
 
-               /* set camera state to vconf key */
-               vconf_set_int(VCONFKEY_CAMERA_STATE, VCONFKEY_CAMERA_STATE_OPEN);
+               g_object_unref(hcamcorder->gdbus_conn);
+               hcamcorder->gdbus_conn = NULL;
 
-               _mmcam_dbg_log("VCONFKEY_CAMERA_STATE prev %d -> cur %d",
-                              vconf_camera_state, VCONFKEY_CAMERA_STATE_OPEN);
+               g_mutex_clear(&hcamcorder->gdbus_info_sound.sync_mutex);
+               g_cond_clear(&hcamcorder->gdbus_info_sound.sync_cond);
+               g_mutex_clear(&hcamcorder->gdbus_info_solo_sound.sync_mutex);
+               g_cond_clear(&hcamcorder->gdbus_info_solo_sound.sync_cond);
        }
 
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
@@ -1546,16 +1639,16 @@ int _mmcamcorder_capture_start(MMHandleType handle)
                        ret = MM_ERROR_CAMCORDER_DEVICE_BUSY;
                        goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
                } else {
-                       pthread_mutex_lock(&(hcamcorder->task_thread_lock));
+                       g_mutex_lock(&hcamcorder->task_thread_lock);
                        if (hcamcorder->task_thread_state == _MMCAMCORDER_TASK_THREAD_STATE_NONE) {
                                hcamcorder->capture_in_recording = TRUE;
                                hcamcorder->task_thread_state = _MMCAMCORDER_TASK_THREAD_STATE_CHECK_CAPTURE_IN_RECORDING;
                                _mmcam_dbg_log("send signal for capture in recording");
-                               pthread_cond_signal(&(hcamcorder->task_thread_cond));
-                               pthread_mutex_unlock(&(hcamcorder->task_thread_lock));
+                               g_cond_signal(&hcamcorder->task_thread_cond);
+                               g_mutex_unlock(&hcamcorder->task_thread_lock);
                        } else {
                                _mmcam_dbg_err("task thread busy : %d", hcamcorder->task_thread_state);
-                               pthread_mutex_unlock(&(hcamcorder->task_thread_lock));
+                               g_mutex_unlock(&hcamcorder->task_thread_lock);
                                ret = MM_ERROR_CAMCORDER_INVALID_STATE;
                                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
                        }
@@ -1655,6 +1748,7 @@ int _mmcamcorder_record(MMHandleType handle)
        int state_FROM1 = MM_CAMCORDER_STATE_PREPARE;
        int state_FROM2 = MM_CAMCORDER_STATE_PAUSED;
        int state_TO = MM_CAMCORDER_STATE_RECORDING;
+       int dpm_mic_state = DPM_ALLOWED;
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
@@ -1682,6 +1776,22 @@ int _mmcamcorder_record(MMHandleType handle)
        /* initialize error code */
        hcamcorder->error_code = MM_ERROR_NONE;
 
+       /* check mic policy from DPM */
+       if (hcamcorder->dpm_policy) {
+               if (dpm_restriction_get_microphone_state(hcamcorder->dpm_policy, &dpm_mic_state) == DPM_ERROR_NONE) {
+                       _mmcam_dbg_log("DPM mic state %d", dpm_mic_state);
+                       if (dpm_mic_state == DPM_DISALLOWED) {
+                               _mmcam_dbg_err("MIC DISALLOWED by DPM");
+                               ret = MM_ERROR_COMMON_INVALID_PERMISSION;
+                               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+                       }
+               } else {
+                       _mmcam_dbg_err("get DPM mic state failed, keep going...");
+               }
+       } else {
+               _mmcam_dbg_warn("NULL dpm_policy");
+       }
+
        ret = hcamcorder->command((MMHandleType)hcamcorder, _MMCamcorder_CMD_RECORD);
        if (ret != MM_ERROR_NONE) {
                /* check internal error of gstreamer */
@@ -1694,27 +1804,6 @@ int _mmcamcorder_record(MMHandleType handle)
 
        _mmcamcorder_set_state(handle, state_TO);
 
-       /* set camera state to vconf key */
-       if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
-               int vconf_camera_state = 0;
-
-               /* get current camera state of vconf key */
-               vconf_get_int(VCONFKEY_CAMERA_STATE, &vconf_camera_state);
-               vconf_set_int(VCONFKEY_CAMERA_STATE, VCONFKEY_CAMERA_STATE_RECORDING);
-
-               _mmcam_dbg_log("VCONFKEY_CAMERA_STATE prev %d -> cur %d",
-                              vconf_camera_state, VCONFKEY_CAMERA_STATE_RECORDING);
-       } else {
-               int vconf_recorder_state = 0;
-
-               /* get current recorder state of vconf key */
-               vconf_get_int(VCONFKEY_RECORDER_STATE, &vconf_recorder_state);
-               vconf_set_int(VCONFKEY_RECORDER_STATE, VCONFKEY_RECORDER_STATE_RECORDING);
-
-               _mmcam_dbg_log("VCONFKEY_RECORDER_STATE prev %d -> cur %d",
-                              vconf_recorder_state, VCONFKEY_RECORDER_STATE_RECORDING);
-       }
-
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
        return MM_ERROR_NONE;
@@ -1775,27 +1864,6 @@ int _mmcamcorder_pause(MMHandleType handle)
 
        _mmcamcorder_set_state(handle, state_TO);
 
-       /* set camera state to vconf key */
-       if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
-               int vconf_camera_state = 0;
-
-               /* get current camera state of vconf key */
-               vconf_get_int(VCONFKEY_CAMERA_STATE, &vconf_camera_state);
-               vconf_set_int(VCONFKEY_CAMERA_STATE, VCONFKEY_CAMERA_STATE_RECORDING_PAUSE);
-
-               _mmcam_dbg_log("VCONFKEY_CAMERA_STATE prev %d -> cur %d",
-                              vconf_camera_state, VCONFKEY_CAMERA_STATE_RECORDING_PAUSE);
-       } else {
-               int vconf_recorder_state = 0;
-
-               /* get current recorder state of vconf key */
-               vconf_get_int(VCONFKEY_RECORDER_STATE, &vconf_recorder_state);
-               vconf_set_int(VCONFKEY_RECORDER_STATE, VCONFKEY_RECORDER_STATE_RECORDING_PAUSE);
-
-               _mmcam_dbg_log("VCONFKEY_RECORDER_STATE prev %d -> cur %d",
-                              vconf_recorder_state, VCONFKEY_RECORDER_STATE_RECORDING_PAUSE);
-       }
-
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
        return MM_ERROR_NONE;
@@ -1843,32 +1911,14 @@ int _mmcamcorder_commit(MMHandleType handle)
                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
        }
 
+       /* initialize error code */
+       hcamcorder->error_code = MM_ERROR_NONE;
+
        ret = hcamcorder->command((MMHandleType)hcamcorder, _MMCamcorder_CMD_COMMIT);
        if (ret != MM_ERROR_NONE) {
                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
        }
 
-       /* set camera state to vconf key */
-       if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
-               int vconf_camera_state = 0;
-
-               /* get current camera state of vconf key */
-               vconf_get_int(VCONFKEY_CAMERA_STATE, &vconf_camera_state);
-               vconf_set_int(VCONFKEY_CAMERA_STATE, VCONFKEY_CAMERA_STATE_PREVIEW);
-
-               _mmcam_dbg_log("VCONFKEY_CAMERA_STATE prev %d -> cur %d",
-                              vconf_camera_state, VCONFKEY_CAMERA_STATE_PREVIEW);
-       } else {
-               int vconf_recorder_state = 0;
-
-               /* get current recorder state of vconf key */
-               vconf_get_int(VCONFKEY_RECORDER_STATE, &vconf_recorder_state);
-               vconf_set_int(VCONFKEY_RECORDER_STATE, VCONFKEY_RECORDER_STATE_CREATED);
-
-               _mmcam_dbg_log("VCONFKEY_RECORDER_STATE prev %d -> cur %d",
-                              vconf_recorder_state, VCONFKEY_RECORDER_STATE_CREATED);
-       }
-
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
        _mmcamcorder_set_state(handle,state_TO);
@@ -1925,27 +1975,6 @@ int _mmcamcorder_cancel(MMHandleType handle)
 
        _mmcamcorder_set_state(handle, state_TO);
 
-       /* set camera state to vconf key */
-       if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
-               int vconf_camera_state = 0;
-
-               /* get current camera state of vconf key */
-               vconf_get_int(VCONFKEY_CAMERA_STATE, &vconf_camera_state);
-               vconf_set_int(VCONFKEY_CAMERA_STATE, VCONFKEY_CAMERA_STATE_PREVIEW);
-
-               _mmcam_dbg_log("VCONFKEY_CAMERA_STATE prev %d -> cur %d",
-                              vconf_camera_state, VCONFKEY_CAMERA_STATE_PREVIEW);
-       } else {
-               int vconf_recorder_state = 0;
-
-               /* get current recorder state of vconf key */
-               vconf_get_int(VCONFKEY_RECORDER_STATE, &vconf_recorder_state);
-               vconf_set_int(VCONFKEY_RECORDER_STATE, VCONFKEY_RECORDER_STATE_CREATED);
-
-               _mmcam_dbg_log("VCONFKEY_RECORDER_STATE prev %d -> cur %d",
-                              vconf_recorder_state, VCONFKEY_RECORDER_STATE_CREATED);
-       }
-
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
        return MM_ERROR_NONE;
@@ -2134,6 +2163,7 @@ int _mmcamcorder_init_focusing(MMHandleType handle)
        control = GST_CAMERA_CONTROL (sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst);
        if (control == NULL) {
                _mmcam_dbg_err("cast CAMERA_CONTROL failed");
+               _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
                return MM_ERROR_CAMCORDER_INTERNAL;
        }
 
@@ -2527,6 +2557,10 @@ void _mmcamcorder_set_state(MMHandleType handle, int state)
                        msg.id = MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_RM;
                        msg.param.state.code = MM_ERROR_NONE;
                        break;
+               case _MMCAMCORDER_STATE_CHANGE_BY_DPM:
+                       msg.id = MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_SECURITY;
+                       msg.param.state.code = MM_ERROR_NONE;
+                       break;
                case _MMCAMCORDER_STATE_CHANGE_NORMAL:
                default:
                        msg.id = MM_MESSAGE_CAMCORDER_STATE_CHANGED;
@@ -2581,32 +2615,29 @@ _MMCamcorderSubContext *_mmcamcorder_alloc_subcontext(int type)
        /* alloc info for each mode */
        switch (type) {
        case MM_CAMCORDER_MODE_AUDIO:
-               sc->info_audio = malloc( sizeof(_MMCamcorderAudioInfo));
+               sc->info_audio = g_malloc0( sizeof(_MMCamcorderAudioInfo));
                if(!sc->info_audio) {
                        _mmcam_dbg_err("Failed to alloc info structure");
                        goto ALLOC_SUBCONTEXT_FAILED;
                }
-               memset(sc->info_audio, 0x00, sizeof(_MMCamcorderAudioInfo));
                break;
        case MM_CAMCORDER_MODE_VIDEO_CAPTURE:
        default:
-               sc->info_image = malloc( sizeof(_MMCamcorderImageInfo));
+               sc->info_image = g_malloc0( sizeof(_MMCamcorderImageInfo));
                if(!sc->info_image) {
                        _mmcam_dbg_err("Failed to alloc info structure");
                        goto ALLOC_SUBCONTEXT_FAILED;
                }
-               memset(sc->info_image, 0x00, sizeof(_MMCamcorderImageInfo));
 
                /* init sound status */
                sc->info_image->sound_status = _SOUND_STATUS_INIT;
 
-               sc->info_video = malloc( sizeof(_MMCamcorderVideoInfo));
+               sc->info_video = g_malloc0( sizeof(_MMCamcorderVideoInfo));
                if(!sc->info_video) {
                        _mmcam_dbg_err("Failed to alloc info structure");
                        goto ALLOC_SUBCONTEXT_FAILED;
                }
-               memset(sc->info_video, 0x00, sizeof(_MMCamcorderVideoInfo));
-               pthread_mutex_init(&(sc->info_video->size_check_lock), NULL);
+               g_mutex_init(&sc->info_video->size_check_lock);
                break;
        }
 
@@ -2643,19 +2674,12 @@ _MMCamcorderSubContext *_mmcamcorder_alloc_subcontext(int type)
 
 ALLOC_SUBCONTEXT_FAILED:
        if (sc) {
-               if (sc->info_audio) {
-                       free(sc->info_audio);
-                       sc->info_audio = NULL;
-               }
-               if (sc->info_image) {
-                       free(sc->info_image);
-                       sc->info_image = NULL;
-               }
+               SAFE_G_FREE(sc->info_audio);
+               SAFE_G_FREE(sc->info_image);
                if (sc->info_video) {
-                       pthread_mutex_destroy(&(sc->info_video->size_check_lock));
-                       free(sc->info_video);
-                       sc->info_video = NULL;
+                       g_mutex_clear(&sc->info_video->size_check_lock);
                }
+               SAFE_G_FREE(sc->info_video);
                if (sc->element) {
                        free(sc->element);
                        sc->element = NULL;
@@ -2697,21 +2721,15 @@ void _mmcamcorder_dealloc_subcontext(_MMCamcorderSubContext *sc)
 
                if (sc->info_video) {
                        _mmcam_dbg_log("release info_video");
-                       if (sc->info_video->filename) {
-                               free(sc->info_video->filename);
-                               sc->info_video->filename = NULL;
-                       }
-                       pthread_mutex_destroy(&(sc->info_video->size_check_lock));
+                       SAFE_G_FREE(sc->info_video->filename);
+                       g_mutex_clear(&sc->info_video->size_check_lock);
                        free(sc->info_video);
                        sc->info_video = NULL;
                }
 
                if (sc->info_audio) {
                        _mmcam_dbg_log("release info_audio");
-                       if (sc->info_audio->filename) {
-                               free(sc->info_audio->filename);
-                               sc->info_audio->filename = NULL;
-                       }
+                       SAFE_G_FREE(sc->info_audio->filename);
                        free(sc->info_audio);
                        sc->info_audio = NULL;
                }
@@ -2759,41 +2777,30 @@ gboolean _mmcamcorder_pipeline_cb_message(GstBus *bus, GstMessage *message, gpoi
                break;
        case GST_MESSAGE_EOS:
        {
-               _mmcam_dbg_log ("Got EOS from element \"%s\".",
-                               GST_STR_NULL(GST_ELEMENT_NAME(GST_MESSAGE_SRC(message))));
-
-               sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
-               mmf_return_val_if_fail(sc, TRUE);
-
-               if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
-                       mmf_return_val_if_fail(sc->info_video, TRUE);
-                       if (sc->info_video->b_commiting) {
-                               _mmcamcorder_video_handle_eos((MMHandleType)hcamcorder);
-                       }
-               } else {
-                       mmf_return_val_if_fail(sc->info_audio, TRUE);
-                       if (sc->info_audio->b_commiting) {
-                               _mmcamcorder_audio_handle_eos((MMHandleType)hcamcorder);
-                       }
-               }
-
-               sc->bget_eos = TRUE;
-
+               _mmcam_dbg_err("Got EOS from element \"%s\"... but should not be reached here!",
+                       GST_STR_NULL(GST_ELEMENT_NAME(GST_MESSAGE_SRC(message))));
                break;
        }
        case GST_MESSAGE_ERROR:
        {
-               GError *err;
-               gchar *debug;
-               gst_message_parse_error(message, &err, &debug);
+               GError *err = NULL;
+               gchar *debug = NULL;
 
-               _mmcam_dbg_err ("GSTERR: %s", err->message);
-               _mmcam_dbg_err ("Error Debug: %s", debug);
+               gst_message_parse_error(message, &err, &debug);
 
                __mmcamcorder_handle_gst_error((MMHandleType)hcamcorder, message, err);
 
-               g_error_free (err);
-               g_free (debug);
+               if (err) {
+                       _mmcam_dbg_err("GSTERR: %s", err->message);
+                       g_error_free(err);
+                       err = NULL;
+               }
+
+               if (debug) {
+                       _mmcam_dbg_err("Error Debug: %s", debug);
+                       g_free(debug);
+                       debug = NULL;
+               }
                break;
        }
        case GST_MESSAGE_WARNING:
@@ -3039,13 +3046,10 @@ GstBusSyncReply _mmcamcorder_pipeline_bus_sync_callback(GstBus *bus, GstMessage
                                goto DROP_MESSAGE;
                        }
 
-                       cam_fd_info = (MMCamFaceDetectInfo *)malloc(sizeof(MMCamFaceDetectInfo));
+                       cam_fd_info = (MMCamFaceDetectInfo *)g_malloc(sizeof(MMCamFaceDetectInfo));
                        if (cam_fd_info == NULL) {
                                _mmcam_dbg_warn("cam_fd_info alloc failed");
-
-                               free(fd_info);
-                               fd_info = NULL;
-
+                               SAFE_FREE(fd_info);
                                goto DROP_MESSAGE;
                        }
 
@@ -3053,7 +3057,7 @@ GstBusSyncReply _mmcamcorder_pipeline_bus_sync_callback(GstBus *bus, GstMessage
                        cam_fd_info->num_of_faces = fd_info->num_of_faces;
 
                        if (cam_fd_info->num_of_faces > 0) {
-                               cam_fd_info->face_info = (MMCamFaceInfo *)malloc(sizeof(MMCamFaceInfo) * cam_fd_info->num_of_faces);
+                               cam_fd_info->face_info = (MMCamFaceInfo *)g_malloc(sizeof(MMCamFaceInfo) * cam_fd_info->num_of_faces);
                                if (cam_fd_info->face_info) {
                                        /* set information of each face */
                                        for (i = 0 ; i < fd_info->num_of_faces ; i++) {
@@ -3077,8 +3081,7 @@ GstBusSyncReply _mmcamcorder_pipeline_bus_sync_callback(GstBus *bus, GstMessage
                                        _mmcam_dbg_warn("MMCamFaceInfo alloc failed");
 
                                        /* free allocated memory that is not sent */
-                                       free(cam_fd_info);
-                                       cam_fd_info = NULL;
+                                       SAFE_G_FREE(cam_fd_info);
                                }
                        } else {
                                cam_fd_info->face_info = NULL;
@@ -3103,10 +3106,9 @@ GstBusSyncReply _mmcamcorder_pipeline_bus_sync_callback(GstBus *bus, GstMessage
                        int capture_done = FALSE;
 
                        if (gst_structure_get_int(gst_message_get_structure(message), "capture-done", &capture_done)) {
-                               sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
-                               if (sc && sc->info_image) {
+                               if (sc->info_image) {
                                        /* play capture sound */
-                                       _mmcamcorder_sound_solo_play((MMHandleType)hcamcorder, _MMCAMCORDER_FILEPATH_CAPTURE_SND, FALSE);
+                                       _mmcamcorder_sound_solo_play((MMHandleType)hcamcorder, _MMCAMCORDER_SAMPLE_SOUND_NAME_CAPTURE01, FALSE);
                                }
                        }
 
@@ -3115,6 +3117,7 @@ GstBusSyncReply _mmcamcorder_pipeline_bus_sync_callback(GstBus *bus, GstMessage
        }
 
        return GST_BUS_PASS;
+
 DROP_MESSAGE:
        gst_message_unref(message);
        message = NULL;
@@ -3123,7 +3126,7 @@ DROP_MESSAGE:
 }
 
 
-GstBusSyncReply _mmcamcorder_audio_pipeline_bus_sync_callback(GstBus *bus, GstMessage *message, gpointer data)
+GstBusSyncReply _mmcamcorder_encode_pipeline_bus_sync_callback(GstBus *bus, GstMessage *message, gpointer data)
 {
        GstElement *element = NULL;
        GError *err = NULL;
@@ -3138,7 +3141,20 @@ GstBusSyncReply _mmcamcorder_audio_pipeline_bus_sync_callback(GstBus *bus, GstMe
        sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
        mmf_return_val_if_fail(sc, GST_BUS_PASS);
 
-       if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_ERROR) {
+       if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_EOS) {
+               _mmcam_dbg_log("got EOS from pipeline");
+
+               _MMCAMCORDER_LOCK(hcamcorder);
+
+               sc->bget_eos = TRUE;
+               _MMCAMCORDER_SIGNAL(hcamcorder);
+
+               _MMCAMCORDER_UNLOCK(hcamcorder);
+
+               goto DROP_MESSAGE;
+       } else if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_ERROR) {
+               _MMCamcorderMsgItem msg;
+
                /* parse error message */
                gst_message_parse_error(message, &err, &debug_info);
 
@@ -3156,35 +3172,98 @@ GstBusSyncReply _mmcamcorder_audio_pipeline_bus_sync_callback(GstBus *bus, GstMe
                /* set videosrc element to compare */
                element = GST_ELEMENT_CAST(sc->encode_element[_MMCAMCORDER_AUDIOSRC_SRC].gst);
 
-               /* check domain[RESOURCE] and element[VIDEOSRC] */
+               /* check domain[RESOURCE] and element[AUDIOSRC] */
                if (err->domain == GST_RESOURCE_ERROR &&
                    GST_ELEMENT_CAST(message->src) == element) {
-                       _MMCamcorderMsgItem msg;
                        switch (err->code) {
                        case GST_RESOURCE_ERROR_OPEN_READ_WRITE:
                        case GST_RESOURCE_ERROR_OPEN_WRITE:
                                _mmcam_dbg_err("audio device [open failed]");
-                               hcamcorder->error_code = MM_ERROR_COMMON_INVALID_PERMISSION;
+
                                /* post error to application */
                                hcamcorder->error_occurs = TRUE;
+                               hcamcorder->error_code = MM_ERROR_COMMON_INVALID_PERMISSION;
+
                                msg.id = MM_MESSAGE_CAMCORDER_ERROR;
                                msg.param.code = hcamcorder->error_code;
-                               _mmcam_dbg_err(" error : sc->error_occurs %d", hcamcorder->error_occurs);
-                               g_error_free(err);
+
                                _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg);
-                               gst_message_unref(message);
-                               message = NULL;
-                               return GST_BUS_DROP;
+
+                               _mmcam_dbg_err(" error : sc->error_occurs %d", hcamcorder->error_occurs);
+
+                               goto DROP_MESSAGE;
+                       default:
+                               break;
+                       }
+               } else {
+                       gboolean b_commiting = FALSE;
+
+                       if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
+                               mmf_return_val_if_fail(sc->info_video, GST_BUS_PASS);
+                               b_commiting = sc->info_video->b_commiting;
+                       } else {
+                               mmf_return_val_if_fail(sc->info_audio, GST_BUS_PASS);
+                               b_commiting = sc->info_audio->b_commiting;
+                       }
+
+                       _MMCAMCORDER_LOCK(hcamcorder);
+
+                       switch (err->code) {
+                       case GST_RESOURCE_ERROR_WRITE:
+                               _mmcam_dbg_err("File write error");
+                               hcamcorder->error_code = MM_ERROR_FILE_WRITE;
+                               break;
+                       case GST_RESOURCE_ERROR_NO_SPACE_LEFT:
+                               _mmcam_dbg_err("No left space");
+                               hcamcorder->error_code = MM_MESSAGE_CAMCORDER_NO_FREE_SPACE;
+                               break;
+                       case GST_RESOURCE_ERROR_OPEN_WRITE:
+                               _mmcam_dbg_err("Out of storage");
+                               hcamcorder->error_code = MM_ERROR_OUT_OF_STORAGE;
+                               break;
+                       case GST_RESOURCE_ERROR_SEEK:
+                               _mmcam_dbg_err("File read(seek)");
+                               hcamcorder->error_code = MM_ERROR_FILE_READ;
+                               break;
                        default:
+                               _mmcam_dbg_err("Resource error(%d)", err->code);
+                               hcamcorder->error_code = MM_ERROR_CAMCORDER_GST_RESOURCE;
                                break;
                        }
+
+                       if (b_commiting) {
+                               _MMCAMCORDER_SIGNAL(hcamcorder);
+                               _MMCAMCORDER_UNLOCK(hcamcorder);
+                       } else {
+                               _MMCAMCORDER_UNLOCK(hcamcorder);
+
+                               msg.id = MM_MESSAGE_CAMCORDER_ERROR;
+                               msg.param.code = hcamcorder->error_code;
+
+                               _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg);
+                       }
                }
 
-               g_error_free(err);
+               goto DROP_MESSAGE;
+       }
 
+       if (err) {
+               g_error_free(err);
+               err = NULL;
        }
 
        return GST_BUS_PASS;
+
+DROP_MESSAGE:
+       if (err) {
+               g_error_free(err);
+               err = NULL;
+       }
+
+       gst_message_unref(message);
+       message = NULL;
+
+       return GST_BUS_DROP;
 }
 
 
@@ -3269,7 +3348,7 @@ void _mmcamcorder_sound_focus_watch_cb(mm_sound_focus_type_e focus_type, mm_soun
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(user_data);
        int current_state = MM_CAMCORDER_STATE_NONE;
 
-       mmf_return_if_fail((MMHandleType)hcamcorder);
+       mmf_return_if_fail(hcamcorder);
 
        current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder);
        if (current_state <= MM_CAMCORDER_STATE_NONE ||
@@ -3331,6 +3410,43 @@ void _mmcamcorder_sound_focus_watch_cb(mm_sound_focus_type_e focus_type, mm_soun
 }
 
 
+void _mmcamcorder_dpm_camera_policy_changed_cb(const char *name, const char *value, void *user_data)
+{
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(user_data);
+       int current_state = MM_CAMCORDER_STATE_NONE;
+
+       mmf_return_if_fail(hcamcorder);
+       mmf_return_if_fail(value);
+
+       current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder);
+       if (current_state <= MM_CAMCORDER_STATE_NONE ||
+           current_state >= MM_CAMCORDER_STATE_NUM) {
+               _mmcam_dbg_err("Abnormal state. Or null handle. (%p, %d)", hcamcorder, current_state);
+               return;
+       }
+
+       _mmcam_dbg_warn("camera policy [%s], current state [%d]", value, current_state);
+
+       if (!strcmp(value, "disallowed")) {
+               _MMCAMCORDER_LOCK_ASM(hcamcorder);
+
+               /* set value to inform a status is changed by DPM */
+               hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_BY_DPM;
+
+               __mmcamcorder_force_stop(hcamcorder);
+
+               /* restore value */
+               hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_NORMAL;
+
+               _MMCAMCORDER_UNLOCK_ASM(hcamcorder);
+       }
+
+       _mmcam_dbg_warn("done");
+
+       return;
+}
+
+
 int _mmcamcorder_create_pipeline(MMHandleType handle, int type)
 {
        int ret = MM_ERROR_NONE;
@@ -3513,7 +3629,7 @@ int _mmcamcorder_gst_set_state(MMHandleType handle, GstElement *pipeline, GstSta
        GstStateChangeReturn setChangeReturn = GST_STATE_CHANGE_FAILURE;
        GstStateChangeReturn getChangeReturn = GST_STATE_CHANGE_FAILURE;
        GstClockTime get_timeout = __MMCAMCORDER_SET_GST_STATE_TIMEOUT * GST_SECOND;
-       pthread_mutex_t *state_lock = NULL;
+       GMutex *state_lock = NULL;
 
        mmf_return_val_if_fail(handle, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
        sc = MMF_CAMCORDER_SUBCONTEXT(handle);
@@ -3527,7 +3643,7 @@ int _mmcamcorder_gst_set_state(MMHandleType handle, GstElement *pipeline, GstSta
                state_lock = &_MMCAMCORDER_GET_GST_ENCODE_STATE_LOCK(handle);
        }
 
-       pthread_mutex_lock(state_lock);
+       g_mutex_lock(state_lock);
 
        for (k = 0; k < _MMCAMCORDER_STATE_SET_COUNT; k++) {
                setChangeReturn = gst_element_set_state(pipeline, target_state);
@@ -3538,11 +3654,12 @@ int _mmcamcorder_gst_set_state(MMHandleType handle, GstElement *pipeline, GstSta
                        switch (getChangeReturn) {
                        case GST_STATE_CHANGE_NO_PREROLL:
                                _mmcam_dbg_log("status=GST_STATE_CHANGE_NO_PREROLL.");
+                               /* fall through */
                        case GST_STATE_CHANGE_SUCCESS:
                                /* if we reached the final target state, exit */
                                if (pipeline_state == target_state) {
                                        _mmcam_dbg_log("Set state to %d - DONE", target_state);
-                                       pthread_mutex_unlock(state_lock);
+                                       g_mutex_unlock(state_lock);
                                        return MM_ERROR_NONE;
                                }
                                break;
@@ -3550,12 +3667,12 @@ int _mmcamcorder_gst_set_state(MMHandleType handle, GstElement *pipeline, GstSta
                                _mmcam_dbg_log("status=GST_STATE_CHANGE_ASYNC.");
                                break;
                        default:
-                               pthread_mutex_unlock(state_lock);
+                               g_mutex_unlock(state_lock);
                                _mmcam_dbg_log("status=GST_STATE_CHANGE_FAILURE.");
                                return MM_ERROR_CAMCORDER_GST_STATECHANGE;
                        }
 
-                       pthread_mutex_unlock(state_lock);
+                       g_mutex_unlock(state_lock);
 
                        _mmcam_dbg_err("timeout of gst_element_get_state()!!");
 
@@ -3565,7 +3682,7 @@ int _mmcamcorder_gst_set_state(MMHandleType handle, GstElement *pipeline, GstSta
                usleep(_MMCAMCORDER_STATE_CHECK_INTERVAL);
        }
 
-       pthread_mutex_unlock(state_lock);
+       g_mutex_unlock(state_lock);
 
        _mmcam_dbg_err("Failure. gst_element_set_state timeout!!");
 
@@ -3728,7 +3845,7 @@ static gboolean __mmcamcorder_handle_gst_error(MMHandleType handle, GstMessage *
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        _MMCamcorderMsgItem msg;
-       gchar *msg_src_element;
+       gchar *msg_src_element = NULL;
        _MMCamcorderSubContext *sc = NULL;
 
        return_val_if_fail(hcamcorder, FALSE);
@@ -3783,10 +3900,12 @@ static gboolean __mmcamcorder_handle_gst_error(MMHandleType handle, GstMessage *
        }
 #endif /* _MMCAMCORDER_SKIP_GST_FLOW_ERROR */
 
-       /* post error to application */
-       hcamcorder->error_occurs = TRUE;
-       msg.id = MM_MESSAGE_CAMCORDER_ERROR;
-       _mmcamcorder_send_message(handle, &msg);
+       /* post error to application except RESTRICTED case */
+       if (msg.param.code != MM_ERROR_POLICY_RESTRICTED) {
+               hcamcorder->error_occurs = TRUE;
+               msg.id = MM_MESSAGE_CAMCORDER_ERROR;
+               _mmcamcorder_send_message(handle, &msg);
+       }
 
        return TRUE;
 }
@@ -3890,6 +4009,40 @@ static gint __mmcamcorder_gst_handle_resource_error(MMHandleType handle, int cod
                }
        }
 
+       /* audiosrc */
+       element = GST_ELEMENT_CAST(sc->encode_element[_MMCAMCORDER_AUDIOSRC_SRC].gst);
+       if (GST_ELEMENT_CAST(message->src) == element) {
+               if (code == GST_RESOURCE_ERROR_FAILED) {
+                       int ret = MM_ERROR_NONE;
+                       int current_state = MM_CAMCORDER_STATE_NONE;
+
+                       _mmcam_dbg_err("DPM mic DISALLOWED - current state %d", current_state);
+
+                       _MMCAMCORDER_LOCK_ASM(hcamcorder);
+
+                       current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder);
+                       if (current_state >= MM_CAMCORDER_STATE_RECORDING) {
+                               /* set value to inform a status is changed by DPM */
+                               hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_BY_DPM;
+
+                               ret = _mmcamcorder_commit((MMHandleType)hcamcorder);
+                               _mmcam_dbg_log("commit result : 0x%x", ret);
+
+                               if (ret != MM_ERROR_NONE) {
+                                       _mmcam_dbg_err("commit failed, cancel it");
+                                       ret = _mmcamcorder_cancel((MMHandleType)hcamcorder);
+                               }
+                       }
+
+                       /* restore value */
+                       hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_NORMAL;
+
+                       _MMCAMCORDER_UNLOCK_ASM(hcamcorder);
+
+                       return MM_ERROR_POLICY_RESTRICTED;
+               }
+       }
+
        /* encodebin */
        element = GST_ELEMENT_CAST(sc->encode_element[_MMCAMCORDER_ENCSINK_VENC].gst);
        if (GST_ELEMENT_CAST(message->src) == element) {
@@ -4109,3 +4262,45 @@ int _mmcamcorder_get_video_caps(MMHandleType handle, char **caps)
 
        return MM_ERROR_NONE;
 }
+#ifdef _MMCAMCORDER_RM_SUPPORT
+rm_cb_result _mmcamcorder_rm_callback(int handle, rm_callback_type event_src,
+        rm_device_request_s *info, void* cb_data)
+{
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(cb_data);
+       int current_state = MM_CAMCORDER_STATE_NONE;
+    rm_cb_result cb_res = RM_CB_RESULT_OK;
+
+    mmf_return_val_if_fail((MMHandleType)hcamcorder, RM_CB_RESULT_OK);
+
+       current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder);
+       if (current_state <= MM_CAMCORDER_STATE_NONE ||
+           current_state >= MM_CAMCORDER_STATE_NUM) {
+               _mmcam_dbg_err("Abnormal state. Or null handle. (%p, %d)", hcamcorder, current_state);
+       }
+
+       _MMCAMCORDER_LOCK_ASM(hcamcorder);
+
+       /* set value to inform a status is changed by RM */
+       hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_BY_RM;
+
+       /* set RM event code for sending it to application */
+       hcamcorder->interrupt_code = event_src;
+
+       _mmcam_dbg_log("RM conflict callback : event code 0x%x", event_src);
+       switch (event_src) {
+       case RM_CALLBACK_TYPE_RESOURCE_CONFLICT:
+       case RM_CALLBACK_TYPE_RESOURCE_CONFLICT_UD:
+               __mmcamcorder_force_stop(hcamcorder);
+               break;
+       default:
+               break;
+       }
+
+       /* restore value */
+       hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_NORMAL;
+
+       _MMCAMCORDER_UNLOCK_ASM(hcamcorder);
+
+    return cb_res;
+}
+#endif /* _MMCAMCORDER_RM_SUPPORT */
\ No newline at end of file