Remove unused parameter
[platform/core/multimedia/libmm-camcorder.git] / src / mm_camcorder_internal.c
index 6f60c16..8f8ded8 100644 (file)
@@ -23,6 +23,7 @@
 |  INCLUDE FILES                                                                       |
 ========================================================================================*/
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #include <gst/gst.h>
 #include <asm/types.h>
 
 #include <system_info.h>
-#include <mm_session.h>
-#include <mm_session_private.h>
 
-#include <murphy/common/glib-glue.h>
-
-/*---------------------------------------------------------------------------------------
-|    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                                           |
 ---------------------------------------------------------------------------------------*/
 #define __MMCAMCORDER_CMD_ITERATE_MAX           3
-#define __MMCAMCORDER_SET_GST_STATE_TIMEOUT     3
+#define __MMCAMCORDER_SET_GST_STATE_TIMEOUT     5
 #define __MMCAMCORDER_FORCE_STOP_TRY_COUNT      30
 #define __MMCAMCORDER_FORCE_STOP_WAIT_TIME      100000  /* us */
 #define __MMCAMCORDER_SOUND_WAIT_TIMEOUT        3
 #define __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN   64
+#define __MMCAMCORDER_CONF_FILENAME_LENGTH      32
 
+#define DPM_ALLOWED                             1
+#define DPM_DISALLOWED                          0
 
 /*---------------------------------------------------------------------------------------
 |    LOCAL FUNCTION PROTOTYPES:                                                                |
@@ -79,13 +73,19 @@ 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_MM_RM_SUPPORT
+static int      __mmcamcorder_resource_release_cb(mm_resource_manager_h rm,
+               mm_resource_manager_res_h res, void *user_data);
+#endif /* _MMCAMCORDER_MM_RM_SUPPORT */
+
+#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,106 +93,11 @@ 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)
 {
        int ret = MM_ERROR_NONE;
        int sys_info_ret = SYSTEM_INFO_ERROR_NONE;
-       int UseConfCtrl = 0;
        int rcmd_fmt_capture = MM_PIXEL_FORMAT_YUYV;
        int rcmd_fmt_recording = MM_PIXEL_FORMAT_NV12;
        int rcmd_dpy_rotation = MM_DISPLAY_ROTATION_270;
@@ -201,7 +106,6 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
        int camera_default_flip = MM_FLIP_NONE;
        int camera_facing_direction = MM_CAMCORDER_CAMERA_FACING_DIRECTION_REAR;
        char *err_attr_name = NULL;
-       const char *ConfCtrlFile = NULL;
        mmf_camcorder_t *hcamcorder = NULL;
        type_element *EvasSurfaceElement = NULL;
 
@@ -219,37 +123,58 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
        hcamcorder->type = 0;
        hcamcorder->state = MM_CAMCORDER_STATE_NONE;
        hcamcorder->sub_context = NULL;
-       hcamcorder->target_state = MM_CAMCORDER_STATE_NULL;
+       hcamcorder->old_state = MM_CAMCORDER_STATE_NONE;
        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).interrupt_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);
+       g_mutex_init(&(hcamcorder->mtsafe).mstream_cb_lock);
+#ifdef _MMCAMCORDER_MM_RM_SUPPORT
+       g_mutex_init(&(hcamcorder->mtsafe).resource_lock);
+#endif /* _MMCAMCORDER_MM_RM_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);
-       hcamcorder->task_thread_state = _MMCAMCORDER_SOUND_STATE_NONE;
+       g_mutex_init(&hcamcorder->task_thread_lock);
+       g_cond_init(&hcamcorder->task_thread_cond);
+       hcamcorder->task_thread_state = _MMCAMCORDER_TASK_THREAD_STATE_NONE;
+
+       if (info->videodev_type != MM_VIDEO_DEVICE_NONE) {
+               /* init for gdbus */
+               hcamcorder->gdbus_info_sound.mm_handle = hcamcorder;
+               g_mutex_init(&hcamcorder->gdbus_info_sound.sync_mutex);
+               g_cond_init(&hcamcorder->gdbus_info_sound.sync_cond);
+
+               hcamcorder->gdbus_info_solo_sound.mm_handle = hcamcorder;
+               g_mutex_init(&hcamcorder->gdbus_info_solo_sound.sync_mutex);
+               g_cond_init(&hcamcorder->gdbus_info_solo_sound.sync_cond);
+       }
 
        /* 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) {
@@ -262,258 +187,234 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
        hcamcorder->device_type = info->videodev_type;
        _mmcam_dbg_warn("Device Type : %d", hcamcorder->device_type);
 
-       if (MM_ERROR_NONE == _mm_session_util_read_information(-1, &hcamcorder->session_type, &hcamcorder->session_flags)) {
-               _mmcam_dbg_log("use sound focus function.");
-               hcamcorder->sound_focus_register = TRUE;
+       /* Get Camera Configure information from Camcorder INI file */
+       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;
+       }
+
+       hcamcorder->attributes = _mmcamcorder_alloc_attribute((MMHandleType)hcamcorder);
+       if (!(hcamcorder->attributes)) {
+               _mmcam_dbg_err("_mmcamcorder_create::alloc attribute error.");
+
+               ret = MM_ERROR_CAMCORDER_RESOURCE_CREATION;
+               goto _ERR_DEFAULT_VALUE_INIT;
+       }
+
+       /* get DPM handle for camera/microphone restriction */
+       hcamcorder->dpm_handle = dpm_manager_create();
+
+       _mmcam_dbg_warn("DPM handle %p", hcamcorder->dpm_handle);
 
-               if (MM_ERROR_NONE != mm_sound_focus_get_id(&hcamcorder->sound_focus_id)) {
-                       _mmcam_dbg_err("mm_sound_focus_get_uniq failed");
-                       ret = MM_ERROR_POLICY_BLOCKED;
+       if (info->videodev_type != MM_VIDEO_DEVICE_NONE) {
+               char conf_file_name[__MMCAMCORDER_CONF_FILENAME_LENGTH] = {'\0',};
+               int resolution_width = 0;
+               int resolution_height = 0;
+               MMCamAttrsInfo fps_info;
+
+               snprintf(conf_file_name, sizeof(conf_file_name), "%s%d.ini",
+                       CONFIGURE_CTRL_FILE_PREFIX, info->videodev_type);
+
+               _mmcam_dbg_log("Load control configure file [%d][%s]", info->videodev_type, conf_file_name);
+
+               ret = _mmcamcorder_conf_get_info((MMHandleType)hcamcorder,
+                       CONFIGURE_TYPE_CTRL, (const char *)conf_file_name, &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);
+*/
+               ret = _mmcamcorder_init_convert_table((MMHandleType)hcamcorder);
+               if (ret != MM_ERROR_NONE) {
+                       _mmcam_dbg_warn("converting table initialize error!!");
+                       ret = MM_ERROR_CAMCORDER_INTERNAL;
                        goto _ERR_DEFAULT_VALUE_INIT;
                }
 
-               if (MM_ERROR_NONE != mm_sound_register_focus_for_session(hcamcorder->sound_focus_id,
-                                                                        getpid(),
-                                                                        "media",
-                                                                        _mmcamcorder_sound_focus_cb,
-                                                                        hcamcorder)) {
-                       _mmcam_dbg_err("mm_sound_register_focus failed");
-                       ret = MM_ERROR_POLICY_BLOCKED;
+               ret = _mmcamcorder_init_attr_from_configure((MMHandleType)hcamcorder, MM_CAMCONVERT_CATEGORY_ALL);
+               if (ret != MM_ERROR_NONE) {
+                       _mmcam_dbg_warn("attribute initialize from configure error!!");
+                       ret = MM_ERROR_CAMCORDER_INTERNAL;
                        goto _ERR_DEFAULT_VALUE_INIT;
                }
 
-               _mmcam_dbg_log("mm_sound_register_focus done - id %d, session type %d, flags 0x%x",
-                              hcamcorder->sound_focus_id, hcamcorder->session_type, hcamcorder->session_flags);
-       } else {
-               _mmcam_dbg_log("_mm_session_util_read_information failed. skip sound focus function.");
-               hcamcorder->sound_focus_register = FALSE;
-       }
+               /* Get device info, recommend preview fmt and display rotation from INI */
+               _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl,
+                       CONFIGURE_CATEGORY_CTRL_CAMERA,
+                       "RecommendPreviewFormatCapture",
+                       &rcmd_fmt_capture);
 
-       /* Get Camera Configure information from Camcorder INI file */
-       _mmcamcorder_conf_get_info((MMHandleType)hcamcorder, CONFIGURE_TYPE_MAIN, CONFIGURE_MAIN_FILE, &hcamcorder->conf_main);
+               _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl,
+                       CONFIGURE_CATEGORY_CTRL_CAMERA,
+                       "RecommendPreviewFormatRecord",
+                       &rcmd_fmt_recording);
 
-       if (!(hcamcorder->conf_main)) {
-               _mmcam_dbg_err( "Failed to get configure(main) info." );
+               _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl,
+                       CONFIGURE_CATEGORY_CTRL_CAMERA,
+                       "RecommendDisplayRotation",
+                       &rcmd_dpy_rotation);
 
-               ret = MM_ERROR_CAMCORDER_CREATE_CONFIGURE;
-               goto _ERR_DEFAULT_VALUE_INIT;
-       }
+               _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main,
+                       CONFIGURE_CATEGORY_MAIN_CAPTURE,
+                       "PlayCaptureSound",
+                       &play_capture_sound);
 
-       hcamcorder->attributes = _mmcamcorder_alloc_attribute((MMHandleType)hcamcorder, info);
-       if (!(hcamcorder->attributes)) {
-               _mmcam_dbg_err("_mmcamcorder_create::alloc attribute error.");
+               _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main,
+                       CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
+                       "DeviceCount",
+                       &camera_device_count);
+
+               _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl,
+                       CONFIGURE_CATEGORY_CTRL_CAMERA,
+                       "FacingDirection",
+                       &camera_facing_direction);
+
+               _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl,
+                       CONFIGURE_CATEGORY_CTRL_EFFECT,
+                       "BrightnessStepDenominator",
+                       &hcamcorder->brightness_step_denominator);
+
+               _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl,
+                       CONFIGURE_CATEGORY_CTRL_CAPTURE,
+                       "SupportZSL",
+                       &hcamcorder->support_zsl_capture);
+
+               _mmcam_dbg_log("Recommend fmt[cap:%d,rec:%d], dpy rot %d, cap snd %d, dev cnt %d, cam facing dir %d, step denom %d, support zsl %d",
+                       rcmd_fmt_capture, rcmd_fmt_recording, rcmd_dpy_rotation,
+                       play_capture_sound, camera_device_count, camera_facing_direction,
+                       hcamcorder->brightness_step_denominator, hcamcorder->support_zsl_capture);
+
+               /* Get UseZeroCopyFormat value from INI */
+               _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main,
+                       CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
+                       "UseZeroCopyFormat",
+                       &(hcamcorder->use_zero_copy_format));
 
-               ret = MM_ERROR_CAMCORDER_RESOURCE_CREATION;
-               goto _ERR_DEFAULT_VALUE_INIT;
-       }
+               /* Get SupportMediaPacketPreviewCb value from INI */
+               _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main,
+                       CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
+                       "SupportMediaPacketPreviewCb",
+                       &(hcamcorder->support_media_packet_preview_cb));
 
-       if (info->videodev_type != MM_VIDEO_DEVICE_NONE) {
+               /* Get UseVideoconvert value from INI */
                _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main,
-                                               CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
-                                               "UseConfCtrl", &UseConfCtrl);
+                       CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT,
+                       "UseVideoconvert",
+                       &hcamcorder->use_videoconvert);
 
-               if (UseConfCtrl) {
-                       int resolution_width = 0;
-                       int resolution_height = 0;
-                       MMCamAttrsInfo fps_info;
+               ret = mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL,
+                       MMCAM_CAMERA_WIDTH, &resolution_width,
+                       MMCAM_CAMERA_HEIGHT, &resolution_height,
+                       NULL);
 
-                       _mmcam_dbg_log( "Enable Configure Control system." );
+               mm_camcorder_get_fps_list_by_resolution((MMHandleType)hcamcorder, resolution_width, resolution_height, &fps_info);
 
-                       switch (info->videodev_type) {
-                       case MM_VIDEO_DEVICE_CAMERA0:
-                               _mmcamcorder_conf_get_value_string((MMHandleType)hcamcorder, hcamcorder->conf_main,
-                                                                  CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
-                                                                  "ConfCtrlFile0", &ConfCtrlFile);
-                               break;
-                       case MM_VIDEO_DEVICE_CAMERA1:
-                               _mmcamcorder_conf_get_value_string((MMHandleType)hcamcorder, hcamcorder->conf_main,
-                                                                  CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
-                                                                  "ConfCtrlFile1", &ConfCtrlFile);
-                               break;
-                       default:
-                               _mmcam_dbg_err( "Not supported camera type." );
-                               ret = MM_ERROR_CAMCORDER_NOT_SUPPORTED;
-                               goto _ERR_DEFAULT_VALUE_INIT;
-                       }
+               _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);
 
-                       _mmcam_dbg_log("videodev_type : [%d], ConfCtrlPath : [%s]", info->videodev_type, ConfCtrlFile);
+               if (camera_facing_direction == 1) {
+                       if (rcmd_dpy_rotation == MM_DISPLAY_ROTATION_270 || rcmd_dpy_rotation == MM_DISPLAY_ROTATION_90)
+                               camera_default_flip = MM_FLIP_VERTICAL;
+                       else
+                               camera_default_flip = MM_FLIP_HORIZONTAL;
 
-                       _mmcamcorder_conf_get_info((MMHandleType)hcamcorder, CONFIGURE_TYPE_CTRL, ConfCtrlFile, &hcamcorder->conf_ctrl);
-/*
-                       _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;
-                       }
+                       _mmcam_dbg_log("camera_default_flip : [%d]", camera_default_flip);
+               }
 
-                       ret = _mmcamcorder_init_convert_table((MMHandleType)hcamcorder);
-                       if (ret != MM_ERROR_NONE) {
-                               _mmcam_dbg_warn("converting table initialize error!!");
-                               ret = MM_ERROR_CAMCORDER_INTERNAL;
-                               goto _ERR_DEFAULT_VALUE_INIT;
-                       }
+               mm_camcorder_set_attributes((MMHandleType)hcamcorder, &err_attr_name,
+                       MMCAM_CAMERA_DEVICE_COUNT, camera_device_count,
+                       MMCAM_CAMERA_FACING_DIRECTION, camera_facing_direction,
+                       MMCAM_RECOMMEND_PREVIEW_FORMAT_FOR_CAPTURE, rcmd_fmt_capture,
+                       MMCAM_RECOMMEND_PREVIEW_FORMAT_FOR_RECORDING, rcmd_fmt_recording,
+                       MMCAM_RECOMMEND_DISPLAY_ROTATION, rcmd_dpy_rotation,
+                       MMCAM_SUPPORT_ZSL_CAPTURE, hcamcorder->support_zsl_capture,
+                       MMCAM_SUPPORT_ZERO_COPY_FORMAT, hcamcorder->use_zero_copy_format,
+                       MMCAM_SUPPORT_MEDIA_PACKET_PREVIEW_CB, hcamcorder->support_media_packet_preview_cb,
+                       MMCAM_CAMERA_FPS, fps_info.int_array.def,
+                       MMCAM_DISPLAY_FLIP, camera_default_flip,
+                       MMCAM_CAPTURE_SOUND_ENABLE, play_capture_sound,
+                       NULL);
+               if (err_attr_name) {
+                       _mmcam_dbg_err("Set %s FAILED.", err_attr_name);
+                       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_CAMERA|MM_CAMCONVERT_CATEGORY_DISPLAY);
-                       if (ret != MM_ERROR_NONE) {
-                               _mmcam_dbg_warn("converting table initialize error!!");
-                               ret = MM_ERROR_CAMCORDER_INTERNAL;
-                               goto _ERR_DEFAULT_VALUE_INIT;
-                       }
+               /* Get default value of brightness */
+               mm_camcorder_get_attributes((MMHandleType)hcamcorder, &err_attr_name,
+                       MMCAM_FILTER_BRIGHTNESS, &hcamcorder->brightness_default,
+                       NULL);
+               if (err_attr_name) {
+                       _mmcam_dbg_err("Get brightness FAILED.");
+                       SAFE_FREE(err_attr_name);
+                       ret = MM_ERROR_CAMCORDER_INTERNAL;
+                       goto _ERR_DEFAULT_VALUE_INIT;
+               }
 
-                       /* Get device info, recommend preview fmt and display rotation from INI */
-                       _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl,
-                                                       CONFIGURE_CATEGORY_CTRL_CAMERA,
-                                                       "RecommendPreviewFormatCapture",
-                                                       &rcmd_fmt_capture);
-
-                       _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl,
-                                                       CONFIGURE_CATEGORY_CTRL_CAMERA,
-                                                       "RecommendPreviewFormatRecord",
-                                                       &rcmd_fmt_recording);
-
-                       _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl,
-                                                       CONFIGURE_CATEGORY_CTRL_CAMERA,
-                                                       "RecommendDisplayRotation",
-                                                       &rcmd_dpy_rotation);
-
-                       _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main,
-                                                       CONFIGURE_CATEGORY_MAIN_CAPTURE,
-                                                       "PlayCaptureSound",
-                                                       &play_capture_sound);
-
-                       _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main,
-                                                       CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
-                                                       "DeviceCount",
-                                                       &camera_device_count);
-
-                       _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl,
-                                                       CONFIGURE_CATEGORY_CTRL_CAMERA,
-                                                       "FacingDirection",
-                                                       &camera_facing_direction);
-
-                       _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl,
-                                                       CONFIGURE_CATEGORY_CTRL_EFFECT,
-                                                       "BrightnessStepDenominator",
-                                                       &hcamcorder->brightness_step_denominator);
-
-                       _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl,
-                                                       CONFIGURE_CATEGORY_CTRL_CAPTURE,
-                                                       "SupportZSL",
-                                                       &hcamcorder->support_zsl_capture);
-
-                       _mmcam_dbg_log("Recommend fmt[cap:%d,rec:%d], dpy rot %d, cap snd %d, dev cnt %d, cam facing dir %d, step denom %d, support zsl %d",
-                                      rcmd_fmt_capture, rcmd_fmt_recording, rcmd_dpy_rotation,
-                                      play_capture_sound, camera_device_count, camera_facing_direction,
-                                      hcamcorder->brightness_step_denominator, hcamcorder->support_zsl_capture);
-
-                       /* Get UseZeroCopyFormat value from INI */
-                       _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main,
-                                                       CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
-                                                       "UseZeroCopyFormat",
-                                                       &(hcamcorder->use_zero_copy_format));
-
-                       /* Get SupportMediaPacketPreviewCb value from INI */
-                       _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main,
-                                                       CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
-                                                       "SupportMediaPacketPreviewCb",
-                                                       &(hcamcorder->support_media_packet_preview_cb));
-
-                       ret = mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL,
-                                                   MMCAM_CAMERA_WIDTH, &resolution_width,
-                                                   MMCAM_CAMERA_HEIGHT, &resolution_height,
-                                                   NULL);
-
-                       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);
-
-                       if (camera_facing_direction == 1) {
-                               if (rcmd_dpy_rotation == MM_DISPLAY_ROTATION_270 || rcmd_dpy_rotation == MM_DISPLAY_ROTATION_90) {
-                                       camera_default_flip = MM_FLIP_VERTICAL;
-                               } else {
-                                       camera_default_flip = MM_FLIP_HORIZONTAL;
-                               }
-                               _mmcam_dbg_log("camera_default_flip : [%d]",camera_default_flip);
-                       }
+               _mmcam_dbg_log("Default brightness : %d", hcamcorder->brightness_default);
 
-                       mm_camcorder_set_attributes((MMHandleType)hcamcorder, &err_attr_name,
-                                                   MMCAM_CAMERA_DEVICE_COUNT, camera_device_count,
-                                                   MMCAM_CAMERA_FACING_DIRECTION, camera_facing_direction,
-                                                   MMCAM_RECOMMEND_PREVIEW_FORMAT_FOR_CAPTURE, rcmd_fmt_capture,
-                                                   MMCAM_RECOMMEND_PREVIEW_FORMAT_FOR_RECORDING, rcmd_fmt_recording,
-                                                   MMCAM_RECOMMEND_DISPLAY_ROTATION, rcmd_dpy_rotation,
-                                                   MMCAM_SUPPORT_ZSL_CAPTURE, hcamcorder->support_zsl_capture,
-                                                   MMCAM_SUPPORT_ZERO_COPY_FORMAT, hcamcorder->use_zero_copy_format,
-                                                   MMCAM_SUPPORT_MEDIA_PACKET_PREVIEW_CB, hcamcorder->support_media_packet_preview_cb,
-                                                   MMCAM_CAMERA_FPS, fps_info.int_array.def,
-                                                   MMCAM_DISPLAY_FLIP, camera_default_flip,
-                                                   "capture-sound-enable", play_capture_sound,
-                                                   NULL);
-                       if (err_attr_name) {
-                               _mmcam_dbg_err("Set %s FAILED.", err_attr_name);
-                               free(err_attr_name);
-                               err_attr_name = NULL;
-                               ret = MM_ERROR_CAMCORDER_INTERNAL;
-                               goto _ERR_DEFAULT_VALUE_INIT;
+               /* add DPM camera policy changed callback */
+               if (hcamcorder->dpm_handle) {
+                       ret = dpm_add_policy_changed_cb(hcamcorder->dpm_handle, "camera",
+                               _mmcamcorder_dpm_camera_policy_changed_cb, (void *)hcamcorder, &hcamcorder->dpm_camera_cb_id);
+                       if (ret != DPM_ERROR_NONE) {
+                               _mmcam_dbg_err("add DPM changed cb failed, keep going...");
+                               hcamcorder->dpm_camera_cb_id = 0;
                        }
 
-                       /* Get default value of brightness */
-                       mm_camcorder_get_attributes((MMHandleType)hcamcorder, &err_attr_name,
-                                                   MMCAM_FILTER_BRIGHTNESS, &hcamcorder->brightness_default,
-                                                   NULL);
-                       if (err_attr_name) {
-                               _mmcam_dbg_err("Get brightness FAILED.");
-                               free(err_attr_name);
-                               err_attr_name = NULL;
-                               ret = MM_ERROR_CAMCORDER_INTERNAL;
-                               goto _ERR_DEFAULT_VALUE_INIT;
-                       }
-                       _mmcam_dbg_log("Default brightness : %d", hcamcorder->brightness_default);
-               } else {
-                       _mmcam_dbg_log( "Disable Configure Control system." );
-                       hcamcorder->conf_ctrl = NULL;
+                       _mmcam_dbg_log("DPM camera changed cb id %d", hcamcorder->dpm_camera_cb_id);
                }
+
+#ifdef _MMCAMCORDER_MM_RM_SUPPORT
+               /* initialize resource manager */
+               ret = mm_resource_manager_create(MM_RESOURCE_MANAGER_APP_CLASS_MEDIA,
+                               __mmcamcorder_resource_release_cb, hcamcorder,
+                               &hcamcorder->resource_manager);
+               if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
+                       _mmcam_dbg_err("failed to initialize resource manager");
+                       ret = MM_ERROR_CAMCORDER_INTERNAL;
+                       goto _ERR_DEFAULT_VALUE_INIT;
+               }
+#endif /* _MMCAMCORDER_MM_RM_SUPPORT */
        } else {
                _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main,
-                                                   CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
-                                                   "DeviceCount",
-                                                   &camera_device_count);
+                       CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
+                       "DeviceCount",
+                       &camera_device_count);
+
                mm_camcorder_set_attributes((MMHandleType)hcamcorder, &err_attr_name,
-                                                   MMCAM_CAMERA_DEVICE_COUNT, camera_device_count,
-                                                   NULL);
+                       MMCAM_CAMERA_DEVICE_COUNT, camera_device_count,
+                       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;
                }
        }
 
-
-       /* initialize resource manager */
-       ret = _mmcamcorder_resource_manager_init(&hcamcorder->resource_manager, (void *)hcamcorder);
-       if (ret != MM_ERROR_NONE) {
-               _mmcam_dbg_err("failed to initialize resource manager");
-               ret = MM_ERROR_CAMCORDER_INTERNAL;
-                goto _ERR_DEFAULT_VALUE_INIT;
-        }
+       traceBegin(TTRACE_TAG_CAMERA, "MMCAMCORDER:CREATE:INIT_GSTREAMER");
 
        ret = __mmcamcorder_gstreamer_init(hcamcorder->conf_main);
+
+       traceEnd(TTRACE_TAG_CAMERA);
+
        if (!ret) {
-               _mmcam_dbg_err( "Failed to initialize gstreamer!!" );
+               _mmcam_dbg_err("Failed to initialize gstreamer!!");
                ret = MM_ERROR_CAMCORDER_NOT_INITIALIZED;
                goto _ERR_DEFAULT_VALUE_INIT;
        }
@@ -526,9 +427,9 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
 
        /* Get videosink name for evas surface */
        _mmcamcorder_conf_get_element((MMHandleType)hcamcorder, hcamcorder->conf_main,
-                                     CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT,
-                                     "VideosinkElementEvas",
-                                     &EvasSurfaceElement);
+               CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT,
+               "VideosinkElementEvas",
+               &EvasSurfaceElement);
        if (EvasSurfaceElement) {
                int attr_index = 0;
                const char *evassink_name = NULL;
@@ -550,43 +451,47 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
 
        /* get model name */
        sys_info_ret = system_info_get_platform_string("http://tizen.org/system/model_name", &hcamcorder->model_name);
-       if (hcamcorder->model_name) {
-               _mmcam_dbg_log("model name [%s], sys_info_ret 0x%x", hcamcorder->model_name, sys_info_ret);
-       } else {
-               _mmcam_dbg_warn("failed get model name, sys_info_ret 0x%x", sys_info_ret);
-       }
+
+       _mmcam_dbg_warn("model name [%s], ret 0x%x",
+               hcamcorder->model_name ? hcamcorder->model_name : "NULL", sys_info_ret);
 
        /* get software version */
        sys_info_ret = system_info_get_platform_string("http://tizen.org/system/build.string", &hcamcorder->software_version);
-       if (hcamcorder->software_version) {
-               _mmcam_dbg_log("software version [%s], sys_info_ret 0x%d", hcamcorder->software_version, sys_info_ret);
-       } else {
-               _mmcam_dbg_warn("failed get software version, sys_info_ret 0x%x", sys_info_ret);
-       }
+
+       _mmcam_dbg_warn("software version [%s], ret 0x%x",
+               hcamcorder->software_version ? hcamcorder->software_version : "NULL", sys_info_ret);
 
        /* Set initial state */
        _mmcamcorder_set_state((MMHandleType)hcamcorder, MM_CAMCORDER_STATE_NULL);
 
        _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:
-       /* 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)) {
-                       _mmcam_dbg_err("mm_sound_unregister_focus[id %d] failed", hcamcorder->sound_focus_id);
+#ifdef _MMCAMCORDER_MM_RM_SUPPORT
+       /* de-initialize resource manager */
+       if (hcamcorder->resource_manager != NULL)
+               mm_resource_manager_destroy(hcamcorder->resource_manager);
+#endif /* _MMCAMCORDER_MM_RM_SUPPORT */
+
+       /* release DPM related handle */
+       if (hcamcorder->dpm_handle) {
+               _mmcam_dbg_log("release DPM handle %p, camera changed cb id %d",
+                       hcamcorder->dpm_handle, hcamcorder->dpm_camera_cb_id);
+
+               /* remove camera policy changed callback */
+               if (hcamcorder->dpm_camera_cb_id > 0) {
+                       dpm_remove_policy_changed_cb(hcamcorder->dpm_handle, hcamcorder->dpm_camera_cb_id);
+                       hcamcorder->dpm_camera_cb_id = 0;
                } else {
-                       _mmcam_dbg_log("mm_sound_unregister_focus[id %d] done", hcamcorder->sound_focus_id);
+                       _mmcam_dbg_warn("invalid dpm camera cb id %d", hcamcorder->dpm_camera_cb_id);
                }
-       } else {
-               _mmcam_dbg_warn("no need to unregister sound focus[%d, id %d]",
-                              hcamcorder->sound_focus_register, hcamcorder->sound_focus_id);
+
+               dpm_manager_destroy(hcamcorder->dpm_handle);
+               hcamcorder->dpm_handle = NULL;
        }
 
        /* Remove attributes */
@@ -596,32 +501,40 @@ _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));
-
-       if (hcamcorder->conf_ctrl) {
-               _mmcamcorder_conf_release_info(handle, &hcamcorder->conf_ctrl);
-       }
+       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).interrupt_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);
+       g_mutex_clear(&(hcamcorder->mtsafe).mstream_cb_lock);
+#ifdef _MMCAMCORDER_MM_RM_SUPPORT
+       g_mutex_clear(&(hcamcorder->mtsafe).resource_lock);
+#endif /* _MMCAMCORDER_MM_RM_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_main) {
-               _mmcamcorder_conf_release_info(handle, &hcamcorder->conf_main);
+       if (info->videodev_type != MM_VIDEO_DEVICE_NONE) {
+               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);
        }
 
+       if (hcamcorder->conf_ctrl)
+               _mmcamcorder_conf_release_info((MMHandleType)hcamcorder, &hcamcorder->conf_ctrl);
+
+       if (hcamcorder->conf_main)
+               _mmcamcorder_conf_release_info((MMHandleType)hcamcorder, &hcamcorder->conf_main);
+
        if (hcamcorder->model_name) {
                free(hcamcorder->model_name);
                hcamcorder->model_name = NULL;
@@ -633,15 +546,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));
@@ -655,7 +569,11 @@ 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 */
+       GstElement *sink_element = NULL;
+       int sink_element_size = 0;
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
@@ -674,56 +592,56 @@ int _mmcamcorder_destroy(MMHandleType handle)
        }
 
        state = _mmcamcorder_get_state(handle);
-       if (state != state_FROM) {
+       if (state != MM_CAMCORDER_STATE_NULL) {
                _mmcam_dbg_err("Wrong state(%d)", state);
                ret = MM_ERROR_CAMCORDER_INVALID_STATE;
                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
        }
 
        /* 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;
+       /* remove kept, but not used sink element in attribute */
+       mm_camcorder_get_attributes(handle, NULL,
+               MMCAM_DISPLAY_REUSE_ELEMENT, &sink_element, &sink_element_size,
+               NULL);
+       if (sink_element) {
+               GstStateChangeReturn result = gst_element_set_state(sink_element, GST_STATE_NULL);
 
-               _mmcam_dbg_warn("capture_sound_count[%d] is not zero. wait signal...",
-                               hcamcorder->capture_sound_count);
+               _mmcam_dbg_warn("remove sink element %p, set state NULL result %d", sink_element, result);
 
-               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;
-               }
+               gst_object_unref(sink_element);
+               sink_element = NULL;
        }
-       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) {
-               if (hcamcorder->sub_context->element) {
+               if (hcamcorder->sub_context->element)
                        _mmcamcorder_destroy_pipeline(handle, hcamcorder->type);
-               }
 
                _mmcamcorder_dealloc_subcontext(hcamcorder->sub_context);
                hcamcorder->sub_context = NULL;
        }
 
+#ifdef _MMCAMCORDER_MM_RM_SUPPORT
        /* de-initialize resource manager */
-       ret = _mmcamcorder_resource_manager_deinit(&hcamcorder->resource_manager);
-       if (!ret) {
-               _mmcam_dbg_err("failed to de-initialize resource manager");
-        }
+       _MMCAMCORDER_LOCK_RESOURCE(hcamcorder);
+
+       if (hcamcorder->resource_manager != NULL) {
+               ret = mm_resource_manager_destroy(hcamcorder->resource_manager);
+               if (ret != MM_RESOURCE_MANAGER_ERROR_NONE)
+                       _mmcam_dbg_err("failed to de-initialize resource manager 0x%x", ret);
+       }
+
+       _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
+#endif /* _MMCAMCORDER_MM_RM_SUPPORT */
 
        /* Remove idle function which is not called yet */
        if (hcamcorder->setting_event_id) {
@@ -732,29 +650,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);
@@ -764,34 +659,27 @@ int _mmcamcorder_destroy(MMHandleType handle)
        /* Remove exif info */
        if (hcamcorder->exif_info) {
                mm_exif_destory_exif_info(hcamcorder->exif_info);
-               hcamcorder->exif_info=NULL;
-
+               hcamcorder->exif_info = NULL;
        }
 
        /* Release configure info */
-       if (hcamcorder->conf_ctrl) {
+       if (hcamcorder->conf_ctrl)
                _mmcamcorder_conf_release_info(handle, &hcamcorder->conf_ctrl);
-       }
-       if (hcamcorder->conf_main) {
+
+       if (hcamcorder->conf_main)
                _mmcamcorder_conf_release_info(handle, &hcamcorder->conf_main);
-       }
 
        /* Remove messages which are not called yet */
        _mmcamcorder_remove_message_all(handle);
 
-       /* unregister sound focus */
-       if (hcamcorder->sound_focus_register && hcamcorder->sound_focus_id > 0) {
-               if (mm_sound_unregister_focus(hcamcorder->sound_focus_id) != MM_ERROR_NONE) {
-                       _mmcam_dbg_err("mm_sound_unregister_focus[id %d] failed",
-                                      hcamcorder->sound_focus_id);
-               } else {
-                       _mmcam_dbg_log("mm_sound_unregister_focus[id %d] done",
-                                      hcamcorder->sound_focus_id);
-               }
-       } else {
-               _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) {
@@ -804,32 +692,60 @@ int _mmcamcorder_destroy(MMHandleType handle)
                hcamcorder->software_version = NULL;
        }
 
+       /* release DPM handle */
+       if (hcamcorder->dpm_handle) {
+               _mmcam_dbg_log("release DPM handle %p, camera changed cb id %d",
+                       hcamcorder->dpm_handle, hcamcorder->dpm_camera_cb_id);
+
+               /* remove camera policy changed callback */
+               if (hcamcorder->dpm_camera_cb_id > 0) {
+                       dpm_remove_policy_changed_cb(hcamcorder->dpm_handle, 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);
+               }
+
+               dpm_manager_destroy(hcamcorder->dpm_handle);
+               hcamcorder->dpm_handle = 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).interrupt_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);
+       g_mutex_clear(&(hcamcorder->mtsafe).mstream_cb_lock);
+#ifdef _MMCAMCORDER_MM_RM_SUPPORT
+       g_mutex_clear(&(hcamcorder->mtsafe).resource_lock);
+#endif /* _MMCAMCORDER_MM_RM_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);
+
+       if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
+               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);
+       }
 
        /* Release handle */
        memset(hcamcorder, 0x00, sizeof(mmf_camcorder_t));
@@ -841,9 +757,8 @@ _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
 _ERR_CAMCORDER_CMD_PRECON:
-       if (hcamcorder) {
+       if (hcamcorder)
                _mmcam_dbg_err("Destroy fail (type %d, state %d)", hcamcorder->type, state);
-       }
 
        _mmcam_dbg_err("Destroy fail (ret %x)", ret);
 
@@ -854,18 +769,23 @@ _ERR_CAMCORDER_CMD_PRECON:
 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 pid_for_sound_focus = 0;
+       int display_surface_type = MM_DISPLAY_SURFACE_OVERLAY;
        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;
+       int socket_path_len = 0;
+       int conn_size = 0;
+#ifdef _MMCAMCORDER_RM_SUPPORT
+       int iret = RM_OK;
+       int preview_format = MM_PIXEL_FORMAT_NV12;
+       int qret = RM_OK;
+       int qret_avail = 0; /* 0: not available, 1: available */
+       rm_consumer_info rci;
+       int app_pid = 0;
+       int resource_count = 0;
+#endif /* _MMCAMCORDER_RM_SUPPORT */
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
@@ -884,183 +804,104 @@ int _mmcamcorder_realize(MMHandleType handle)
        }
 
        state = _mmcamcorder_get_state(handle);
-       if (state != state_FROM) {
+       if (state != MM_CAMCORDER_STATE_NULL) {
                _mmcam_dbg_err("Wrong state(%d)", state);
                ret = MM_ERROR_CAMCORDER_INVALID_STATE;
                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
        }
 
+       /* Get profile mode and gdbus connection */
        mm_camcorder_get_attributes(handle, NULL,
-                                   MMCAM_MODE, &hcamcorder->type,
-                                   NULL);
-
-       /* Get profile mode */
-       _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_SHM_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_MODE, &hcamcorder->type,
+               MMCAM_GDBUS_CONNECTION, &hcamcorder->gdbus_conn, &conn_size,
+               NULL);
 
-               _mmcam_dbg_log("VCONFKEY_RECORDER_STATE prev %d -> cur %d",
-                              vconf_recorder_state, VCONFKEY_RECORDER_STATE_CREATED);
+       if (!hcamcorder->gdbus_conn) {
+               _mmcam_dbg_err("gdbus connection NULL");
+               ret = MM_ERROR_CAMCORDER_RESOURCE_CREATION;
+               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
        }
 
-       /* sound focus */
-       if (hcamcorder->sound_focus_register) {
-               mm_camcorder_get_attributes(handle, NULL,
-                                           MMCAM_PID_FOR_SOUND_FOCUS, &pid_for_sound_focus,
-                                           NULL);
-
-               if (pid_for_sound_focus == 0) {
-                       pid_for_sound_focus = getpid();
-                       _mmcam_dbg_warn("pid for sound focus is not set, use my pid %d", pid_for_sound_focus);
-               }
-
-               /* acquire sound focus or set sound focus watch callback */
-               hcamcorder->acquired_focus = 0;
-               hcamcorder->sound_focus_watch_id = 0;
-
-               /* check session flags */
-               if (hcamcorder->session_flags & MM_SESSION_OPTION_PAUSE_OTHERS) {
-                       /* acquire sound focus */
-                       _mmcam_dbg_log("PAUSE_OTHERS - acquire sound focus");
-
-                       ret_sound = mm_sound_acquire_focus(0, FOCUS_FOR_BOTH, NULL);
-                       if (ret_sound != MM_ERROR_NONE) {
-                               _mmcam_dbg_err("mm_sound_acquire_focus failed [0x%x]", ret_sound);
-
-                               /* TODO: MM_ERROR_POLICY_BLOCKED_BY_CALL, MM_ERROR_POLICY_BLOCKED_BY_ALARM*/
-                               ret = MM_ERROR_POLICY_BLOCKED;
-                               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
-                       }
-
-                       hcamcorder->acquired_focus = FOCUS_FOR_BOTH;
-               } else if (hcamcorder->session_flags & MM_SESSION_OPTION_UNINTERRUPTIBLE) {
-                       /* do nothing */
-                       _mmcam_dbg_log("SESSION_UNINTERRUPTIBLE - do nothing for sound focus");
-               } else {
-                       /* set sound focus watch callback */
-                       _mmcam_dbg_log("ETC - set sound focus watch callback - pid %d", pid_for_sound_focus);
-
-                       ret_sound = mm_sound_set_focus_watch_callback_for_session(pid_for_sound_focus,
-                                                                                 FOCUS_FOR_BOTH,
-                                                                                 (mm_sound_focus_changed_watch_cb)_mmcamcorder_sound_focus_watch_cb,
-                                                                                 hcamcorder,
-                                                                                 &hcamcorder->sound_focus_watch_id);
-                       if (ret_sound != MM_ERROR_NONE) {
-                               _mmcam_dbg_err("mm_sound_set_focus_watch_callback failed [0x%x]", ret_sound);
-
-                               /* TODO: MM_ERROR_POLICY_BLOCKED_BY_CALL, MM_ERROR_POLICY_BLOCKED_BY_ALARM*/
-                               ret = MM_ERROR_POLICY_BLOCKED;
-                               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
-                       }
-
-                       _mmcam_dbg_log("sound focus watch cb id %d", hcamcorder->sound_focus_watch_id);
-               }
-       } else {
-               _mmcam_dbg_log("no need to register sound focus");
-       }
+       _mmcam_dbg_log("Profile mode [%d], gdbus connection [%p]",
+               hcamcorder->type, hcamcorder->gdbus_conn);
 
+       mm_camcorder_get_attributes(handle, NULL,
+               MMCAM_DISPLAY_SURFACE, &display_surface_type,
+               MMCAM_CAMERA_RECORDING_MOTION_RATE, &motion_rate,
+               NULL);
 
        /* alloc sub context */
        hcamcorder->sub_context = _mmcamcorder_alloc_subcontext(hcamcorder->type);
-       if(!hcamcorder->sub_context) {
+       if (!hcamcorder->sub_context) {
                ret = MM_ERROR_CAMCORDER_RESOURCE_CREATION;
-               goto _ERR_CAMCORDER_CMD;
+               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
        }
 
        /* Set basic configure information */
-       if (motion_rate != _MMCAMCORDER_DEFAULT_RECORDING_MOTION_RATE) {
+       if (motion_rate != _MMCAMCORDER_DEFAULT_RECORDING_MOTION_RATE)
                hcamcorder->sub_context->is_modified_rate = TRUE;
-       }
 
        _mmcamcorder_conf_get_value_int(handle, hcamcorder->conf_main,
-                                       CONFIGURE_CATEGORY_MAIN_CAPTURE,
-                                       "UseEncodebin",
-                                       &(hcamcorder->sub_context->bencbin_capture));
+               CONFIGURE_CATEGORY_MAIN_CAPTURE,
+               "UseEncodebin",
+               &(hcamcorder->sub_context->bencbin_capture));
        _mmcam_dbg_warn("UseEncodebin [%d]", hcamcorder->sub_context->bencbin_capture);
 
        if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
                /* get dual stream support info */
                _mmcamcorder_conf_get_value_int(handle, hcamcorder->conf_main,
-                                               CONFIGURE_CATEGORY_MAIN_RECORD,
-                                               "SupportDualStream",
-                                               &(hcamcorder->sub_context->info_video->support_dual_stream));
+                       CONFIGURE_CATEGORY_MAIN_RECORD,
+                       "SupportDualStream",
+                       &(hcamcorder->sub_context->info_video->support_dual_stream));
+
                _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 */
        if (videosink_element_type) {
                _mmcamcorder_conf_get_element(handle, hcamcorder->conf_main,
-                                             CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT,
-                                             videosink_element_type,
-                                             &hcamcorder->sub_context->VideosinkElement);
+                       CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT,
+                       videosink_element_type,
+                       &hcamcorder->sub_context->VideosinkElement);
                free(videosink_element_type);
                videosink_element_type = NULL;
        } else {
                _mmcam_dbg_warn("strdup failed(display_surface_type %d). Use default X type",
-                               display_surface_type);
+                       display_surface_type);
 
                _mmcamcorder_conf_get_element(handle, hcamcorder->conf_main,
-                                             CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT,
-                                             _MMCAMCORDER_DEFAULT_VIDEOSINK_TYPE,
-                                             &hcamcorder->sub_context->VideosinkElement);
+                       CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT,
+                       _MMCAMCORDER_DEFAULT_VIDEOSINK_TYPE,
+                       &hcamcorder->sub_context->VideosinkElement);
        }
 
        _mmcamcorder_conf_get_value_element_name(hcamcorder->sub_context->VideosinkElement, &videosink_name);
@@ -1068,45 +909,173 @@ int _mmcamcorder_realize(MMHandleType handle)
 
        /* get videoconvert element */
        _mmcamcorder_conf_get_element(handle, hcamcorder->conf_main,
-                                     CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT,
-                                     "VideoconvertElement",
-                                     &hcamcorder->sub_context->VideoconvertElement);
+               CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT,
+               "VideoconvertElement",
+               &hcamcorder->sub_context->VideoconvertElement);
 
        _mmcamcorder_conf_get_value_int(handle, hcamcorder->conf_ctrl,
-                                       CONFIGURE_CATEGORY_CTRL_CAPTURE,
-                                       "SensorEncodedCapture",
-                                       &(hcamcorder->sub_context->SensorEncodedCapture));
+               CONFIGURE_CATEGORY_CTRL_CAPTURE,
+               "SensorEncodedCapture",
+               &(hcamcorder->sub_context->SensorEncodedCapture));
        _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;
+
+               /* check camera policy from DPM */
+               if (hcamcorder->dpm_handle) {
+                       if (dpm_restriction_get_camera_state(hcamcorder->dpm_handle, &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;
+
+                                       _mmcamcorder_request_dpm_popup(hcamcorder->gdbus_conn, "camera");
+
+                                       goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+                               }
+                       } else {
+                               _mmcam_dbg_err("get DPM camera state failed, keep going...");
+                       }
+               } else {
+                       _mmcam_dbg_warn("NULL dpm_handle");
+               }
+
+#ifdef _MMCAMCORDER_MM_RM_SUPPORT
+               _MMCAMCORDER_LOCK_RESOURCE(hcamcorder);
                /* prepare resource manager for camera */
-               if((_mmcamcorder_resource_manager_prepare(&hcamcorder->resource_manager, RESOURCE_TYPE_CAMERA))) {
-                       _mmcam_dbg_err("could not prepare for camera resource");
-                       ret = MM_ERROR_CAMCORDER_INTERNAL;
-                       goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+               if (hcamcorder->camera_resource == NULL) {
+                       ret = mm_resource_manager_mark_for_acquire(hcamcorder->resource_manager,
+                                       MM_RESOURCE_MANAGER_RES_TYPE_CAMERA,
+                                       1,
+                                       &hcamcorder->camera_resource);
+                       if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
+                               _mmcam_dbg_err("could not prepare for camera resource");
+                               ret = MM_ERROR_RESOURCE_INTERNAL;
+                               _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
+                               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+                       }
+               } else {
+                       _mmcam_dbg_log("camera already acquired");
                }
 
                /* 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_dbg_err("could not prepare for video overlay resource");
-                               ret = MM_ERROR_CAMCORDER_INTERNAL;
-                               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+               if (display_surface_type == MM_DISPLAY_SURFACE_OVERLAY) {
+                       if (hcamcorder->video_overlay_resource == NULL) {
+                               ret = mm_resource_manager_mark_for_acquire(hcamcorder->resource_manager,
+                                               MM_RESOURCE_MANAGER_RES_TYPE_VIDEO_OVERLAY,
+                                               MM_RESOURCE_MANAGER_RES_VOLUME_FULL,
+                                               &hcamcorder->video_overlay_resource);
+                               if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
+                                       _mmcam_dbg_err("could not prepare for overlay resource");
+                                       ret = MM_ERROR_RESOURCE_INTERNAL;
+                                       _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
+                                       goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+                               }
+                       } else {
+                               _mmcam_dbg_log("overlay already acquired");
                        }
                }
+
                /* acquire resources */
-               if((hcamcorder->resource_manager.rset && _mmcamcorder_resource_manager_acquire(&hcamcorder->resource_manager))) {
+               ret = mm_resource_manager_commit(hcamcorder->resource_manager);
+               if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
                        _mmcam_dbg_err("could not acquire resources");
-                       _mmcamcorder_resource_manager_unprepare(&hcamcorder->resource_manager);
+                       ret = MM_ERROR_RESOURCE_INTERNAL;
+                       _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
+                       goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+               }
+               _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
+#endif /* _MMCAMCORDER_MM_RM_SUPPORT */
+
+#ifdef _MMCAMCORDER_RM_SUPPORT
+               mm_camcorder_get_attributes(handle, NULL,
+                       MMCAM_CLIENT_PID, &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_RESOURCE_INTERNAL;
+                               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+                       }
+               }
+
+               mm_camcorder_get_attributes(handle, NULL,
+                       MMCAM_CAMERA_FORMAT, &preview_format,
+                       NULL);
+
+               resource_count = 0;
+               memset(&hcamcorder->request_resources, 0x0, sizeof(rm_category_request_s));
+               memset(&hcamcorder->returned_devices, 0x0, sizeof(rm_device_return_s));
+
+               if (preview_format == MM_PIXEL_FORMAT_ENCODED_H264) {
+                       hcamcorder->request_resources.state[resource_count] = RM_STATE_EXCLUSIVE;
+                       hcamcorder->request_resources.category_id[resource_count] = RM_CATEGORY_VIDEO_DECODER;
+
+                       _mmcam_dbg_log("request dec rsc - category 0x%x", RM_CATEGORY_VIDEO_DECODER);
+
+                       resource_count++;
+               }
+
+               if (display_surface_type == MM_DISPLAY_SURFACE_OVERLAY) {
+                       hcamcorder->request_resources.state[resource_count] = RM_STATE_EXCLUSIVE;
+                       hcamcorder->request_resources.category_id[resource_count] = RM_CATEGORY_SCALER;
+
+                       _mmcam_dbg_log("request scaler rsc - category 0x%x", RM_CATEGORY_SCALER);
+
+                       resource_count++;
+               }
+
+               hcamcorder->request_resources.request_num = resource_count;
+
+               if (resource_count > 0) {
+                       qret = rm_query(hcamcorder->rm_handle, RM_QUERY_ALLOCATION, &(hcamcorder->request_resources), &qret_avail);
+                       if (qret != RM_OK || qret_avail != 1) {
+                               _mmcam_dbg_log("rm query failed. retry with sub devices");
+
+                               resource_count = 0;
+
+                               if (preview_format == MM_PIXEL_FORMAT_ENCODED_H264) {
+                                       hcamcorder->request_resources.category_id[resource_count] = RM_CATEGORY_VIDEO_DECODER_SUB;
+                                       _mmcam_dbg_log("request dec rsc - category 0x%x", RM_CATEGORY_VIDEO_DECODER_SUB);
+                                       resource_count++;
+                               }
+
+                               if (display_surface_type == MM_DISPLAY_SURFACE_OVERLAY) {
+                                       hcamcorder->request_resources.category_id[resource_count] = RM_CATEGORY_SCALER_SUB;
+                                       _mmcam_dbg_log("request scaler rsc - category 0x%x", RM_CATEGORY_SCALER_SUB);
+                                       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 rsc - category 0x%x", RM_CATEGORY_CAMERA);
+
+               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_RESOURCE_INTERNAL;
                        goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
                }
+#endif /* _MMCAMCORDER_RM_SUPPORT */
        }
 
        /* create pipeline */
+       traceBegin(TTRACE_TAG_CAMERA, "MMCAMCORDER:REALIZE:CREATE_PIPELINE");
+
        ret = _mmcamcorder_create_pipeline(handle, hcamcorder->type);
+
+       traceEnd(TTRACE_TAG_CAMERA);
+
        if (ret != MM_ERROR_NONE) {
                /* check internal error of gstreamer */
                if (hcamcorder->error_code != MM_ERROR_NONE) {
@@ -1129,76 +1098,59 @@ int _mmcamcorder_realize(MMHandleType handle)
                goto _ERR_CAMCORDER_CMD;
        }
 
-       _mmcamcorder_set_state(handle, state_TO);
+       _mmcamcorder_set_state(handle, MM_CAMCORDER_STATE_READY);
 
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
        return MM_ERROR_NONE;
 
 _ERR_CAMCORDER_CMD:
+#ifdef _MMCAMCORDER_MM_RM_SUPPORT
        /* release hw resources */
+       _MMCAMCORDER_LOCK_RESOURCE(hcamcorder);
        if (hcamcorder->type == MM_CAMCORDER_MODE_VIDEO_CAPTURE) {
-               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");
+               if (hcamcorder->camera_resource != NULL) {
+                       mm_resource_manager_mark_for_release(hcamcorder->resource_manager,
+                                       hcamcorder->camera_resource);
+                       hcamcorder->camera_resource = NULL;
                }
-               else if (ret_resource != MM_ERROR_NONE) {
-                       _mmcam_dbg_err("failed to release resource, ret_resource(0x%x)", ret_resource);
+               if (hcamcorder->video_overlay_resource != NULL) {
+                       mm_resource_manager_mark_for_release(hcamcorder->resource_manager,
+                                       hcamcorder->video_overlay_resource);
+                       hcamcorder->video_overlay_resource = NULL;
                }
-               ret_resource = _mmcamcorder_resource_manager_unprepare(&hcamcorder->resource_manager);
-               if (ret_resource != MM_ERROR_NONE) {
-                       _mmcam_dbg_err("failed to unprepare resource manager, ret_resource(0x%x)", ret_resource);
+               mm_resource_manager_commit(hcamcorder->resource_manager);
+       }
+       _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
+#endif /* _MMCAMCORDER_MM_RM_SUPPORT */
+#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 ");
                }
-       }
-       /* 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);
+               /* 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_AFTER_LOCK:
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
-       if (hcamcorder->sound_focus_register) {
-               if (hcamcorder->sound_focus_watch_id > 0) {
-                       if (mm_sound_unset_focus_watch_callback(hcamcorder->sound_focus_watch_id) != MM_ERROR_NONE) {
-                               _mmcam_dbg_warn("mm_sound_unset_focus_watch_callback[id %d] failed",
-                                               hcamcorder->sound_focus_watch_id);
-                       } else {
-                               _mmcam_dbg_warn("mm_sound_unset_focus_watch_callback[id %d] done",
-                                               hcamcorder->sound_focus_watch_id);
-                       }
-               }
-
-               if (hcamcorder->acquired_focus > 0) {
-                               if (mm_sound_release_focus(0, hcamcorder->acquired_focus, NULL) != MM_ERROR_NONE) {
-                                       _mmcam_dbg_err("mm_sound_release_focus[focus %d] failed",
-                                                      hcamcorder->acquired_focus);
-                               } else {
-                                       _mmcam_dbg_err("mm_sound_release_focus[focus %d] done",
-                                                      hcamcorder->acquired_focus);
-                               }
-               }
-       }
-
 _ERR_CAMCORDER_CMD_PRECON:
-       _mmcam_dbg_err("Realize fail (type %d, state %d, ret %x)",
-                      hcamcorder->type, state, ret);
+       _mmcam_dbg_err("Realize fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret);
 
        return ret;
 }
@@ -1208,8 +1160,6 @@ int _mmcamcorder_unrealize(MMHandleType handle)
 {
        int ret = MM_ERROR_NONE;
        int state = MM_CAMCORDER_STATE_NONE;
-       int state_FROM = MM_CAMCORDER_STATE_READY;
-       int state_TO = MM_CAMCORDER_STATE_NULL;
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
@@ -1228,7 +1178,7 @@ int _mmcamcorder_unrealize(MMHandleType handle)
        }
 
        state = _mmcamcorder_get_state(handle);
-       if (state != state_FROM) {
+       if (state != MM_CAMCORDER_STATE_READY) {
                _mmcam_dbg_err("Wrong state(%d)", state);
                ret = MM_ERROR_CAMCORDER_INVALID_STATE;
                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
@@ -1243,89 +1193,84 @@ int _mmcamcorder_unrealize(MMHandleType handle)
                hcamcorder->sub_context = NULL;
        }
 
-       if (hcamcorder->type == MM_CAMCORDER_MODE_VIDEO_CAPTURE) {
-               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) {
-                       _mmcam_dbg_err("failed to release resource, ret(0x%x)", ret);
-                       ret = MM_ERROR_CAMCORDER_INTERNAL;
-                       goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
-               }
-               ret = _mmcamcorder_resource_manager_unprepare(&hcamcorder->resource_manager);
-               if (ret != MM_ERROR_NONE) {
-                       _mmcam_dbg_err("failed to unprepare resource manager, ret(0x%x)", ret);
-               }
-       }
-
-       /* Deinitialize main context member */
-       hcamcorder->command = NULL;
-
-       _mmcam_dbg_log("focus register %d, session flag 0x%x, state_change_by_system %d",
-                      hcamcorder->sound_focus_register, hcamcorder->session_flags, hcamcorder->state_change_by_system);
+#ifdef _MMCAMCORDER_MM_RM_SUPPORT
+       _MMCAMCORDER_LOCK_RESOURCE(hcamcorder);
+       _mmcam_dbg_warn("lock resource - cb calling %d", hcamcorder->is_release_cb_calling);
 
-       /* release sound focus or unset sound focus watch callback */
-       if (hcamcorder->sound_focus_register) {
-               int ret_sound = MM_ERROR_NONE;
+       if (hcamcorder->type == MM_CAMCORDER_MODE_VIDEO_CAPTURE &&
+               hcamcorder->state_change_by_system != _MMCAMCORDER_STATE_CHANGE_BY_RM &&
+               hcamcorder->is_release_cb_calling == FALSE) {
 
-               _mmcam_dbg_log("state_change_by_system %d, session flag 0x%x, acquired_focus %d, sound_focus_id %d, sound_focus_watch_id %d",
-                              hcamcorder->state_change_by_system, hcamcorder->session_flags, hcamcorder->acquired_focus,
-                              hcamcorder->sound_focus_id, hcamcorder->sound_focus_watch_id);
-
-               if (hcamcorder->state_change_by_system != _MMCAMCORDER_STATE_CHANGE_BY_ASM &&
-                   hcamcorder->sound_focus_watch_id > 0) {
-                       ret_sound = mm_sound_unset_focus_watch_callback(hcamcorder->sound_focus_watch_id);
-                       if (ret_sound != MM_ERROR_NONE) {
-                               _mmcam_dbg_warn("mm_sound_unset_focus_watch_callback failed [0x%x]",
-                                               ret_sound);
-                       } else {
-                               _mmcam_dbg_warn("mm_sound_unset_focus_watch_callback done");
+               /* release resource */
+               if (hcamcorder->camera_resource != NULL) {
+                       ret = mm_resource_manager_mark_for_release(hcamcorder->resource_manager,
+                                       hcamcorder->camera_resource);
+                       if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
+                               _mmcam_dbg_err("could not mark camera resource for release");
+                               ret = MM_ERROR_CAMCORDER_INTERNAL;
+                               _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
+                               _mmcam_dbg_log("unlock resource");
+                               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
                        }
-               } else {
-                       _mmcam_dbg_warn("no need to unset watch callback.[state_change_by_system %d, sound_focus_watch_id %d]",
-                                       hcamcorder->state_change_by_system, hcamcorder->sound_focus_watch_id);
                }
 
-               if (hcamcorder->acquired_focus > 0) {
-                       ret_sound = mm_sound_release_focus(0, hcamcorder->acquired_focus, NULL);
-                       if (ret_sound != MM_ERROR_NONE) {
-                               _mmcam_dbg_warn("mm_sound_release_focus failed [0x%x]",
-                                               ret_sound);
-                       } else {
-                               _mmcam_dbg_log("mm_sound_release_focus done");
+               if (hcamcorder->video_overlay_resource != NULL) {
+                       ret = mm_resource_manager_mark_for_release(hcamcorder->resource_manager,
+                                       hcamcorder->video_overlay_resource);
+                       if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
+                               _mmcam_dbg_err("could not mark overlay resource for release");
+                               ret = MM_ERROR_CAMCORDER_INTERNAL;
+                               _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
+                               _mmcam_dbg_log("unlock resource");
+                               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
                        }
+               }
+
+               ret = mm_resource_manager_commit(hcamcorder->resource_manager);
+
+               if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
+                       _mmcam_dbg_err("failed to release resource, ret(0x%x)", ret);
+                       ret = MM_ERROR_CAMCORDER_INTERNAL;
+
+                       _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
+                       _mmcam_dbg_log("unlock resource");
+
+                       goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
                } else {
-                       _mmcam_dbg_warn("no need to release focus - current acquired focus %d",
-                                       hcamcorder->acquired_focus);
+                       if (hcamcorder->camera_resource != NULL)
+                               hcamcorder->camera_resource = NULL;
+                       if (hcamcorder->video_overlay_resource != NULL)
+                               hcamcorder->video_overlay_resource = NULL;
                }
        }
 
-       /* set camera state to vconf key */
-       if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
-               int vconf_camera_state = 0;
+       _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
 
-               /* 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_warn("unlock resource");
+#endif /* _MMCAMCORDER_MM_RM_SUPPORT */
 
-               _mmcam_dbg_log("VCONFKEY_CAMERA_STATE prev %d -> cur %d",
-                              vconf_camera_state, VCONFKEY_CAMERA_STATE_NULL);
-       } else {
-               int vconf_recorder_state = 0;
+#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];
 
-               /* 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);
+                       iret = rm_deallocate_resources(hcamcorder->rm_handle, &requested);
+                       if (iret != RM_OK)
+                               _mmcam_dbg_err("Resource deallocation request failed ");
+               }
+#endif /* _MMCAMCORDER_RM_SUPPORT*/
 
-               _mmcam_dbg_log("VCONFKEY_RECORDER_STATE prev %d -> cur %d",
-                              vconf_recorder_state, VCONFKEY_RECORDER_STATE_NULL);
-       }
+       /* Deinitialize main context member */
+       hcamcorder->command = NULL;
 
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
-       _mmcamcorder_set_state(handle, state_TO);
+       _mmcamcorder_set_state(handle, MM_CAMCORDER_STATE_NULL);
 
        return MM_ERROR_NONE;
 
@@ -1334,8 +1279,7 @@ _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
 
 _ERR_CAMCORDER_CMD_PRECON:
        /* send message */
-       _mmcam_dbg_err("Unrealize fail (type %d, state %d, ret %x)",
-                      hcamcorder->type, state, ret);
+       _mmcam_dbg_err("Unrealize fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret);
 
        return ret;
 }
@@ -1344,8 +1288,6 @@ int _mmcamcorder_start(MMHandleType handle)
 {
        int ret = MM_ERROR_NONE;
        int state = MM_CAMCORDER_STATE_NONE;
-       int state_FROM = MM_CAMCORDER_STATE_READY;
-       int state_TO =MM_CAMCORDER_STATE_PREPARE;
 
        _MMCamcorderSubContext *sc = NULL;
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
@@ -1368,7 +1310,7 @@ int _mmcamcorder_start(MMHandleType handle)
        }
 
        state = _mmcamcorder_get_state(handle);
-       if (state != state_FROM) {
+       if (state != MM_CAMCORDER_STATE_READY) {
                _mmcam_dbg_err("Wrong state(%d)", state);
                ret = MM_ERROR_CAMCORDER_INVALID_STATE;
                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
@@ -1378,9 +1320,8 @@ int _mmcamcorder_start(MMHandleType handle)
        hcamcorder->error_code = MM_ERROR_NONE;
 
        /* set attributes related sensor */
-       if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
+       if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO)
                _mmcamcorder_set_attribute_to_camsensor(handle);
-       }
 
        ret = hcamcorder->command((MMHandleType)hcamcorder, _MMCamcorder_CMD_PREVIEW_START);
        if (ret != MM_ERROR_NONE) {
@@ -1392,20 +1333,11 @@ int _mmcamcorder_start(MMHandleType handle)
                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
        }
 
-       _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);
+       _mmcamcorder_set_state(handle, MM_CAMCORDER_STATE_PREPARE);
 
-               _mmcam_dbg_log("VCONFKEY_CAMERA_STATE prev %d -> cur %d",
-                              vconf_camera_state, VCONFKEY_CAMERA_STATE_PREVIEW);
-       }
+       /* set attributes related sensor - after start preview */
+       if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO)
+               _mmcamcorder_set_attribute_to_camsensor2(handle);
 
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
@@ -1424,7 +1356,7 @@ _ERR_CAMCORDER_CMD_PRECON:
        }
 
        _mmcam_dbg_err("Start fail (type %d, state %d, ret %x)",
-                      hcamcorder->type, state, ret);
+                                  hcamcorder->type, state, ret);
 
        return ret;
 }
@@ -1433,8 +1365,6 @@ int _mmcamcorder_stop(MMHandleType handle)
 {
        int ret = MM_ERROR_NONE;
        int state = MM_CAMCORDER_STATE_NONE;
-       int state_FROM = MM_CAMCORDER_STATE_PREPARE;
-       int state_TO = MM_CAMCORDER_STATE_READY;
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
@@ -1453,30 +1383,33 @@ int _mmcamcorder_stop(MMHandleType handle)
        }
 
        state = _mmcamcorder_get_state(handle);
-       if (state != state_FROM) {
+       if (state != MM_CAMCORDER_STATE_PREPARE) {
                _mmcam_dbg_err("Wrong state(%d)", state);
                ret = MM_ERROR_CAMCORDER_INVALID_STATE;
                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
        }
 
        ret = hcamcorder->command((MMHandleType)hcamcorder, _MMCamcorder_CMD_PREVIEW_STOP);
-       if (ret != MM_ERROR_NONE) {
+       if (ret != MM_ERROR_NONE)
                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
-       }
 
-       _mmcamcorder_set_state(handle, state_TO);
+       _mmcamcorder_set_state(handle, MM_CAMCORDER_STATE_READY);
 
        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_OPEN);
+               /* unsubscribe remained unsubscribed signal */
+               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);
 
-               _mmcam_dbg_log("VCONFKEY_CAMERA_STATE prev %d -> cur %d",
-                              vconf_camera_state, VCONFKEY_CAMERA_STATE_OPEN);
+               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);
        }
 
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
@@ -1488,8 +1421,7 @@ _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
 
 _ERR_CAMCORDER_CMD_PRECON:
        /* send message */
-       _mmcam_dbg_err("Stop fail (type %d, state %d, ret %x)",
-                      hcamcorder->type, state, ret);
+       _mmcam_dbg_err("Stop fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret);
 
        return ret;
 }
@@ -1502,7 +1434,6 @@ int _mmcamcorder_capture_start(MMHandleType handle)
        int state_FROM_0 = MM_CAMCORDER_STATE_PREPARE;
        int state_FROM_1 = MM_CAMCORDER_STATE_RECORDING;
        int state_FROM_2 = MM_CAMCORDER_STATE_PAUSED;
-       int state_TO = MM_CAMCORDER_STATE_CAPTURING;
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
@@ -1521,9 +1452,7 @@ int _mmcamcorder_capture_start(MMHandleType handle)
        }
 
        state = _mmcamcorder_get_state(handle);
-       if (state != state_FROM_0 &&
-           state != state_FROM_1 &&
-           state != state_FROM_2) {
+       if (state != state_FROM_0 && state != state_FROM_1 && state != state_FROM_2) {
                _mmcam_dbg_err("Wrong state(%d)", state);
                ret = MM_ERROR_CAMCORDER_INVALID_STATE;
                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
@@ -1536,16 +1465,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;
                        }
@@ -1553,28 +1482,24 @@ int _mmcamcorder_capture_start(MMHandleType handle)
        }
 
        ret = hcamcorder->command((MMHandleType)hcamcorder, _MMCamcorder_CMD_CAPTURE);
-       if (ret != MM_ERROR_NONE) {
+       if (ret != MM_ERROR_NONE)
                goto _ERR_CAMCORDER_CMD;
-       }
 
        /* Do not change state when recording snapshot capture */
-       if (state == state_FROM_0) {
-               _mmcamcorder_set_state(handle, state_TO);
-       }
+       if (state == state_FROM_0)
+               _mmcamcorder_set_state(handle, MM_CAMCORDER_STATE_CAPTURING);
 
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
        /* Init break continuous shot attr */
-       if (mm_camcorder_set_attributes(handle, NULL, "capture-break-cont-shot", 0, NULL) != MM_ERROR_NONE) {
+       if (mm_camcorder_set_attributes(handle, NULL, MMCAM_CAPTURE_BREAK_CONTINUOUS_SHOT, 0, NULL) != MM_ERROR_NONE)
                _mmcam_dbg_warn("capture-break-cont-shot set 0 failed");
-       }
 
        return MM_ERROR_NONE;
 
 _ERR_CAMCORDER_CMD:
-       if (hcamcorder->capture_in_recording) {
+       if (hcamcorder->capture_in_recording)
                hcamcorder->capture_in_recording = FALSE;
-       }
 
 _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
@@ -1582,7 +1507,7 @@ _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
 _ERR_CAMCORDER_CMD_PRECON:
        /* send message */
        _mmcam_dbg_err("Capture start fail (type %d, state %d, ret %x)",
-                      hcamcorder->type, state, ret);
+               hcamcorder->type, state, ret);
 
        return ret;
 }
@@ -1591,8 +1516,6 @@ int _mmcamcorder_capture_stop(MMHandleType handle)
 {
        int ret = MM_ERROR_NONE;
        int state = MM_CAMCORDER_STATE_NONE;
-       int state_FROM = MM_CAMCORDER_STATE_CAPTURING;
-       int state_TO = MM_CAMCORDER_STATE_PREPARE;
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
        _mmcam_dbg_log("");
@@ -1610,18 +1533,17 @@ int _mmcamcorder_capture_stop(MMHandleType handle)
        }
 
        state = _mmcamcorder_get_state(handle);
-       if (state != state_FROM) {
+       if (state != MM_CAMCORDER_STATE_CAPTURING) {
                _mmcam_dbg_err("Wrong state(%d)", state);
                ret = MM_ERROR_CAMCORDER_INVALID_STATE;
                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
        }
 
        ret = hcamcorder->command((MMHandleType)hcamcorder, _MMCamcorder_CMD_PREVIEW_START);
-       if (ret != MM_ERROR_NONE) {
+       if (ret != MM_ERROR_NONE)
                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
-       }
 
-       _mmcamcorder_set_state(handle, state_TO);
+       _mmcamcorder_set_state(handle, MM_CAMCORDER_STATE_PREPARE);
 
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
@@ -1633,7 +1555,7 @@ _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
 _ERR_CAMCORDER_CMD_PRECON:
        /* send message */
        _mmcam_dbg_err("Capture stop fail (type %d, state %d, ret %x)",
-                      hcamcorder->type, state, ret);
+               hcamcorder->type, state, ret);
 
        return ret;
 }
@@ -1642,20 +1564,21 @@ int _mmcamcorder_record(MMHandleType handle)
 {
        int ret = MM_ERROR_NONE;
        int state = MM_CAMCORDER_STATE_NONE;
-       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);
+       _MMCamcorderSubContext *sc = NULL;
 
        _mmcam_dbg_log("");
 
-       if (!hcamcorder) {
+       if (!hcamcorder || !MMF_CAMCORDER_SUBCONTEXT(hcamcorder)) {
                _mmcam_dbg_err("Not initialized");
                ret = MM_ERROR_CAMCORDER_NOT_INITIALIZED;
                return ret;
        }
 
+       sc = MMF_CAMCORDER_SUBCONTEXT(handle);
+
        if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) {
                _mmcam_dbg_err("Another command is running.");
                ret = MM_ERROR_CAMCORDER_CMD_IS_RUNNING;
@@ -1663,7 +1586,7 @@ int _mmcamcorder_record(MMHandleType handle)
        }
 
        state = _mmcamcorder_get_state(handle);
-       if (state != state_FROM1 && state != state_FROM2) {
+       if (state != MM_CAMCORDER_STATE_PREPARE && state != MM_CAMCORDER_STATE_PAUSED) {
                _mmcam_dbg_err("Wrong state(%d)", state);
                ret = MM_ERROR_CAMCORDER_INVALID_STATE;
                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
@@ -1672,6 +1595,33 @@ int _mmcamcorder_record(MMHandleType handle)
        /* initialize error code */
        hcamcorder->error_code = MM_ERROR_NONE;
 
+       /* get audio disable */
+       mm_camcorder_get_attributes(handle, NULL,
+               MMCAM_AUDIO_DISABLE, &sc->audio_disable,
+               NULL);
+
+       sc->audio_disable |= sc->is_modified_rate;
+
+       /* check mic policy from DPM */
+       if (hcamcorder->dpm_handle && sc->audio_disable == FALSE) {
+               if (dpm_restriction_get_microphone_state(hcamcorder->dpm_handle, &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;
+
+                               _mmcamcorder_request_dpm_popup(hcamcorder->gdbus_conn, "microphone");
+
+                               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+                       }
+               } else {
+                       _mmcam_dbg_err("get DPM mic state failed, keep going...");
+               }
+       } else {
+               _mmcam_dbg_warn("skip dpm check - handle %p, audio disable %d",
+                       hcamcorder->dpm_handle, sc->audio_disable);
+       }
+
        ret = hcamcorder->command((MMHandleType)hcamcorder, _MMCamcorder_CMD_RECORD);
        if (ret != MM_ERROR_NONE) {
                /* check internal error of gstreamer */
@@ -1682,28 +1632,7 @@ int _mmcamcorder_record(MMHandleType handle)
                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
        }
 
-       _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_set_state(handle, MM_CAMCORDER_STATE_RECORDING);
 
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
@@ -1722,7 +1651,7 @@ _ERR_CAMCORDER_CMD_PRECON:
        }
 
        _mmcam_dbg_err("Record fail (type %d, state %d, ret %x)",
-                      hcamcorder->type, state, ret);
+                                  hcamcorder->type, state, ret);
 
        return ret;
 }
@@ -1732,8 +1661,6 @@ int _mmcamcorder_pause(MMHandleType handle)
 {
        int ret = MM_ERROR_NONE;
        int state = MM_CAMCORDER_STATE_NONE;
-       int state_FROM = MM_CAMCORDER_STATE_RECORDING;
-       int state_TO = MM_CAMCORDER_STATE_PAUSED;
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
@@ -1752,39 +1679,17 @@ int _mmcamcorder_pause(MMHandleType handle)
        }
 
        state = _mmcamcorder_get_state(handle);
-       if (state != state_FROM) {
+       if (state != MM_CAMCORDER_STATE_RECORDING) {
                _mmcam_dbg_err("Wrong state(%d)", state);
                ret = MM_ERROR_CAMCORDER_INVALID_STATE;
                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
        }
 
        ret = hcamcorder->command((MMHandleType)hcamcorder, _MMCamcorder_CMD_PAUSE);
-       if (ret != MM_ERROR_NONE) {
+       if (ret != MM_ERROR_NONE)
                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
-       }
-
-       _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_set_state(handle, MM_CAMCORDER_STATE_PAUSED);
 
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
@@ -1795,8 +1700,7 @@ _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
 
 _ERR_CAMCORDER_CMD_PRECON:
        /* send message */
-       _mmcam_dbg_err("Pause fail (type %d, state %d, ret %x)",
-                      hcamcorder->type, state, ret);
+       _mmcam_dbg_err("Pause fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret);
 
        return ret;
 }
@@ -1806,9 +1710,6 @@ int _mmcamcorder_commit(MMHandleType handle)
 {
        int ret = MM_ERROR_NONE;
        int state = MM_CAMCORDER_STATE_NONE;
-       int state_FROM1 = MM_CAMCORDER_STATE_RECORDING;
-       int state_FROM2 = MM_CAMCORDER_STATE_PAUSED;
-       int state_TO = MM_CAMCORDER_STATE_PREPARE;
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
@@ -1827,42 +1728,23 @@ int _mmcamcorder_commit(MMHandleType handle)
        }
 
        state = _mmcamcorder_get_state(handle);
-       if (state != state_FROM1 && state != state_FROM2) {
+       if (state != MM_CAMCORDER_STATE_RECORDING && state != MM_CAMCORDER_STATE_PAUSED) {
                _mmcam_dbg_err("Wrong state(%d)", state);
                ret = MM_ERROR_CAMCORDER_INVALID_STATE;
                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) {
+       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_set_state(handle, MM_CAMCORDER_STATE_PREPARE);
 
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
-       _mmcamcorder_set_state(handle,state_TO);
-
        return MM_ERROR_NONE;
 
 _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
@@ -1870,8 +1752,7 @@ _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
 
 _ERR_CAMCORDER_CMD_PRECON:
        /* send message */
-       _mmcam_dbg_err("Commit fail (type %d, state %d, ret %x)",
-                      hcamcorder->type, state, ret);
+       _mmcam_dbg_err("Commit fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret);
 
        return ret;
 }
@@ -1881,9 +1762,6 @@ int _mmcamcorder_cancel(MMHandleType handle)
 {
        int ret = MM_ERROR_NONE;
        int state = MM_CAMCORDER_STATE_NONE;
-       int state_FROM1 = MM_CAMCORDER_STATE_RECORDING;
-       int state_FROM2 = MM_CAMCORDER_STATE_PAUSED;
-       int state_TO = MM_CAMCORDER_STATE_PREPARE;
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
@@ -1902,39 +1780,17 @@ int _mmcamcorder_cancel(MMHandleType handle)
        }
 
        state = _mmcamcorder_get_state(handle);
-       if (state != state_FROM1 && state != state_FROM2) {
+       if (state != MM_CAMCORDER_STATE_RECORDING && state != MM_CAMCORDER_STATE_PAUSED) {
                _mmcam_dbg_err("Wrong state(%d)", state);
                ret = MM_ERROR_CAMCORDER_INVALID_STATE;
                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
        }
 
        ret = hcamcorder->command((MMHandleType)hcamcorder, _MMCamcorder_CMD_CANCEL);
-       if (ret != MM_ERROR_NONE) {
+       if (ret != MM_ERROR_NONE)
                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
-       }
-
-       _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_set_state(handle, MM_CAMCORDER_STATE_PREPARE);
 
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
@@ -1946,7 +1802,7 @@ _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
 _ERR_CAMCORDER_CMD_PRECON:
        /* send message */
        _mmcam_dbg_err("Cancel fail (type %d, state %d, ret %x)",
-                      hcamcorder->type, state, ret);
+                                  hcamcorder->type, state, ret);
 
        return ret;
 }
@@ -1972,9 +1828,8 @@ int _mmcamcorder_set_message_callback(MMHandleType handle, MMMessageCallback cal
 
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
-       if (callback == NULL) {
+       if (callback == NULL)
                _mmcam_dbg_warn("Message Callback is disabled, because application sets it to NULL");
-       }
 
        if (!_MMCAMCORDER_TRYLOCK_MESSAGE_CALLBACK(hcamcorder)) {
                _mmcam_dbg_warn("Application's message callback is running now");
@@ -1999,14 +1854,10 @@ int _mmcamcorder_set_video_stream_callback(MMHandleType handle, mm_camcorder_vid
 
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
-       if (callback == NULL) {
+       if (callback == NULL)
                _mmcam_dbg_warn("Video Stream Callback is disabled, because application sets it to NULL");
-       }
 
-       if (!_MMCAMCORDER_TRYLOCK_VSTREAM_CALLBACK(hcamcorder)) {
-               _mmcam_dbg_warn("Application's video stream callback is running now");
-               return MM_ERROR_CAMCORDER_INVALID_CONDITION;
-       }
+       _MMCAMCORDER_LOCK_VSTREAM_CALLBACK(hcamcorder);
 
        hcamcorder->vstream_cb = callback;
        hcamcorder->vstream_cb_param = user_data;
@@ -2025,9 +1876,8 @@ int _mmcamcorder_set_audio_stream_callback(MMHandleType handle, mm_camcorder_aud
 
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
-       if (callback == NULL) {
+       if (callback == NULL)
                _mmcam_dbg_warn("Audio Stream Callback is disabled, because application sets it to NULL");
-       }
 
        if (!_MMCAMCORDER_TRYLOCK_ASTREAM_CALLBACK(hcamcorder)) {
                _mmcam_dbg_warn("Application's audio stream callback is running now");
@@ -2043,6 +1893,31 @@ int _mmcamcorder_set_audio_stream_callback(MMHandleType handle, mm_camcorder_aud
 }
 
 
+int _mmcamcorder_set_muxed_stream_callback(MMHandleType handle, mm_camcorder_muxed_stream_callback callback, void *user_data)
+{
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
+
+       _mmcam_dbg_log("");
+
+       mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
+
+       if (callback == NULL)
+               _mmcam_dbg_warn("Muxed Stream Callback is disabled, because application sets it to NULL");
+
+       if (!_MMCAMCORDER_TRYLOCK_MSTREAM_CALLBACK(hcamcorder)) {
+               _mmcam_dbg_warn("Application's muxed stream callback is running now");
+               return MM_ERROR_CAMCORDER_INVALID_CONDITION;
+       }
+
+       hcamcorder->mstream_cb = callback;
+       hcamcorder->mstream_cb_param = user_data;
+
+       _MMCAMCORDER_UNLOCK_MSTREAM_CALLBACK(hcamcorder);
+
+       return MM_ERROR_NONE;
+}
+
+
 int _mmcamcorder_set_video_capture_callback(MMHandleType handle, mm_camcorder_video_capture_callback callback, void *user_data)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
@@ -2051,9 +1926,8 @@ int _mmcamcorder_set_video_capture_callback(MMHandleType handle, mm_camcorder_vi
 
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
-       if (callback == NULL) {
+       if (callback == NULL)
                _mmcam_dbg_warn("Video Capture Callback is disabled, because application sets it to NULLL");
-       }
 
        if (!_MMCAMCORDER_TRYLOCK_VCAPTURE_CALLBACK(hcamcorder)) {
                _mmcam_dbg_warn("Application's video capture callback is running now");
@@ -2110,7 +1984,7 @@ int _mmcamcorder_init_focusing(MMHandleType handle)
 
        if (state == MM_CAMCORDER_STATE_CAPTURING ||
            state < MM_CAMCORDER_STATE_PREPARE) {
-               _mmcam_dbg_err( "Not proper state. state[%d]", state );
+               _mmcam_dbg_err("Not proper state. state[%d]", state);
                _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
                return MM_ERROR_CAMCORDER_INVALID_STATE;
        }
@@ -2121,9 +1995,10 @@ int _mmcamcorder_init_focusing(MMHandleType handle)
                return MM_ERROR_NONE;
        }
 
-       control = GST_CAMERA_CONTROL (sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst);
+       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;
        }
 
@@ -2136,19 +2011,18 @@ int _mmcamcorder_init_focusing(MMHandleType handle)
 
        /* Initialize lens position */
        mm_camcorder_get_attributes(handle, NULL,
-                                   MMCAM_CAMERA_FOCUS_MODE, &focus_mode,
-                                   MMCAM_CAMERA_AF_SCAN_RANGE, &af_range,
-                                   NULL);
+               MMCAM_CAMERA_FOCUS_MODE, &focus_mode,
+               MMCAM_CAMERA_AF_SCAN_RANGE, &af_range,
+               NULL);
        sensor_af_range = _mmcamcorder_convert_msl_to_sensor(handle, MM_CAM_CAMERA_AF_SCAN_RANGE, af_range);
        sensor_focus_mode = _mmcamcorder_convert_msl_to_sensor(handle, MM_CAM_CAMERA_FOCUS_MODE, focus_mode);
 
        gst_camera_control_get_focus(control, &current_focus_mode, &current_af_range);
 
-       if (current_focus_mode != sensor_focus_mode ||
-           current_af_range != sensor_af_range) {
+       if (current_focus_mode != sensor_focus_mode || current_af_range != sensor_af_range) {
                ret = gst_camera_control_set_focus(control, sensor_focus_mode, sensor_af_range);
        } else {
-               _mmcam_dbg_log("No need to init FOCUS [mode:%d, range:%d]", focus_mode, af_range );
+               _mmcam_dbg_log("No need to init FOCUS [mode:%d, range:%d]", focus_mode, af_range);
                ret = TRUE;
        }
 
@@ -2181,8 +2055,7 @@ int _mmcamcorder_adjust_focus(MMHandleType handle, int direction)
        }
 
        state = _mmcamcorder_get_state(handle);
-       if (state == MM_CAMCORDER_STATE_CAPTURING ||
-           state < MM_CAMCORDER_STATE_PREPARE) {
+       if (state == MM_CAMCORDER_STATE_CAPTURING || state < MM_CAMCORDER_STATE_PREPARE) {
                _mmcam_dbg_err("Not proper state. state[%d]", state);
                _MMCAMCORDER_UNLOCK_CMD(handle);
                return MM_ERROR_CAMCORDER_INVALID_STATE;
@@ -2190,22 +2063,25 @@ int _mmcamcorder_adjust_focus(MMHandleType handle, int direction)
 
        /* TODO : call a auto or manual focus function */
        ret = mm_camcorder_get_attributes(handle, &err_attr_name,
-                                         MMCAM_CAMERA_FOCUS_MODE, &focus_mode,
-                                         NULL);
+               MMCAM_CAMERA_FOCUS_MODE, &focus_mode,
+               NULL);
        if (ret != MM_ERROR_NONE) {
                _mmcam_dbg_warn("Get focus-mode fail. (%s:%x)", err_attr_name, ret);
-               SAFE_FREE (err_attr_name);
+               SAFE_FREE(err_attr_name);
                _MMCAMCORDER_UNLOCK_CMD(handle);
                return ret;
        }
 
-       if (focus_mode == MM_CAMCORDER_FOCUS_MODE_MANUAL) {
+       switch (focus_mode) {
+       case MM_CAMCORDER_FOCUS_MODE_MANUAL:
                ret = _mmcamcorder_adjust_manual_focus(handle, direction);
-       } else if (focus_mode == MM_CAMCORDER_FOCUS_MODE_AUTO ||
-                  focus_mode == MM_CAMCORDER_FOCUS_MODE_TOUCH_AUTO ||
-                  focus_mode == MM_CAMCORDER_FOCUS_MODE_CONTINUOUS) {
+               break;
+       case MM_CAMCORDER_FOCUS_MODE_AUTO:
+       case MM_CAMCORDER_FOCUS_MODE_TOUCH_AUTO:
+       case MM_CAMCORDER_FOCUS_MODE_CONTINUOUS:
                ret = _mmcamcorder_adjust_auto_focus(handle);
-       } else {
+               break;
+       default:
                _mmcam_dbg_err("It doesn't adjust focus. Focusing mode(%d)", focus_mode);
                ret = MM_ERROR_CAMCORDER_NOT_SUPPORTED;
        }
@@ -2231,8 +2107,8 @@ int _mmcamcorder_adjust_manual_focus(MMHandleType handle, int direction)
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
        mmf_return_val_if_fail(_MMFCAMCORDER_FOCUS_TOTAL_LEVEL != 1, MM_ERROR_CAMCORDER_NOT_SUPPORTED);
        mmf_return_val_if_fail((direction >= MM_CAMCORDER_MF_LENS_DIR_FORWARD) &&
-                              (direction <= MM_CAMCORDER_MF_LENS_DIR_BACKWARD),
-                              MM_ERROR_CAMCORDER_INVALID_ARGUMENT );
+               (direction <= MM_CAMCORDER_MF_LENS_DIR_BACKWARD),
+               MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
 
        sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
        mmf_return_val_if_fail(sc, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
@@ -2242,16 +2118,15 @@ int _mmcamcorder_adjust_manual_focus(MMHandleType handle, int direction)
                return MM_ERROR_NONE;
        }
 
-       control = GST_CAMERA_CONTROL (sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst);
+       control = GST_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst);
        if (control == NULL) {
                _mmcam_dbg_err("cast CAMERA_CONTROL failed");
                return MM_ERROR_CAMCORDER_INTERNAL;
        }
 
        /* TODO : get max, min level */
-       if (max_level - min_level + 1 < _MMFCAMCORDER_FOCUS_TOTAL_LEVEL) {
+       if (max_level - min_level + 1 < _MMFCAMCORDER_FOCUS_TOTAL_LEVEL)
                _mmcam_dbg_warn("Total level  of manual focus of MMF is greater than that of the camera driver.");
-       }
 
        unit_level = ((float)max_level - (float)min_level)/(float)(_MMFCAMCORDER_FOCUS_TOTAL_LEVEL - 1);
 
@@ -2260,18 +2135,16 @@ int _mmcamcorder_adjust_manual_focus(MMHandleType handle, int direction)
                return MM_ERROR_CAMCORDER_DEVICE_IO;
        }
 
-       //TODO : adjust unit level value
-       if (direction == MM_CAMCORDER_MF_LENS_DIR_FORWARD) {
+       /* TODO : adjust unit level value */
+       if (direction == MM_CAMCORDER_MF_LENS_DIR_FORWARD)
                focus_level = cur_level + unit_level;
-       } else if (direction == MM_CAMCORDER_MF_LENS_DIR_BACKWARD) {
+       else if (direction == MM_CAMCORDER_MF_LENS_DIR_BACKWARD)
                focus_level = cur_level - unit_level;
-       }
 
-       if (focus_level > max_level) {
+       if (focus_level > max_level)
                focus_level = max_level;
-       } else if (focus_level < min_level) {
+       else if (focus_level < min_level)
                focus_level = min_level;
-       }
 
        if (!gst_camera_control_set_focus_level(control, focus_level)) {
                _mmcam_dbg_err("Manual focusing fail.");
@@ -2300,7 +2173,7 @@ int _mmcamcorder_adjust_auto_focus(MMHandleType handle)
                return MM_ERROR_NONE;
        }
 
-       control = GST_CAMERA_CONTROL (sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst);
+       control = GST_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst);
        if (control) {
                /* Start AF */
                ret = gst_camera_control_start_auto_focus(control);
@@ -2338,9 +2211,8 @@ int _mmcamcorder_stop_focusing(MMHandleType handle)
        }
 
        state = _mmcamcorder_get_state(handle);
-       if (state == MM_CAMCORDER_STATE_CAPTURING ||
-           state < MM_CAMCORDER_STATE_PREPARE) {
-               _mmcam_dbg_err( "Not proper state. state[%d]", state );
+       if (state == MM_CAMCORDER_STATE_CAPTURING || state < MM_CAMCORDER_STATE_PREPARE) {
+               _mmcam_dbg_err("Not proper state. state[%d]", state);
                _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
                return MM_ERROR_CAMCORDER_INVALID_STATE;
        }
@@ -2394,9 +2266,8 @@ __mmcamcorder_gstreamer_init(camera_conf * conf)
        argc = malloc(sizeof(int));
        argv = malloc(sizeof(gchar *) * max_argc);
 
-       if (!argc || !argv) {
+       if (!argc || !argv)
                goto ERROR;
-       }
 
        memset(argv, 0, sizeof(gchar *) * max_argc);
 
@@ -2406,31 +2277,26 @@ __mmcamcorder_gstreamer_init(camera_conf * conf)
 
        /* add gst_param */
        _mmcamcorder_conf_get_value_string_array(conf,
-                                                CONFIGURE_CATEGORY_MAIN_GENERAL,
-                                                "GSTInitOption",
-                                                &GSTInitOption);
+               CONFIGURE_CATEGORY_MAIN_GENERAL,
+               "GSTInitOption",
+               &GSTInitOption);
        if (GSTInitOption != NULL && GSTInitOption->value) {
                cnt_str = GSTInitOption->count;
-               for( ; *argc < max_argc && *argc <= cnt_str ; (*argc)++ )
-               {
+               for ( ; *argc < max_argc && *argc <= cnt_str ; (*argc)++)
                        argv[*argc] = g_strdup(GSTInitOption->value[(*argc)-1]);
-               }
        }
 
        _mmcam_dbg_log("initializing gstreamer with following parameter[argc:%d]", *argc);
 
-       for (i = 0; i < *argc; i++) {
+       for (i = 0; i < *argc; i++)
                _mmcam_dbg_log("argv[%d] : %s", i, argv[i]);
-       }
 
        /* initializing gstreamer */
-       ret = gst_init_check (argc, &argv, &err);
+       ret = gst_init_check(argc, &argv, &err);
        if (!ret) {
-               _mmcam_dbg_err("Could not initialize GStreamer: %s ",
-                              err ? err->message : "unknown error occurred");
-               if (err) {
-                       g_error_free (err);
-               }
+               _mmcam_dbg_err("Could not initialize GStreamer: %s ", err ? err->message : "unknown error occurred");
+               if (err)
+                       g_error_free(err);
        }
 
        /* release */
@@ -2488,6 +2354,23 @@ int _mmcamcorder_get_state(MMHandleType handle)
 }
 
 
+int _mmcamcorder_get_state2(MMHandleType handle, int *state, int *old_state)
+{
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
+
+       mmf_return_val_if_fail(hcamcorder && state && old_state, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
+
+       _MMCAMCORDER_LOCK_STATE(handle);
+
+       *state = hcamcorder->state;
+       *old_state = hcamcorder->old_state;
+
+       _MMCAMCORDER_UNLOCK_STATE(handle);
+
+       return MM_ERROR_NONE;
+}
+
+
 void _mmcamcorder_set_state(MMHandleType handle, int state)
 {
        int old_state;
@@ -2501,22 +2384,22 @@ void _mmcamcorder_set_state(MMHandleType handle, int state)
        _MMCAMCORDER_LOCK_STATE(handle);
 
        old_state = hcamcorder->state;
-       if(old_state != state) {
+       if (old_state != state) {
                hcamcorder->state = state;
-               hcamcorder->target_state = state;
+               hcamcorder->old_state = old_state;
 
-               _mmcam_dbg_log("set state[%d] and send state-changed message", state);
+               _mmcam_dbg_log("set state[%d -> %d] and send state-changed message", old_state, state);
 
                /* To discern who changes the state */
                switch (hcamcorder->state_change_by_system) {
-               case _MMCAMCORDER_STATE_CHANGE_BY_ASM:
-                       msg.id = MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_ASM;
-                       msg.param.state.code = hcamcorder->interrupt_code;
-                       break;
                case _MMCAMCORDER_STATE_CHANGE_BY_RM:
                        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;
@@ -2537,20 +2420,6 @@ void _mmcamcorder_set_state(MMHandleType handle, int state)
 }
 
 
-int _mmcamcorder_get_async_state(MMHandleType handle)
-{
-       int state;
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-
-       _MMCAMCORDER_LOCK_STATE(handle);
-       state = hcamcorder->target_state;
-
-       _MMCAMCORDER_UNLOCK_STATE(handle);
-
-       return state;
-}
-
-
 _MMCamcorderSubContext *_mmcamcorder_alloc_subcontext(int type)
 {
        int i;
@@ -2571,44 +2440,41 @@ _MMCamcorderSubContext *_mmcamcorder_alloc_subcontext(int type)
        /* alloc info for each mode */
        switch (type) {
        case MM_CAMCORDER_MODE_AUDIO:
-               sc->info_audio = malloc( sizeof(_MMCamcorderAudioInfo));
-               if(!sc->info_audio) {
+               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));
-               if(!sc->info_image) {
+               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));
-               if(!sc->info_video) {
+               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;
        }
 
        /* alloc element array */
        sc->element = (_MMCamcorderGstElement *)malloc(sizeof(_MMCamcorderGstElement) * sc->element_num);
-       if(!sc->element) {
+       if (!sc->element) {
                _mmcam_dbg_err("Failed to alloc element structure");
                goto ALLOC_SUBCONTEXT_FAILED;
        }
 
        sc->encode_element = (_MMCamcorderGstElement *)malloc(sizeof(_MMCamcorderGstElement) * sc->encode_element_num);
-       if(!sc->encode_element) {
+       if (!sc->encode_element) {
                _mmcam_dbg_err("Failed to alloc encode element structure");
                goto ALLOC_SUBCONTEXT_FAILED;
        }
@@ -2624,7 +2490,7 @@ _MMCamcorderSubContext *_mmcamcorder_alloc_subcontext(int type)
        }
 
        sc->fourcc = 0x80000000;
-       sc->cam_stability_count = 0;
+       sc->frame_stability_count = 0;
        sc->drop_vframe = 0;
        sc->pass_first_vframe = 0;
        sc->is_modified_rate = FALSE;
@@ -2633,19 +2499,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;
-               }
-               if (sc->info_video) {
-                       pthread_mutex_destroy(&(sc->info_video->size_check_lock));
-                       free(sc->info_video);
-                       sc->info_video = NULL;
-               }
+               SAFE_G_FREE(sc->info_audio);
+               SAFE_G_FREE(sc->info_image);
+               if (sc->info_video)
+                       g_mutex_clear(&sc->info_video->size_check_lock);
+
+               SAFE_G_FREE(sc->info_video);
                if (sc->element) {
                        free(sc->element);
                        sc->element = NULL;
@@ -2687,21 +2546,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;
                }
@@ -2741,7 +2594,7 @@ gboolean _mmcamcorder_pipeline_cb_message(GstBus *bus, GstMessage *message, gpoi
 
        mmf_return_val_if_fail(hcamcorder, FALSE);
        mmf_return_val_if_fail(message, FALSE);
-       //_mmcam_dbg_log("message type=(%d)", GST_MESSAGE_TYPE(message));
+       /* _mmcam_dbg_log("message type=(%d)", GST_MESSAGE_TYPE(message)); */
 
        switch (GST_MESSAGE_TYPE(message)) {
        case GST_MESSAGE_UNKNOWN:
@@ -2749,55 +2602,44 @@ 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:
        {
                GError *err;
                gchar *debug;
-               gst_message_parse_warning (message, &err, &debug);
+               gst_message_parse_warning(message, &err, &debug);
 
                _mmcam_dbg_warn("GSTWARN: %s", err->message);
 
                __mmcamcorder_handle_gst_warning((MMHandleType)hcamcorder, message, err);
 
-               g_error_free (err);
-               g_free (debug);
+               g_error_free(err);
+               g_free(debug);
                break;
        }
        case GST_MESSAGE_INFO:
@@ -2821,8 +2663,12 @@ gboolean _mmcamcorder_pipeline_cb_message(GstBus *bus, GstMessage *message, gpoi
                                pipeline = sc->element[_MMCAMCORDER_MAIN_PIPE].gst;
                                if (message->src == (GstObject*)pipeline) {
                                        vnewstate = gst_structure_get_value(gst_message_get_structure(message), "new-state");
-                                       newstate = (GstState)vnewstate->data[0].v_int;
-                                       _mmcam_dbg_log("GST_MESSAGE_STATE_CHANGED[%s]",gst_element_state_get_name(newstate));
+                                       if (vnewstate) {
+                                               newstate = (GstState)vnewstate->data[0].v_int;
+                                               _mmcam_dbg_log("GST_MESSAGE_STATE_CHANGED[%s]", gst_element_state_get_name(newstate));
+                                       } else {
+                                               _mmcam_dbg_warn("get new state failed from msg");
+                                       }
                                }
                        }
                }
@@ -2881,7 +2727,7 @@ gboolean _mmcamcorder_pipeline_cb_message(GstBus *bus, GstMessage *message, gpoi
                _mmcam_dbg_log("GST_MESSAGE_ANY");
                break;
        case GST_MESSAGE_QOS:
-//             _mmcam_dbg_log("GST_MESSAGE_QOS");
+               /* _mmcam_dbg_log("GST_MESSAGE_QOS"); */
                break;
        default:
                _mmcam_dbg_log("not handled message type=(%d)", GST_MESSAGE_TYPE(message));
@@ -2926,8 +2772,7 @@ GstBusSyncReply _mmcamcorder_pipeline_bus_sync_callback(GstBus *bus, GstMessage
                element = GST_ELEMENT_CAST(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst);
 
                /* check domain[RESOURCE] and element[VIDEOSRC] */
-               if (err->domain == GST_RESOURCE_ERROR &&
-                   GST_ELEMENT_CAST(message->src) == element) {
+               if (err->domain == GST_RESOURCE_ERROR && GST_ELEMENT_CAST(message->src) == element) {
                        switch (err->code) {
                        case GST_RESOURCE_ERROR_BUSY:
                                _mmcam_dbg_err("Camera device [busy]");
@@ -2936,7 +2781,7 @@ GstBusSyncReply _mmcamcorder_pipeline_bus_sync_callback(GstBus *bus, GstMessage
                        case GST_RESOURCE_ERROR_OPEN_WRITE:
                                _mmcam_dbg_err("Camera device [open failed]");
                                hcamcorder->error_code = MM_ERROR_COMMON_INVALID_PERMISSION;
-                               //sc->error_code = MM_ERROR_CAMCORDER_DEVICE_OPEN; // SECURITY PART REQUEST PRIVILEGE
+                               /* sc->error_code = MM_ERROR_CAMCORDER_DEVICE_OPEN; // SECURITY PART REQUEST PRIVILEGE */
                                break;
                        case GST_RESOURCE_ERROR_OPEN_READ_WRITE:
                                _mmcam_dbg_err("Camera device [open failed]");
@@ -3020,22 +2865,18 @@ GstBusSyncReply _mmcamcorder_pipeline_bus_sync_callback(GstBus *bus, GstMessage
                        GstCameraControlFaceDetectInfo *fd_info = NULL;
                        MMCamFaceDetectInfo *cam_fd_info = NULL;
 
-                       if (g_value) {
+                       if (g_value)
                                fd_info = (GstCameraControlFaceDetectInfo *)g_value_get_pointer(g_value);
-                       }
 
                        if (fd_info == NULL) {
                                _mmcam_dbg_warn("fd_info is NULL");
                                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;
-
+                               _mmcam_dbg_warn("cam_fd_info alloc failed");
+                               SAFE_FREE(fd_info);
                                goto DROP_MESSAGE;
                        }
 
@@ -3043,7 +2884,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++) {
@@ -3055,20 +2896,19 @@ GstBusSyncReply _mmcamcorder_pipeline_bus_sync_callback(GstBus *bus, GstMessage
                                                cam_fd_info->face_info[i].rect.height = fd_info->face_info[i].rect.height;
                                                /*
                                                _mmcam_dbg_log("id %d, score %d, [%d,%d,%dx%d]",
-                                                              fd_info->face_info[i].id,
-                                                              fd_info->face_info[i].score,
-                                                              fd_info->face_info[i].rect.x,
-                                                              fd_info->face_info[i].rect.y,
-                                                              fd_info->face_info[i].rect.width,
-                                                              fd_info->face_info[i].rect.height);
+                                                       fd_info->face_info[i].id,
+                                                       fd_info->face_info[i].score,
+                                                       fd_info->face_info[i].rect.x,
+                                                       fd_info->face_info[i].rect.y,
+                                                       fd_info->face_info[i].rect.width,
+                                                       fd_info->face_info[i].rect.height);
                                                */
                                        }
                                } else {
                                        _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;
@@ -3093,10 +2933,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);
                                }
                        }
 
@@ -3105,6 +2944,7 @@ GstBusSyncReply _mmcamcorder_pipeline_bus_sync_callback(GstBus *bus, GstMessage
        }
 
        return GST_BUS_PASS;
+
 DROP_MESSAGE:
        gst_message_unref(message);
        message = NULL;
@@ -3113,7 +2953,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;
@@ -3128,7 +2968,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);
 
@@ -3146,176 +2999,144 @@ 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;
                        }
-               }
-
-               g_error_free(err);
+               } else {
+                       gboolean b_commiting = FALSE;
+                       storage_state_e storage_state = STORAGE_STATE_UNMOUNTABLE;
 
-       }
+                       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;
+                       }
 
-       return GST_BUS_PASS;
-}
+                       _MMCAMCORDER_LOCK(hcamcorder);
 
+                       switch (err->code) {
+                       case GST_RESOURCE_ERROR_WRITE:
+                               storage_get_state(hcamcorder->storage_info.id, &storage_state);
+                               if (storage_state == STORAGE_STATE_REMOVED ||
+                                       storage_state == STORAGE_STATE_UNMOUNTABLE) {
+                                       _mmcam_dbg_err("storage was removed! [storage state %d]", storage_state);
+                                       hcamcorder->error_code = MM_ERROR_OUT_OF_STORAGE;
+                               } else {
+                                       _mmcam_dbg_err("File write error, storage state %d", storage_state);
+                                       hcamcorder->error_code = MM_ERROR_FILE_WRITE;
+                               }
 
-void _mmcamcorder_sound_focus_cb(int id, mm_sound_focus_type_e focus_type,
-                                 mm_sound_focus_state_e focus_state, const char *reason_for_change,
-                                 const char *additional_info, void *user_data)
-{
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(user_data);
-       int current_state = MM_CAMCORDER_STATE_NONE;
+                               if (sc->ferror_send == FALSE) {
+                                       sc->ferror_send = TRUE;
+                               } else {
+                                       _mmcam_dbg_err("error was already sent");
+                                       _MMCAMCORDER_UNLOCK(hcamcorder);
+                                       goto DROP_MESSAGE;
+                               }
+                               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;
+                       }
 
-       mmf_return_if_fail((MMHandleType)hcamcorder);
+                       if (b_commiting) {
+                               _MMCAMCORDER_SIGNAL(hcamcorder);
+                               _MMCAMCORDER_UNLOCK(hcamcorder);
+                       } else {
+                               _MMCAMCORDER_UNLOCK(hcamcorder);
 
-       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;
-       }
+                               msg.id = MM_MESSAGE_CAMCORDER_ERROR;
+                               msg.param.code = hcamcorder->error_code;
 
-       _mmcam_dbg_log("sound focus callback : focus state %d, reason %s",
-                      focus_state, reason_for_change ? reason_for_change : "N/A");
+                               _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg);
+                       }
 
-       if (hcamcorder->session_flags & MM_SESSION_OPTION_UNINTERRUPTIBLE) {
-               _mmcam_dbg_warn("session flag is UNINTERRUPTIBLE. do nothing.");
-               return;
+                       goto DROP_MESSAGE;
+               }
        }
 
-       _MMCAMCORDER_LOCK_ASM(hcamcorder);
-
-       /* set value to inform a status is changed by asm */
-       hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_BY_ASM;
-
-       /* check the reason */
-       if (!strncmp(reason_for_change, "ringtone-voip", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN) ||
-           !strncmp(reason_for_change, "ringtone-call", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN) ||
-           !strncmp(reason_for_change, "voip", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN) ||
-           !strncmp(reason_for_change, "call-voice", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN)) {
-               hcamcorder->interrupt_code = MM_MSG_CODE_INTERRUPTED_BY_CALL_START;
-       } else if (!strncmp(reason_for_change, "alarm", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN)) {
-               hcamcorder->interrupt_code = MM_MSG_CODE_INTERRUPTED_BY_ALARM_START;
-       } else {
-               hcamcorder->interrupt_code = MM_MSG_CODE_INTERRUPTED_BY_MEDIA;
+       if (err) {
+               g_error_free(err);
+               err = NULL;
        }
 
-       if (focus_state == FOCUS_IS_RELEASED) {
-               hcamcorder->acquired_focus &= ~focus_type;
-
-               _mmcam_dbg_log("FOCUS is released [type %d, remained focus %d] : Stop pipeline[state:%d]",
-                              focus_type, hcamcorder->acquired_focus, current_state);
-
-               __mmcamcorder_force_stop(hcamcorder);
-
-               _mmcam_dbg_log("Finish opeartion. Pipeline is released");
-       } else if (focus_state == FOCUS_IS_ACQUIRED) {
-               _MMCamcorderMsgItem msg;
-
-               hcamcorder->acquired_focus |= focus_type;
-
-               _mmcam_dbg_log("FOCUS is acquired [type %d, new focus %d]",
-                              focus_type, hcamcorder->acquired_focus);
-
-               msg.id = MM_MESSAGE_READY_TO_RESUME;
-               _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg);
+       return GST_BUS_PASS;
 
-               _mmcam_dbg_log("Finish opeartion");
-       } else {
-               _mmcam_dbg_log("unknown focus state %d", focus_state);
+DROP_MESSAGE:
+       if (err) {
+               g_error_free(err);
+               err = NULL;
        }
 
-       /* restore value */
-       hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_NORMAL;
-
-       _MMCAMCORDER_UNLOCK_ASM(hcamcorder);
+       gst_message_unref(message);
+       message = NULL;
 
-       return;
+       return GST_BUS_DROP;
 }
 
 
-void _mmcamcorder_sound_focus_watch_cb(mm_sound_focus_type_e focus_type, mm_sound_focus_state_e focus_state,
-                                       const char *reason_for_change, const char *additional_info, void *user_data)
+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((MMHandleType)hcamcorder);
+       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) {
+       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_log("sound focus watch callback : focus state %d, reason %s",
-                      focus_state, reason_for_change ? reason_for_change : "N/A");
-
-       if (hcamcorder->session_flags & MM_SESSION_OPTION_UNINTERRUPTIBLE) {
-               _mmcam_dbg_warn("session flag is UNINTERRUPTIBLE. do nothing.");
-               return;
-       }
-
-       _MMCAMCORDER_LOCK_ASM(hcamcorder);
-
-       /* set value to inform a status is changed by asm */
-       hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_BY_ASM;
-
-       /* check the reason */
-       if (!strncmp(reason_for_change, "ringtone-voip", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN) ||
-           !strncmp(reason_for_change, "ringtone-call", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN) ||
-           !strncmp(reason_for_change, "voip", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN) ||
-           !strncmp(reason_for_change, "call-voice", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN)) {
-               hcamcorder->interrupt_code = MM_MSG_CODE_INTERRUPTED_BY_CALL_START;
-       } else if (!strncmp(reason_for_change, "alarm", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN)) {
-               hcamcorder->interrupt_code = MM_MSG_CODE_INTERRUPTED_BY_ALARM_START;
-       } else {
-               hcamcorder->interrupt_code = MM_MSG_CODE_INTERRUPTED_BY_MEDIA;
-       }
-
-       if (focus_state == FOCUS_IS_RELEASED) {
-               _MMCamcorderMsgItem msg;
-
-               _mmcam_dbg_log("other process's FOCUS is acquired");
+       _mmcam_dbg_warn("camera policy [%s], current state [%d]", value, current_state);
 
-               msg.id = MM_MESSAGE_READY_TO_RESUME;
-               _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg);
+       if (!strcmp(value, "disallowed")) {
+               _MMCAMCORDER_LOCK_INTERRUPT(hcamcorder);
 
-               _mmcam_dbg_log("Finish opeartion");
-       } else if (focus_state == FOCUS_IS_ACQUIRED) {
-               _mmcam_dbg_log("other process's FOCUS is released : Stop pipeline[state:%d]", current_state);
+               __mmcamcorder_force_stop(hcamcorder, _MMCAMCORDER_STATE_CHANGE_BY_DPM);
 
-               __mmcamcorder_force_stop(hcamcorder);
+               _MMCAMCORDER_UNLOCK_INTERRUPT(hcamcorder);
 
-               _mmcam_dbg_log("Finish opeartion. Pipeline is released");
-       } else {
-               _mmcam_dbg_log("unknown focus state %d", focus_state);
+               _mmcamcorder_request_dpm_popup(hcamcorder->gdbus_conn, "camera");
        }
 
-       /* restore value */
-       hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_NORMAL;
-
-       _MMCAMCORDER_UNLOCK_ASM(hcamcorder);
+       _mmcam_dbg_warn("done");
 
        return;
 }
@@ -3328,7 +3149,7 @@ int _mmcamcorder_create_pipeline(MMHandleType handle, int type)
        _MMCamcorderSubContext *sc = NULL;
        GstElement *pipeline = NULL;
 
-       _mmcam_dbg_log("handle : %x, type : %d", handle, type);
+       _mmcam_dbg_log("handle : %p, type : %d", handle, type);
 
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
@@ -3338,35 +3159,36 @@ int _mmcamcorder_create_pipeline(MMHandleType handle, int type)
        switch (type) {
        case MM_CAMCORDER_MODE_AUDIO:
                ret = _mmcamcorder_create_audio_pipeline(handle);
-               if (ret != MM_ERROR_NONE) {
+               if (ret != MM_ERROR_NONE)
                        return ret;
-               }
+
                break;
        case MM_CAMCORDER_MODE_VIDEO_CAPTURE:
        default:
                ret = _mmcamcorder_create_preview_pipeline(handle);
-               if (ret != MM_ERROR_NONE) {
+               if (ret != MM_ERROR_NONE)
                        return ret;
-               }
 
                /* connect capture signal */
                if (!sc->bencbin_capture) {
                        ret = _mmcamcorder_connect_capture_signal(handle);
-                       if (ret != MM_ERROR_NONE) {
+                       if (ret != MM_ERROR_NONE)
                                return ret;
-                       }
                }
                break;
        }
 
        pipeline = sc->element[_MMCAMCORDER_MAIN_PIPE].gst;
        if (type != MM_CAMCORDER_MODE_AUDIO) {
+               traceBegin(TTRACE_TAG_CAMERA, "MMCAMCORDER:REALIZE:SET_READY_TO_PIPELINE");
+
                ret = _mmcamcorder_gst_set_state(handle, pipeline, GST_STATE_READY);
+
+               traceEnd(TTRACE_TAG_CAMERA);
        }
 #ifdef _MMCAMCORDER_GET_DEVICE_INFO
-       if (!_mmcamcorder_get_device_info(handle)) {
+       if (!_mmcamcorder_get_device_info(handle))
                _mmcam_dbg_err("Getting device information error!!");
-       }
 #endif
 
        _mmcam_dbg_log("ret[%x]", ret);
@@ -3427,22 +3249,22 @@ void _mmcamcorder_destroy_pipeline(MMHandleType handle, int type)
                GstMessage *gst_msg = NULL;
                while ((gst_msg = gst_bus_pop(bus)) != NULL) {
                        _mmcamcorder_pipeline_cb_message(bus, gst_msg, (gpointer)hcamcorder);
-                       gst_message_unref( gst_msg );
+                       gst_message_unref(gst_msg);
                        gst_msg = NULL;
                }
-               gst_object_unref( bus );
+               gst_object_unref(bus);
                bus = NULL;
        }
 
        /* checking unreleased element */
-       for (i = 0 ; i < element_num ; i++ ) {
+       for (i = 0 ; i < element_num ; i++) {
                if (element[i].gst) {
                        if (GST_IS_ELEMENT(element[i].gst)) {
                                _mmcam_dbg_warn("Still alive element - ID[%d], name [%s], ref count[%d], status[%s]",
-                                               element[i].id,
-                                               GST_OBJECT_NAME(element[i].gst),
-                                               GST_OBJECT_REFCOUNT(element[i].gst),
-                                               gst_element_state_get_name(GST_STATE(element[i].gst)));
+                                       element[i].id,
+                                       GST_OBJECT_NAME(element[i].gst),
+                                       GST_OBJECT_REFCOUNT(element[i].gst),
+                                       gst_element_state_get_name(GST_STATE(element[i].gst)));
                                g_object_weak_unref(G_OBJECT(element[i].gst), (GWeakNotify)_mmcamcorder_element_release_noti, sc);
                        } else {
                                _mmcam_dbg_warn("The element[%d] is still aliving, check it", element[i].id);
@@ -3457,18 +3279,6 @@ void _mmcamcorder_destroy_pipeline(MMHandleType handle, int type)
 }
 
 
-int _mmcamcorder_gst_set_state_async(MMHandleType handle, GstElement *pipeline, GstState target_state)
-{
-       GstStateChangeReturn setChangeReturn = GST_STATE_CHANGE_FAILURE;
-
-       _MMCAMCORDER_LOCK_GST_STATE(handle);
-       setChangeReturn = gst_element_set_state(pipeline, target_state);
-       _MMCAMCORDER_UNLOCK_GST_STATE(handle);
-
-       return setChangeReturn;
-}
-
-
 #ifdef _MMCAMCORDER_USE_SET_ATTR_CB
 static gboolean __mmcamcorder_set_attr_to_camsensor_cb(gpointer data)
 {
@@ -3499,7 +3309,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);
@@ -3513,22 +3323,23 @@ 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);
-               _mmcam_dbg_log("gst_element_set_state[%d] return %d",
-                              target_state, setChangeReturn);
+               _mmcam_dbg_log("gst_element_set_state[%d] return %d", target_state, setChangeReturn);
+
                if (setChangeReturn != GST_STATE_CHANGE_FAILURE) {
                        getChangeReturn = gst_element_get_state(pipeline, &pipeline_state, NULL, get_timeout);
                        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;
@@ -3536,12 +3347,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()!!");
 
@@ -3551,7 +3362,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!!");
 
@@ -3604,7 +3415,7 @@ void _mmcamcorder_video_current_framerate_init(MMHandleType handle)
 }
 
 
-void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder)
+void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder, int state_change_by_system)
 {
        int i = 0;
        int loop = 0;
@@ -3612,6 +3423,7 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder)
        int result = MM_ERROR_NONE;
        int cmd_try_count = 0;
        int current_state = MM_CAMCORDER_STATE_NONE;
+       _MMCamcorderMsgItem msg;
 
        mmf_return_if_fail(hcamcorder);
 
@@ -3633,7 +3445,34 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder)
 
        current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder);
 
-       _mmcam_dbg_warn("Force STOP MMFW Camcorder");
+       _mmcam_dbg_warn("Force STOP MMFW Camcorder by %d", state_change_by_system);
+
+       /* set state_change_by_system for state change message */
+       hcamcorder->state_change_by_system = state_change_by_system;
+
+       if (current_state >= MM_CAMCORDER_STATE_READY) {
+               _mmcam_dbg_warn("send state change started message to notify");
+
+               memset(&msg, 0x0, sizeof(_MMCamcorderMsgItem));
+
+               switch (state_change_by_system) {
+               case _MMCAMCORDER_STATE_CHANGE_BY_RM:
+                       msg.id = MM_MESSAGE_CAMCORDER_STATE_CHANGE_STARTED_BY_RM;
+                       break;
+               case _MMCAMCORDER_STATE_CHANGE_BY_DPM:
+                       msg.id = MM_MESSAGE_CAMCORDER_STATE_CHANGE_STARTED_BY_SECURITY;
+                       break;
+               default:
+                       break;
+               }
+
+               if (msg.id != 0) {
+                       msg.param.state.code = hcamcorder->interrupt_code;
+                       _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg);
+               } else {
+                       _mmcam_dbg_err("should not be reached here %d", state_change_by_system);
+               }
+       }
 
        for (loop = 0 ; current_state > MM_CAMCORDER_STATE_NULL && loop < __MMCAMCORDER_CMD_ITERATE_MAX * 3 ; loop++) {
                itr_cnt = __MMCAMCORDER_CMD_ITERATE_MAX;
@@ -3650,20 +3489,17 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder)
 
                        /* if caturing isn't finished, waiting for 2 sec to finish real capture operation. check 'info->capturing'. */
                        mm_camcorder_set_attributes((MMHandleType)hcamcorder, NULL,
-                                                   MMCAM_CAPTURE_BREAK_CONTINUOUS_SHOT, TRUE,
-                                                   NULL);
+                               MMCAM_CAPTURE_BREAK_CONTINUOUS_SHOT, TRUE,
+                               NULL);
 
-                       for (i = 0; i < 20 && info->capturing; i++) {
+                       for (i = 0; i < 20 && info->capturing; i++)
                                usleep(100000);
-                       }
 
-                       if (i == 20) {
+                       if (i == 20)
                                _mmcam_dbg_err("Timeout. Can't check stop capturing.");
-                       }
 
-                       while ((itr_cnt--) && ((result = _mmcamcorder_capture_stop((MMHandleType)hcamcorder)) != MM_ERROR_NONE)) {
-                                       _mmcam_dbg_warn("Can't stop capturing.(%x)", result);
-                       }
+                       while ((itr_cnt--) && ((result = _mmcamcorder_capture_stop((MMHandleType)hcamcorder)) != MM_ERROR_NONE))
+                               _mmcam_dbg_warn("Can't stop capturing.(%x)", result);
 
                        break;
                }
@@ -3673,29 +3509,30 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder)
                        _mmcam_dbg_warn("Stop recording.");
 
                        while ((itr_cnt--) && ((result = _mmcamcorder_commit((MMHandleType)hcamcorder)) != MM_ERROR_NONE)) {
-                               _mmcam_dbg_warn("Can't commit.(%x)", result);
+                               _mmcam_dbg_warn("Can't commit.(%x), cancel it.", result);
+                               _mmcamcorder_cancel((MMHandleType)hcamcorder);
                        }
+
                        break;
                }
                case MM_CAMCORDER_STATE_PREPARE:
                {
                        _mmcam_dbg_warn("Stop preview.");
 
-                       while ((itr_cnt--) && ((result = _mmcamcorder_stop((MMHandleType)hcamcorder)) != MM_ERROR_NONE)) {
+                       while ((itr_cnt--) && ((result = _mmcamcorder_stop((MMHandleType)hcamcorder)) != MM_ERROR_NONE))
                                _mmcam_dbg_warn("Can't stop preview.(%x)", result);
-                       }
+
                        break;
                }
                case MM_CAMCORDER_STATE_READY:
                {
                        _mmcam_dbg_warn("unrealize");
 
-                       if ((result = _mmcamcorder_unrealize((MMHandleType)hcamcorder)) != MM_ERROR_NONE) {
+                       if ((result = _mmcamcorder_unrealize((MMHandleType)hcamcorder)) != MM_ERROR_NONE)
                                _mmcam_dbg_warn("Can't unrealize.(%x)", result);
-                       }
+
                        break;
                }
-               case MM_CAMCORDER_STATE_NULL:
                default:
                        _mmcam_dbg_warn("Already stopped.");
                        break;
@@ -3704,7 +3541,10 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder)
                current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder);
        }
 
-       _mmcam_dbg_warn( "Done." );
+       /* restore */
+       hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_NORMAL;
+
+       _mmcam_dbg_warn("Done.");
 
        return;
 }
@@ -3714,11 +3554,11 @@ 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);
-       return_val_if_fail(error, FALSE);
+       mmf_return_val_if_fail(hcamcorder, FALSE);
+       mmf_return_val_if_fail(error, FALSE);
        sc = MMF_CAMCORDER_SUBCONTEXT(handle);
        mmf_return_val_if_fail(sc, FALSE);
 
@@ -3755,10 +3595,10 @@ static gboolean __mmcamcorder_handle_gst_error(MMHandleType handle, GstMessage *
        if (message->src) {
                msg_src_element = GST_ELEMENT_NAME(GST_ELEMENT_CAST(message->src));
                _mmcam_dbg_err("-Msg src : [%s] Domain : [%s]   Error : [%s]  Code : [%d] is tranlated to error code : [0x%x]",
-                              msg_src_element, g_quark_to_string (error->domain), error->message, error->code, msg.param.code);
+                       msg_src_element, g_quark_to_string(error->domain), error->message, error->code, msg.param.code);
        } else {
                _mmcam_dbg_err("Domain : [%s]   Error : [%s]  Code : [%d] is tranlated to error code : [0x%x]",
-                              g_quark_to_string (error->domain), error->message, error->code, msg.param.code);
+                       g_quark_to_string(error->domain), error->message, error->code, msg.param.code);
        }
 
 #ifdef _MMCAMCORDER_SKIP_GST_FLOW_ERROR
@@ -3769,10 +3609,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;
 }
@@ -3795,42 +3637,40 @@ static gint __mmcamcorder_gst_handle_core_error(MMHandleType handle, int code, G
        element = GST_ELEMENT_CAST(sc->encode_element[_MMCAMCORDER_ENCSINK_VENC].gst);
 
        if (GST_ELEMENT_CAST(message->src) == element) {
-               if (code == GST_CORE_ERROR_NEGOTIATION) {
+               if (code == GST_CORE_ERROR_NEGOTIATION)
                        return MM_ERROR_CAMCORDER_GST_NEGOTIATION;
-               } else {
+               else
                        return MM_ERROR_CAMCORDER_ENCODER;
-               }
        }
 
        /* General */
-       switch (code)
-       {
-               case GST_CORE_ERROR_STATE_CHANGE:
-                       return MM_ERROR_CAMCORDER_GST_STATECHANGE;
-               case GST_CORE_ERROR_NEGOTIATION:
-                       return MM_ERROR_CAMCORDER_GST_NEGOTIATION;
-               case GST_CORE_ERROR_MISSING_PLUGIN:
-               case GST_CORE_ERROR_SEEK:
-               case GST_CORE_ERROR_NOT_IMPLEMENTED:
-               case GST_CORE_ERROR_FAILED:
-               case GST_CORE_ERROR_TOO_LAZY:
-               case GST_CORE_ERROR_PAD:
-               case GST_CORE_ERROR_THREAD:
-               case GST_CORE_ERROR_EVENT:
-               case GST_CORE_ERROR_CAPS:
-               case GST_CORE_ERROR_TAG:
-               case GST_CORE_ERROR_CLOCK:
-               case GST_CORE_ERROR_DISABLED:
-               default:
-                       return MM_ERROR_CAMCORDER_GST_CORE;
-               break;
+       switch (code) {
+       case GST_CORE_ERROR_STATE_CHANGE:
+               return MM_ERROR_CAMCORDER_GST_STATECHANGE;
+       case GST_CORE_ERROR_NEGOTIATION:
+               return MM_ERROR_CAMCORDER_GST_NEGOTIATION;
+       case GST_CORE_ERROR_MISSING_PLUGIN:
+       case GST_CORE_ERROR_SEEK:
+       case GST_CORE_ERROR_NOT_IMPLEMENTED:
+       case GST_CORE_ERROR_FAILED:
+       case GST_CORE_ERROR_TOO_LAZY:
+       case GST_CORE_ERROR_PAD:
+       case GST_CORE_ERROR_THREAD:
+       case GST_CORE_ERROR_EVENT:
+       case GST_CORE_ERROR_CAPS:
+       case GST_CORE_ERROR_TAG:
+       case GST_CORE_ERROR_CLOCK:
+       case GST_CORE_ERROR_DISABLED:
+       default:
+               return MM_ERROR_CAMCORDER_GST_CORE;
+       break;
        }
 }
 
 static gint __mmcamcorder_gst_handle_library_error(MMHandleType handle, int code, GstMessage *message)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-       return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
+       mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
        _mmcam_dbg_log("");
 
@@ -3876,6 +3716,42 @@ 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_INTERRUPT(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_INTERRUPT(hcamcorder);
+
+                       _mmcamcorder_request_dpm_popup(hcamcorder->gdbus_conn, "microphone");
+
+                       return MM_ERROR_POLICY_RESTRICTED;
+               }
+       }
+
        /* encodebin */
        element = GST_ELEMENT_CAST(sc->encode_element[_MMCAMCORDER_ENCSINK_VENC].gst);
        if (GST_ELEMENT_CAST(message->src) == element) {
@@ -3923,9 +3799,9 @@ static gint __mmcamcorder_gst_handle_stream_error(MMHandleType handle, int code,
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        _MMCamcorderSubContext *sc = NULL;
-       GstElement *element =NULL;
+       GstElement *element = NULL;
 
-       mmf_return_val_if_fail( hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED );
+       mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
        sc = MMF_CAMCORDER_SUBCONTEXT(handle);
        mmf_return_val_if_fail(sc, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
@@ -3978,14 +3854,14 @@ static gint __mmcamcorder_gst_handle_stream_error(MMHandleType handle, int code,
 }
 
 
-static gboolean __mmcamcorder_handle_gst_warning (MMHandleType handle, GstMessage *message, GError *error)
+static gboolean __mmcamcorder_handle_gst_warning(MMHandleType handle, GstMessage *message, GError *error)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        gchar *debug = NULL;
        GError *err = NULL;
 
-       return_val_if_fail(hcamcorder, FALSE);
-       return_val_if_fail(error, FALSE);
+       mmf_return_val_if_fail(hcamcorder, FALSE);
+       mmf_return_val_if_fail(error, FALSE);
 
        _mmcam_dbg_log("");
 
@@ -3998,7 +3874,7 @@ static gboolean __mmcamcorder_handle_gst_warning (MMHandleType handle, GstMessag
        } else if (error->domain == GST_RESOURCE_ERROR) {
                _mmcam_dbg_warn("GST warning: GST_RESOURCE domain");
                __mmcamcorder_gst_handle_resource_warning(handle, message, error);
-       } else if (error->domain == GST_STREAM_ERROR ) {
+       } else if (error->domain == GST_STREAM_ERROR) {
                _mmcam_dbg_warn("GST warning: GST_STREAM domain");
        } else {
                _mmcam_dbg_warn("This error domain(%d) is not defined.", error->domain);
@@ -4009,7 +3885,7 @@ static gboolean __mmcamcorder_handle_gst_warning (MMHandleType handle, GstMessag
                err = NULL;
        }
        if (debug != NULL) {
-               _mmcam_dbg_err ("Debug: %s", debug);
+               _mmcam_dbg_err("Debug: %s", debug);
                g_free(debug);
                debug = NULL;
        }
@@ -4022,10 +3898,10 @@ static gint __mmcamcorder_gst_handle_resource_warning(MMHandleType handle, GstMe
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        _MMCamcorderSubContext *sc = NULL;
-       GstElement *element =NULL;
+       GstElement *element = NULL;
        gchar *msg_src_element;
 
-       mmf_return_val_if_fail( hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED );
+       mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
        sc = MMF_CAMCORDER_SUBCONTEXT(handle);
        mmf_return_val_if_fail(sc, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
@@ -4039,7 +3915,7 @@ static gint __mmcamcorder_gst_handle_resource_warning(MMHandleType handle, GstMe
                if (error->code == GST_RESOURCE_ERROR_FAILED) {
                        msg_src_element = GST_ELEMENT_NAME(GST_ELEMENT_CAST(message->src));
                        _mmcam_dbg_warn("-Msg src:[%s] Domain:[%s] Error:[%s]",
-                                      msg_src_element, g_quark_to_string(error->domain), error->message);
+                               msg_src_element, g_quark_to_string(error->domain), error->message);
                        return MM_ERROR_NONE;
                }
        }
@@ -4068,30 +3944,161 @@ static gint __mmcamcorder_gst_handle_resource_warning(MMHandleType handle, GstMe
        return MM_ERROR_NONE;
 }
 
-int _mmcamcorder_get_video_caps(MMHandleType handle, char **caps)
+
+void _mmcamcorder_emit_signal(MMHandleType handle, const char *object_name,
+       const char *interface_name, const char *signal_name, int value)
 {
-       GstPad *pad = NULL;
-       GstCaps *sink_caps = NULL;
-       _MMCamcorderSubContext *sc = NULL;
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
-       sc = MMF_CAMCORDER_SUBCONTEXT(handle);
-       _mmcam_dbg_warn("Entered ");
-       pad = gst_element_get_static_pad(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, "sink");
-       if(!pad) {
-               _mmcam_dbg_err("static pad is NULL");
-               return MM_ERROR_CAMCORDER_INVALID_STATE;
+       mmf_return_if_fail(hcamcorder && object_name && interface_name && signal_name);
+
+       _mmcam_dbg_log("object %s, interface %s, signal %s, value %d",
+               object_name, interface_name, signal_name, value);
+
+       _mmcamcorder_emit_dbus_signal(hcamcorder->gdbus_conn, object_name, interface_name, signal_name, value);
+
+       return;
+}
+
+
+#ifdef _MMCAMCORDER_MM_RM_SUPPORT
+static int __mmcamcorder_resource_release_cb(mm_resource_manager_h rm,
+               mm_resource_manager_res_h res, void *user_data)
+{
+       mmf_camcorder_t *hcamcorder = (mmf_camcorder_t *) user_data;
+
+       mmf_return_val_if_fail(hcamcorder, FALSE);
+
+       _mmcam_dbg_warn("enter");
+
+       _MMCAMCORDER_LOCK_RESOURCE(hcamcorder);
+
+       /* set flag for resource release callback */
+       hcamcorder->is_release_cb_calling = TRUE;
+
+       _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
+
+       _MMCAMCORDER_LOCK_INTERRUPT(hcamcorder);
+
+       if (res == hcamcorder->video_encoder_resource) {
+               /* Stop video recording */
+               if (_mmcamcorder_commit((MMHandleType)hcamcorder) != MM_ERROR_NONE) {
+                       _mmcam_dbg_err("commit failed, cancel it");
+                       _mmcamcorder_cancel((MMHandleType)hcamcorder);
+               }
+       } else {
+               /* Stop camera */
+               __mmcamcorder_force_stop(hcamcorder, _MMCAMCORDER_STATE_CHANGE_BY_RM);
        }
 
-       sink_caps = gst_pad_get_current_caps(pad);
-       gst_object_unref( pad );
-       if(!sink_caps) {
-               _mmcam_dbg_err("fail to get caps");
-               return MM_ERROR_CAMCORDER_INVALID_STATE;
+       _MMCAMCORDER_UNLOCK_INTERRUPT(hcamcorder);
+
+       _MMCAMCORDER_LOCK_RESOURCE(hcamcorder);
+
+       if (res == hcamcorder->camera_resource)
+               hcamcorder->camera_resource = NULL;
+       else if (res == hcamcorder->video_overlay_resource)
+               hcamcorder->video_overlay_resource = NULL;
+       else if (res == hcamcorder->video_encoder_resource)
+               hcamcorder->video_encoder_resource = NULL;
+
+       /* restore flag for resource release callback */
+       hcamcorder->is_release_cb_calling = FALSE;
+
+       _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
+
+       _mmcam_dbg_warn("leave");
+
+       return FALSE;
+}
+#endif /* _MMCAMCORDER_MM_RM_SUPPORT */
+
+
+#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);
+
+       _mmcam_dbg_warn("current state %d (handle %p)", current_state, hcamcorder);
+
+       _MMCAMCORDER_LOCK_INTERRUPT(hcamcorder);
+
+       /* 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, _MMCAMCORDER_STATE_CHANGE_BY_RM);
+               break;
+       default:
+               break;
        }
 
-       *caps = gst_caps_to_string(sink_caps);
-       _mmcam_dbg_err("video caps : %s", *caps);
-       gst_caps_unref(sink_caps);
+       _MMCAMCORDER_UNLOCK_INTERRUPT(hcamcorder);
 
-       return MM_ERROR_NONE;
+       return cb_res;
+}
+#endif /* _MMCAMCORDER_RM_SUPPORT */
+
+
+int _mmcamcorder_manage_external_storage_state(MMHandleType handle, int storage_state)
+{
+       int ret = MM_ERROR_NONE;
+       int current_state = MM_CAMCORDER_STATE_NONE;
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
+       _MMCamcorderMsgItem msg;
+
+       mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
+
+       _mmcam_dbg_warn("storage state %d", storage_state);
+
+       /* check storage state */
+       if (storage_state != STORAGE_STATE_UNMOUNTABLE &&
+               storage_state != STORAGE_STATE_REMOVED) {
+               _mmcam_dbg_warn("nothing to do");
+               return MM_ERROR_NONE;
+       }
+
+       _MMCAMCORDER_LOCK_INTERRUPT(hcamcorder);
+
+       /* check recording state */
+       current_state = _mmcamcorder_get_state(handle);
+
+       _mmcam_dbg_warn("current_state %d", current_state);
+
+       if (current_state < MM_CAMCORDER_STATE_RECORDING) {
+               _mmcam_dbg_warn("no recording now");
+               goto _MANAGE_DONE;
+       }
+
+       /* check storage type */
+       if (hcamcorder->storage_info.type != STORAGE_TYPE_EXTERNAL) {
+               _mmcam_dbg_warn("external storage is not used");
+               goto _MANAGE_DONE;
+       }
+
+       /* cancel recording */
+       ret = _mmcamcorder_cancel(handle);
+
+       /* send error message */
+       msg.id = MM_MESSAGE_CAMCORDER_ERROR;
+       msg.param.code = MM_ERROR_OUT_OF_STORAGE;
+
+       _mmcamcorder_send_message(handle, &msg);
+
+_MANAGE_DONE:
+       _MMCAMCORDER_UNLOCK_INTERRUPT(hcamcorder);
+
+       _mmcam_dbg_warn("done - ret 0x%x", ret);
+
+       return ret;
 }