Udpate for force stop function
[platform/core/multimedia/libmm-camcorder.git] / src / mm_camcorder_internal.c
index bc1b1f1..76193cf 100644 (file)
 ========================================================================================*/
 #include <stdio.h>
 #include <string.h>
+#include <fcntl.h>
 #include <gst/gst.h>
 #include <gst/gstutils.h>
 #include <gst/gstpad.h>
+#include <sys/time.h>
 
 #include <mm_error.h>
 #include "mm_camcorder_internal.h"
 #include <mm_types.h>
 
-#include <gst/interfaces/colorbalance.h>
-#include <gst/interfaces/cameracontrol.h>
+#include <gst/video/colorbalance.h>
+#include <gst/video/cameracontrol.h>
 #include <asm/types.h>
 
-#include <mm_session.h>
-#include <mm_session_private.h>
-#include <audio-session-manager.h>
+#include <system_info.h>
 
-/*---------------------------------------------------------------------------------------
-|    GLOBAL VARIABLE DEFINITIONS for internal                                          |
----------------------------------------------------------------------------------------*/
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+#include <murphy/common/glib-glue.h>
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
+
+#ifdef _MMCAMCORDER_RM_SUPPORT
+#include <aul.h>
+#endif /* _MMCAMCORDER_RM_SUPPORT */
 
 /*---------------------------------------------------------------------------------------
 |    LOCAL VARIABLE DEFINITIONS for internal                                           |
 ---------------------------------------------------------------------------------------*/
 #define __MMCAMCORDER_CMD_ITERATE_MAX           3
-#define __MMCAMCORDER_SECURITY_HANDLE_DEFAULT   -1
 #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 DPM_ALLOWED                             1
+#define DPM_DISALLOWED                          0
 
 /*---------------------------------------------------------------------------------------
 |    LOCAL FUNCTION PROTOTYPES:                                                                |
@@ -65,16 +75,10 @@ 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);
 
-static int      __mmcamcorder_asm_get_event_type(int sessionType);
-static void     __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder);
-static void     __mmcamcorder_force_resume(mmf_camcorder_t *hcamcorder);
-ASM_cb_result_t _mmcamcorder_asm_callback_sh(int handle, ASM_event_sources_t event_src,
-                                             ASM_sound_commands_t command,
-                                             unsigned int sound_status, void *cb_data);
-ASM_cb_result_t _mmcamcorder_asm_callback_ex(int handle, ASM_event_sources_t event_src,
-                                             ASM_sound_commands_t command,
-                                             unsigned int sound_status, void *cb_data);
-
+#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 */
@@ -90,19 +94,18 @@ static gboolean __mmcamcorder_set_attr_to_camsensor_cb(gpointer data);
 int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
 {
        int ret = MM_ERROR_NONE;
+       int sys_info_ret = SYSTEM_INFO_ERROR_NONE;
        int UseConfCtrl = 0;
-       int sessionType = MM_SESSION_TYPE_SHARE;
-       int errorcode = MM_ERROR_NONE;
        int rcmd_fmt_capture = MM_PIXEL_FORMAT_YUYV;
        int rcmd_fmt_recording = MM_PIXEL_FORMAT_NV12;
        int rcmd_dpy_rotation = MM_DISPLAY_ROTATION_270;
        int play_capture_sound = TRUE;
        int camera_device_count = MM_VIDEO_DEVICE_NUM;
+       int camera_default_flip = MM_FLIP_NONE;
        int camera_facing_direction = MM_CAMCORDER_CAMERA_FACING_DIRECTION_REAR;
        char *err_attr_name = NULL;
-       char *ConfCtrlFile = NULL;
+       const char *ConfCtrlFile = NULL;
        mmf_camcorder_t *hcamcorder = NULL;
-       ASM_resource_t mm_resource = ASM_RESOURCE_NONE;
        type_element *EvasSurfaceElement = NULL;
 
        _mmcam_dbg_log("Entered");
@@ -119,30 +122,60 @@ 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;
+
+       g_mutex_init(&(hcamcorder->mtsafe).lock);
+       g_cond_init(&(hcamcorder->mtsafe).cond);
+       g_mutex_init(&(hcamcorder->mtsafe).cmd_lock);
+       g_cond_init(&(hcamcorder->mtsafe).cmd_cond);
+       g_mutex_init(&(hcamcorder->mtsafe).asm_lock);
+       g_mutex_init(&(hcamcorder->mtsafe).state_lock);
+       g_mutex_init(&(hcamcorder->mtsafe).gst_state_lock);
+       g_mutex_init(&(hcamcorder->mtsafe).gst_encode_state_lock);
+       g_mutex_init(&(hcamcorder->mtsafe).message_cb_lock);
+       g_mutex_init(&(hcamcorder->mtsafe).vcapture_cb_lock);
+       g_mutex_init(&(hcamcorder->mtsafe).vstream_cb_lock);
+       g_mutex_init(&(hcamcorder->mtsafe).astream_cb_lock);
+       g_mutex_init(&(hcamcorder->mtsafe).mstream_cb_lock);
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+       g_cond_init(&(hcamcorder->mtsafe).resource_cond);
+       g_mutex_init(&(hcamcorder->mtsafe).resource_lock);
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
+
+       g_mutex_init(&hcamcorder->restart_preview_lock);
 
-       /* thread - for g_mutex_new() */
-       if (!g_thread_supported()) {
-               g_thread_init(NULL);
-       }
+       /* Sound mutex/cond init */
+       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);
 
-       (hcamcorder->mtsafe).lock = g_mutex_new();
-       (hcamcorder->mtsafe).cond = g_cond_new();
+       /* init for sound thread */
+       g_mutex_init(&hcamcorder->task_thread_lock);
+       g_cond_init(&hcamcorder->task_thread_cond);
+       hcamcorder->task_thread_state = _MMCAMCORDER_TASK_THREAD_STATE_NONE;
 
-       (hcamcorder->mtsafe).cmd_lock = g_mutex_new();
-       (hcamcorder->mtsafe).state_lock = g_mutex_new();
-       (hcamcorder->mtsafe).gst_state_lock = g_mutex_new();
-       (hcamcorder->mtsafe).message_cb_lock = g_mutex_new();
-       (hcamcorder->mtsafe).vcapture_cb_lock = g_mutex_new();
-       (hcamcorder->mtsafe).vstream_cb_lock = g_mutex_new();
-       (hcamcorder->mtsafe).astream_cb_lock = g_mutex_new();
+       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);
 
-       pthread_mutex_init(&(hcamcorder->sound_lock), NULL);
-       pthread_cond_init(&(hcamcorder->sound_cond), NULL);
+               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);
+       }
 
-       /* Sound mutex/cond init */
-       pthread_mutex_init(&(hcamcorder->snd_info.open_mutex), NULL);
-       pthread_cond_init(&(hcamcorder->snd_info.open_cond), NULL);
+       /* create task thread */
+       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) {
@@ -151,216 +184,276 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
                goto _ERR_DEFAULT_VALUE_INIT;
        }
 
-       /* Check and register ASM */
-       if (MM_ERROR_NONE != _mm_session_util_read_type(-1, &sessionType)) {
-               _mmcam_dbg_log("_mm_session_util_read_type Fail. but keep going...");
-               sessionType = MM_SESSION_TYPE_SHARE;
-       }
-
-       /* Call will not be interrupted. so does not need callback function */
-       if ((sessionType != MM_SESSION_TYPE_CALL) && (sessionType != MM_SESSION_TYPE_VIDEOCALL)) {
-               int pid = -1; /* process id of itself */
-
-               /* set SHARE session */
-               if (!ASM_register_sound(pid, &(hcamcorder->asm_handle_sh), ASM_EVENT_SHARE_MMCAMCORDER, ASM_STATE_NONE,
-                                       (ASM_sound_cb_t)_mmcamcorder_asm_callback_sh,
-                                       (void*)hcamcorder, mm_resource, &errorcode)) {
-                       _mmcam_dbg_err("SHARE ASM_register_sound() failed[%x]", errorcode);
-                       ret = MM_ERROR_POLICY_INTERNAL;
-                       goto _ERR_DEFAULT_VALUE_INIT;
-               }
-
-               /* set EXCLUSIVE session */
-               if (!ASM_register_sound(pid, &(hcamcorder->asm_handle_ex), ASM_EVENT_EXCLUSIVE_MMCAMCORDER, ASM_STATE_NONE,
-                                       (ASM_sound_cb_t)_mmcamcorder_asm_callback_ex,
-                                       (void*)hcamcorder, mm_resource, &errorcode)) {
-                       _mmcam_dbg_err("EXCLUSIVE ASM_register_sound() failed[%x]", errorcode);
-                       ret = MM_ERROR_POLICY_INTERNAL;
-                       goto _ERR_DEFAULT_VALUE_INIT;
-               }
-
-               _mmcam_dbg_log("ASM handle - SHARE %d, EXCLUSIVE %d",
-                              hcamcorder->asm_handle_sh, hcamcorder->asm_handle_ex);
-       }
+       /* set device type */
+       hcamcorder->device_type = info->videodev_type;
+       _mmcam_dbg_warn("Device Type : %d", hcamcorder->device_type);
 
        /* Get Camera Configure information from Camcorder INI file */
-       __ta__( "    _mmcamcorder_conf_get_info main",
-       _mmcamcorder_conf_get_info(CONFIGURE_TYPE_MAIN, CONFIGURE_MAIN_FILE, &hcamcorder->conf_main);
-       );
-
-       if (!(hcamcorder->conf_main)) {
-               _mmcam_dbg_err( "Failed to get configure(main) info." );
-
-               ret = MM_ERROR_CAMCORDER_CREATE_CONFIGURE;
-               goto _ERR_AUDIO_BLOCKED;
+       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;
        }
 
-       __ta__("    _mmcamcorder_alloc_attribute",
        hcamcorder->attributes = _mmcamcorder_alloc_attribute((MMHandleType)hcamcorder, info);
-       );
        if (!(hcamcorder->attributes)) {
                _mmcam_dbg_err("_mmcamcorder_create::alloc attribute error.");
-               
+
                ret = MM_ERROR_CAMCORDER_RESOURCE_CREATION;
-               goto _ERR_AUDIO_BLOCKED;
+               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 (info->videodev_type != MM_VIDEO_DEVICE_NONE) {
-               _mmcamcorder_conf_get_value_int(hcamcorder->conf_main,
-                                               CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
-                                               "UseConfCtrl", &UseConfCtrl);
+               _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main,
+                       CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
+                       "UseConfCtrl", &UseConfCtrl);
 
                if (UseConfCtrl) {
-                       _mmcam_dbg_log( "Enable Configure Control system." );
-#if 1
+                       int resolution_width = 0;
+                       int resolution_height = 0;
+                       MMCamAttrsInfo fps_info;
+
+                       _mmcam_dbg_log("Enable Configure Control system.");
+
                        switch (info->videodev_type) {
                        case MM_VIDEO_DEVICE_CAMERA0:
-                               _mmcamcorder_conf_get_value_string(hcamcorder->conf_main,
-                                                                  CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
-                                                                  "ConfCtrlFile0", &ConfCtrlFile);
+                               _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(hcamcorder->conf_main,
-                                                                  CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
-                                                                  "ConfCtrlFile1", &ConfCtrlFile);
+                               _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." );
+                               _mmcam_dbg_err("Not supported camera type.");
                                ret = MM_ERROR_CAMCORDER_NOT_SUPPORTED;
-                               goto _ERR_ALLOC_ATTRIBUTE;
+                               goto _ERR_DEFAULT_VALUE_INIT;
                        }
 
                        _mmcam_dbg_log("videodev_type : [%d], ConfCtrlPath : [%s]", info->videodev_type, ConfCtrlFile);
 
-                       __ta__( "    _mmcamcorder_conf_get_info ctrl",
-                       _mmcamcorder_conf_get_info(CONFIGURE_TYPE_CTRL, ConfCtrlFile, &hcamcorder->conf_ctrl);
-                       );
+                       ret = _mmcamcorder_conf_get_info((MMHandleType)hcamcorder, CONFIGURE_TYPE_CTRL, ConfCtrlFile, &hcamcorder->conf_ctrl);
+                       if (ret != MM_ERROR_NONE) {
+                               _mmcam_dbg_err("Failed to get configure(control) info.");
+                               goto _ERR_DEFAULT_VALUE_INIT;
+                       }
 /*
                        _mmcamcorder_conf_print_info(&hcamcorder->conf_main);
                        _mmcamcorder_conf_print_info(&hcamcorder->conf_ctrl);
 */
-#else
-                       _mmcamcorder_conf_query_info(CONFIGURE_TYPE_CTRL, info->videodev_type, &hcamcorder->conf_ctrl);
-#endif
-                       if (!(hcamcorder->conf_ctrl)) {
-                               _mmcam_dbg_err( "Failed to get configure(control) info." );
-                               ret = MM_ERROR_CAMCORDER_CREATE_CONFIGURE;
-                               goto _ERR_ALLOC_ATTRIBUTE;
-                       }
-
-                       __ta__( "    _mmcamcorder_init_convert_table",
                        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;
                        }
 
-                       __ta__( "    _mmcamcorder_init_attr_from_configure",
-                       ret = _mmcamcorder_init_attr_from_configure((MMHandleType)hcamcorder);
-                       );
+                       ret = _mmcamcorder_init_attr_from_configure((MMHandleType)hcamcorder, MM_CAMCONVERT_CATEGORY_ALL);
                        if (ret != MM_ERROR_NONE) {
                                _mmcam_dbg_warn("converting table initialize error!!");
+                               ret = MM_ERROR_CAMCORDER_INTERNAL;
+                               goto _ERR_DEFAULT_VALUE_INIT;
                        }
 
                        /* Get device info, recommend preview fmt and display rotation from INI */
-                       _mmcamcorder_conf_get_value_int(hcamcorder->conf_ctrl,
-                                                       CONFIGURE_CATEGORY_CTRL_CAMERA,
-                                                       "RecommendPreviewFormatCapture",
-                                                       &rcmd_fmt_capture);
-
-                       _mmcamcorder_conf_get_value_int(hcamcorder->conf_ctrl,
-                                                       CONFIGURE_CATEGORY_CTRL_CAMERA,
-                                                       "RecommendPreviewFormatRecord",
-                                                       &rcmd_fmt_recording);
-
-                       _mmcamcorder_conf_get_value_int(hcamcorder->conf_ctrl,
-                                                       CONFIGURE_CATEGORY_CTRL_CAMERA,
-                                                       "RecommendDisplayRotation",
-                                                       &rcmd_dpy_rotation);
-
-                       _mmcamcorder_conf_get_value_int(hcamcorder->conf_main,
-                                                       CONFIGURE_CATEGORY_MAIN_CAPTURE,
-                                                       "PlayCaptureSound",
-                                                       &play_capture_sound);
-
-                       _mmcamcorder_conf_get_value_int(hcamcorder->conf_main,
-                                                       CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
-                                                       "DeviceCount",
-                                                       &camera_device_count);
-
-                       _mmcamcorder_conf_get_value_int(hcamcorder->conf_ctrl,
-                                                       CONFIGURE_CATEGORY_CTRL_CAMERA,
-                                                       "FacingDirection",
-                                                       &camera_facing_direction);
-
-                       _mmcam_dbg_log("Recommend fmt[cap:%d,rec:%d], dpy rot[%d], cap snd[%d], dev cnt[%d], cam facing dir[%d]",
-                                      rcmd_fmt_capture, rcmd_fmt_recording, rcmd_dpy_rotation,
-                                      play_capture_sound, camera_device_count, camera_facing_direction);
+                       _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));
+
+                       /* Get UseVideoconvert value from INI */
+                       _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main,
+                               CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT,
+                               "UseVideoconvert",
+                               &hcamcorder->use_videoconvert);
+
+                       ret = mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL,
+                               MMCAM_CAMERA_WIDTH, &resolution_width,
+                               MMCAM_CAMERA_HEIGHT, &resolution_height,
+                               NULL);
+
+                       mm_camcorder_get_fps_list_by_resolution((MMHandleType)hcamcorder, resolution_width, resolution_height, &fps_info);
+
+                       _mmcam_dbg_log("UseZeroCopyFormat %d, UseVideoconvert %d, SupportMediaPacketPreviewCb %d",
+                               hcamcorder->use_zero_copy_format, hcamcorder->use_videoconvert, hcamcorder->support_media_packet_preview_cb);
+                       _mmcam_dbg_log("res : %d X %d, Default FPS by resolution  : %d",
+                               resolution_width, resolution_height, fps_info.int_array.def);
+
+                       if (camera_facing_direction == 1) {
+                               if (rcmd_dpy_rotation == MM_DISPLAY_ROTATION_270 || rcmd_dpy_rotation == MM_DISPLAY_ROTATION_90)
+                                       camera_default_flip = MM_FLIP_VERTICAL;
+                               else
+                                       camera_default_flip = MM_FLIP_HORIZONTAL;
+
+                               _mmcam_dbg_log("camera_default_flip : [%d]", camera_default_flip);
+                       }
 
                        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,
-                                                   "capture-sound-enable", play_capture_sound,
-                                                   NULL);
+                               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;
+                               SAFE_FREE(err_attr_name);
+                               ret = MM_ERROR_CAMCORDER_INTERNAL;
+                               goto _ERR_DEFAULT_VALUE_INIT;
                        }
 
-                       /* Get UseZeroCopyFormat value from INI */
-                       _mmcamcorder_conf_get_value_int(hcamcorder->conf_main,
-                                                       CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
-                                                       "UseZeroCopyFormat",
-                                                       &(hcamcorder->use_zero_copy_format));
-                       _mmcam_dbg_log("UseZeroCopyFormat : %d", hcamcorder->use_zero_copy_format);
-               }
-               else
-               {
-                       _mmcam_dbg_log( "Disable Configure Control system." );
+                       /* 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;
+                       }
+                       _mmcam_dbg_log("Default brightness : %d", hcamcorder->brightness_default);
+               } else {
+                       _mmcam_dbg_log("Disable Configure Control system.");
                        hcamcorder->conf_ctrl = NULL;
                }
+
+               /* 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;
+                       }
+
+                       _mmcam_dbg_log("DPM camera changed cb id %d", hcamcorder->dpm_camera_cb_id);
+               }
+
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+               /* 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;
+               }
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
+       } else {
+               _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main,
+                       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);
+               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_AUDIO);
+               if (ret != MM_ERROR_NONE) {
+                       _mmcam_dbg_err("there is no audio device");
+                       ret = MM_ERROR_CAMCORDER_NOT_SUPPORTED;
+                       goto _ERR_DEFAULT_VALUE_INIT;
+               }
        }
 
-       __ta__( "    __mmcamcorder_gstreamer_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_ALLOC_ATTRIBUTE;
+               goto _ERR_DEFAULT_VALUE_INIT;
        }
 
        /* Make some attributes as read-only type */
-       __ta__( "    _mmcamcorder_lock_readonly_attributes",
        _mmcamcorder_lock_readonly_attributes((MMHandleType)hcamcorder);
-       );
 
        /* Disable attributes in each model */
-       __ta__( "    _mmcamcorder_set_disabled_attributes",
        _mmcamcorder_set_disabled_attributes((MMHandleType)hcamcorder);
-       );
-
-       /* Determine state change as sync or async */
-       _mmcamcorder_conf_get_value_int(hcamcorder->conf_main,
-                                       CONFIGURE_CATEGORY_MAIN_GENERAL,
-                                       "SyncStateChange",
-                                       &hcamcorder->sync_state_change );
-       if (!(hcamcorder->sync_state_change)) {
-               _mmcamcorder_create_command_loop((MMHandleType)hcamcorder);
-       }
 
        /* Get videosink name for evas surface */
-       _mmcamcorder_conf_get_element(hcamcorder->conf_main,
-                                     CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT,
-                                     "VideosinkElementEvas",
-                                     &EvasSurfaceElement);
+       _mmcamcorder_conf_get_element((MMHandleType)hcamcorder, hcamcorder->conf_main,
+               CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT,
+               "VideosinkElementEvas",
+               &EvasSurfaceElement);
        if (EvasSurfaceElement) {
                int attr_index = 0;
-               char *evassink_name = NULL;
+               const char *evassink_name = NULL;
                mmf_attribute_t *item_evassink_name = NULL;
                mmf_attrs_t *attrs = (mmf_attrs_t *)MMF_CAMCORDER_ATTRS(hcamcorder);
 
@@ -377,53 +470,132 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
        vconf_get_int(VCONFKEY_CAMERA_SHUTTER_SOUND_POLICY, &hcamcorder->shutter_sound_policy);
        _mmcam_dbg_log("current shutter sound policy : %d", hcamcorder->shutter_sound_policy);
 
+       /* 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);
+       }
+
+       /* 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);
+       }
+
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+       if (info->videodev_type != MM_VIDEO_DEVICE_NONE) {
+               ret = _mmcamcorder_resource_wait_for_connection(&hcamcorder->resource_manager, (void *)hcamcorder);
+               if (ret != MM_ERROR_NONE) {
+                       _mmcam_dbg_err("failed to connect resource manager");
+                       goto _ERR_DEFAULT_VALUE_INIT;
+               }
+       }
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
+
        /* Set initial state */
        _mmcamcorder_set_state((MMHandleType)hcamcorder, MM_CAMCORDER_STATE_NULL);
-       _mmcam_dbg_log("_mmcamcorder_set_state");
+
+       _mmcam_dbg_log("created handle %p", hcamcorder);
 
        *handle = (MMHandleType)hcamcorder;
 
        return MM_ERROR_NONE;
 
-_ERR_ALLOC_ATTRIBUTE:
-_ERR_AUDIO_BLOCKED:
-       /* unregister audio session manager */
-       {
-               errorcode = MM_ERROR_NONE;
-               if (MM_ERROR_NONE != _mm_session_util_read_type(-1, &sessionType)) {
-                       _mmcam_dbg_log("_mm_session_util_read_type Fail. but keep going...");
-                       sessionType = MM_SESSION_TYPE_SHARE;
+_ERR_DEFAULT_VALUE_INIT:
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+       /* de-initialize resource manager */
+       _mmcamcorder_resource_manager_deinit(&hcamcorder->resource_manager);
+#endif /* _MMCAMCORDER_MURPHY_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_warn("invalid dpm camera cb id %d", hcamcorder->dpm_camera_cb_id);
                }
 
-               if((sessionType != MM_SESSION_TYPE_CALL) && (sessionType != MM_SESSION_TYPE_VIDEOCALL)) {
-                       /* unregister SHARE session */
-                       if (!ASM_unregister_sound(hcamcorder->asm_handle_sh, ASM_EVENT_SHARE_MMCAMCORDER, &errorcode)) {
-                               _mmcam_dbg_err("ASM_unregister_sound() SHARE failed(hdl:%p, stype:%d, err:%x)",
-                                              (void*)hcamcorder->asm_handle_sh, sessionType, errorcode);
-                       }
-                       /* unregister EXCLUSIVE session */
-                       if (!ASM_unregister_sound(hcamcorder->asm_handle_ex, ASM_EVENT_EXCLUSIVE_MMCAMCORDER, &errorcode)) {
-                               _mmcam_dbg_err("ASM_unregister_sound() EXCLUSIVE failed(hdl:%p, stype:%d, err:%x)",
-                                              (void*)hcamcorder->asm_handle_ex, sessionType, errorcode);
-                       }
-               }
+               dpm_manager_destroy(hcamcorder->dpm_handle);
+               hcamcorder->dpm_handle = NULL;
        }
 
-_ERR_DEFAULT_VALUE_INIT:
-       g_mutex_free ((hcamcorder->mtsafe).lock);
-       g_cond_free ((hcamcorder->mtsafe).cond);
-       g_mutex_free ((hcamcorder->mtsafe).cmd_lock);
-       g_mutex_free ((hcamcorder->mtsafe).state_lock);
-       g_mutex_free ((hcamcorder->mtsafe).gst_state_lock);     
+       /* Remove attributes */
+       if (hcamcorder->attributes) {
+               _mmcamcorder_dealloc_attribute((MMHandleType)hcamcorder, hcamcorder->attributes);
+               hcamcorder->attributes = 0;
+       }
+
+       /* Release lock, cond */
+       g_mutex_clear(&(hcamcorder->mtsafe).lock);
+       g_cond_clear(&(hcamcorder->mtsafe).cond);
+       g_mutex_clear(&(hcamcorder->mtsafe).cmd_lock);
+       g_cond_clear(&(hcamcorder->mtsafe).cmd_cond);
+       g_mutex_clear(&(hcamcorder->mtsafe).asm_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).state_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).gst_state_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).gst_encode_state_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).message_cb_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).vcapture_cb_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).vstream_cb_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).astream_cb_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).mstream_cb_lock);
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+       g_cond_clear(&(hcamcorder->mtsafe).resource_cond);
+       g_mutex_clear(&(hcamcorder->mtsafe).resource_lock);
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
+
+       g_mutex_clear(&hcamcorder->snd_info.open_mutex);
+       g_cond_clear(&hcamcorder->snd_info.open_cond);
+       g_mutex_clear(&hcamcorder->restart_preview_lock);
+
+       if (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->conf_ctrl) {
-               _mmcamcorder_conf_release_info( &hcamcorder->conf_ctrl );
+       if (hcamcorder->model_name) {
+               free(hcamcorder->model_name);
+               hcamcorder->model_name = NULL;
        }
 
-       if (hcamcorder->conf_main) {
-               _mmcamcorder_conf_release_info( &hcamcorder->conf_main );
+       if (hcamcorder->software_version) {
+               free(hcamcorder->software_version);
+               hcamcorder->software_version = NULL;
        }
 
+       if (hcamcorder->task_thread) {
+               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;
+               g_cond_signal(&hcamcorder->task_thread_cond);
+               g_mutex_unlock(&hcamcorder->task_thread_lock);
+               g_thread_join(hcamcorder->task_thread);
+               hcamcorder->task_thread = NULL;
+       }
+       g_mutex_clear(&hcamcorder->task_thread_lock);
+       g_cond_clear(&hcamcorder->task_thread_cond);
+
+       /* Release handle */
+       memset(hcamcorder, 0x00, sizeof(mmf_camcorder_t));
+       free(hcamcorder);
+
        return ret;
 }
 
@@ -432,10 +604,11 @@ int _mmcamcorder_destroy(MMHandleType handle)
 {
        int ret = MM_ERROR_NONE;
        int state = MM_CAMCORDER_STATE_NONE;
-       int state_FROM = MM_CAMCORDER_STATE_NULL;
-       int state_TO = MM_CAMCORDER_STATE_NONE;
-       int sessionType = MM_SESSION_TYPE_SHARE;
-       int errorcode = MM_ERROR_NONE;
+#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);
 
@@ -454,31 +627,55 @@ 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 async state */
-       ret = _mmcamcorder_set_async_state(handle, state_TO);
-       if (ret < 0) {
-               _mmcam_dbg_err("Can't set async state");
-               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+       /* set exit state for sound thread */
+       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;
+       g_cond_signal(&hcamcorder->task_thread_cond);
+       g_mutex_unlock(&hcamcorder->task_thread_lock);
+
+       /* 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("remove sink element %p, set state NULL result %d", sink_element, result);
+
+               gst_object_unref(sink_element);
+               sink_element = NULL;
        }
 
+       /* 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) {
-                       __ta__("    _mmcamcorder_destroy_pipeline",
+               if (hcamcorder->sub_context->element)
                        _mmcamcorder_destroy_pipeline(handle, hcamcorder->type);
-                       );
-               }
 
                _mmcamcorder_dealloc_subcontext(hcamcorder->sub_context);
                hcamcorder->sub_context = NULL;
        }
 
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+       /* de-initialize resource manager */
+       _MMCAMCORDER_LOCK_RESOURCE(hcamcorder);
+
+       ret = _mmcamcorder_resource_manager_deinit(&hcamcorder->resource_manager);
+       if (ret != MM_ERROR_NONE)
+               _mmcam_dbg_err("failed to de-initialize resource manager 0x%x", ret);
+
+       _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
+
        /* Remove idle function which is not called yet */
        if (hcamcorder->setting_event_id) {
                _mmcam_dbg_log("Remove remaining idle function");
@@ -488,96 +685,124 @@ int _mmcamcorder_destroy(MMHandleType handle)
 
        /* Remove attributes */
        if (hcamcorder->attributes) {
-               _mmcamcorder_dealloc_attribute(hcamcorder->attributes);
+               _mmcamcorder_dealloc_attribute(handle, hcamcorder->attributes);
                hcamcorder->attributes = 0;
        }
 
        /* 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)
+               _mmcamcorder_conf_release_info(handle, &hcamcorder->conf_ctrl);
+
+       if (hcamcorder->conf_main)
+               _mmcamcorder_conf_release_info(handle, &hcamcorder->conf_main);
 
+       /* Remove messages which are not called yet */
+       _mmcamcorder_remove_message_all(handle);
+
+       /* unset remained watch cb */
+       if (hcamcorder->sound_focus_watch_id > 0) {
+               mm_sound_unset_focus_watch_callback(hcamcorder->sound_focus_watch_id);
+               _mmcam_dbg_warn("unset sound focus watch cb [id %d] done", hcamcorder->sound_focus_watch_id);
+               hcamcorder->sound_focus_watch_id = 0;
        }
 
-       /* Remove command loop when async state change mode */
-       if (!hcamcorder->sync_state_change) {
-               _mmcamcorder_destroy_command_loop(handle);
+       /* unregister sound focus and unsubscribe sound signal */
+       _mmcam_dbg_log("sound focus id %d, sound signal subscribe id %u",
+               hcamcorder->sound_focus_id, hcamcorder->sound_focus_subscribe_id);
+
+       if (hcamcorder->sound_focus_id > 0) {
+               mm_sound_unregister_focus(hcamcorder->sound_focus_id);
+               _mmcam_dbg_log("unregister sound focus done");
+               hcamcorder->sound_focus_id = 0;
        }
 
-       /* Release configure info */
-       if (hcamcorder->conf_ctrl) {
-               _mmcamcorder_conf_release_info( &hcamcorder->conf_ctrl );
+       if (hcamcorder->sound_focus_subscribe_id > 0) {
+               mm_sound_unsubscribe_signal(hcamcorder->sound_focus_subscribe_id);
+               _mmcam_dbg_log("unsubscribe sound signal done");
+               hcamcorder->sound_focus_subscribe_id = 0;
        }
-       if (hcamcorder->conf_main) {
-               _mmcamcorder_conf_release_info( &hcamcorder->conf_main );
+
+#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 */
 
-       /* Remove messages which are not called yet */
-       _mmcamcroder_remove_message_all(handle);
+       /* release model_name */
+       if (hcamcorder->model_name) {
+               free(hcamcorder->model_name);
+               hcamcorder->model_name = NULL;
+       }
 
-       /* Unregister ASM */
-       if (MM_ERROR_NONE != _mm_session_util_read_type(-1, &sessionType)) {
-               _mmcam_dbg_log("_mm_session_util_read_type Fail. but keep going...");
-               sessionType = MM_SESSION_TYPE_SHARE;
+       if (hcamcorder->software_version) {
+               free(hcamcorder->software_version);
+               hcamcorder->software_version = NULL;
        }
-       if ((sessionType != MM_SESSION_TYPE_CALL) && (sessionType != MM_SESSION_TYPE_VIDEOCALL)) {
-               /* unregister SHARE session */
-               if (!ASM_unregister_sound(hcamcorder->asm_handle_sh, ASM_EVENT_SHARE_MMCAMCORDER, &errorcode)) {
-                       _mmcam_dbg_err("SHARE ASM_unregister_sound() failed(hdl:%p, err:%x)",
-                                      (void*)hcamcorder->asm_handle_sh, errorcode);
-               }
 
-               /* unregister EXCLUSIVE session */
-               if (!ASM_unregister_sound(hcamcorder->asm_handle_ex, ASM_EVENT_EXCLUSIVE_MMCAMCORDER, &errorcode)) {
-                       _mmcam_dbg_err("EXCLUSIVE ASM_unregister_sound() failed(hdl:%p, err:%x)",
-                                      (void*)hcamcorder->asm_handle_ex, errorcode);
+       /* 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");
+       g_thread_join(hcamcorder->task_thread);
+       hcamcorder->task_thread = NULL;
+
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
        /* Release lock, cond */
-       if ((hcamcorder->mtsafe).lock) {
-               g_mutex_free ((hcamcorder->mtsafe).lock);
-               (hcamcorder->mtsafe).lock = NULL;
-       }
-       if ((hcamcorder->mtsafe).cond) {
-               g_cond_free ((hcamcorder->mtsafe).cond);
-               (hcamcorder->mtsafe).cond = NULL;
-       }
-       if ((hcamcorder->mtsafe).cmd_lock) {
-               g_mutex_free ((hcamcorder->mtsafe).cmd_lock);
-               (hcamcorder->mtsafe).cmd_lock = NULL;
-       }
-       if ((hcamcorder->mtsafe).state_lock) {
-               g_mutex_free ((hcamcorder->mtsafe).state_lock);
-               (hcamcorder->mtsafe).state_lock = NULL;
-       }
-       if ((hcamcorder->mtsafe).gst_state_lock) {
-               g_mutex_free ((hcamcorder->mtsafe).gst_state_lock);
-               (hcamcorder->mtsafe).gst_state_lock = NULL;
-       }
-       if ((hcamcorder->mtsafe).message_cb_lock) {
-               g_mutex_free ((hcamcorder->mtsafe).message_cb_lock);
-               (hcamcorder->mtsafe).message_cb_lock = NULL;
-       }
-       if ((hcamcorder->mtsafe).vcapture_cb_lock) {
-               g_mutex_free ((hcamcorder->mtsafe).vcapture_cb_lock);
-               (hcamcorder->mtsafe).vcapture_cb_lock = NULL;
-       }
-       if ((hcamcorder->mtsafe).vstream_cb_lock) {
-               g_mutex_free ((hcamcorder->mtsafe).vstream_cb_lock);
-               (hcamcorder->mtsafe).vstream_cb_lock = NULL;
-       }
-       if ((hcamcorder->mtsafe).astream_cb_lock) {
-               g_mutex_free ((hcamcorder->mtsafe).astream_cb_lock);
-               (hcamcorder->mtsafe).astream_cb_lock = NULL;
-       }
+       g_mutex_clear(&(hcamcorder->mtsafe).lock);
+       g_cond_clear(&(hcamcorder->mtsafe).cond);
+       g_mutex_clear(&(hcamcorder->mtsafe).cmd_lock);
+       g_cond_clear(&(hcamcorder->mtsafe).cmd_cond);
+       g_mutex_clear(&(hcamcorder->mtsafe).asm_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).state_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).gst_state_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).gst_encode_state_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).message_cb_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).vcapture_cb_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).vstream_cb_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).astream_cb_lock);
+       g_mutex_clear(&(hcamcorder->mtsafe).mstream_cb_lock);
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+       g_cond_clear(&(hcamcorder->mtsafe).resource_cond);
+       g_mutex_clear(&(hcamcorder->mtsafe).resource_lock);
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
+
+       g_mutex_clear(&hcamcorder->snd_info.open_mutex);
+       g_cond_clear(&hcamcorder->snd_info.open_cond);
+       g_mutex_clear(&hcamcorder->restart_preview_lock);
+       g_mutex_clear(&hcamcorder->task_thread_lock);
+       g_cond_clear(&hcamcorder->task_thread_cond);
 
-       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));
+       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));
@@ -589,9 +814,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);
 
@@ -602,19 +826,29 @@ _ERR_CAMCORDER_CMD_PRECON:
 int _mmcamcorder_realize(MMHandleType handle)
 {
        int ret = MM_ERROR_NONE;
+       int ret_sound = MM_ERROR_NONE;
        int state = MM_CAMCORDER_STATE_NONE;
-       int state_FROM = MM_CAMCORDER_STATE_NULL;
-       int state_TO = MM_CAMCORDER_STATE_READY;
-       int sessionType = MM_SESSION_TYPE_SHARE;
-       int errorcode = MM_ERROR_NONE;
-       int display_surface_type = MM_DISPLAY_SURFACE_X;
+       int display_surface_type = MM_DISPLAY_SURFACE_OVERLAY;
+       int pid_for_sound_focus = 0;
        double motion_rate = _MMCAMCORDER_DEFAULT_RECORDING_MOTION_RATE;
        char *videosink_element_type = NULL;
-       char *videosink_name = NULL;
+       const char *videosink_name = NULL;
+       char *socket_path = NULL;
+       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);
 
-       _mmcam_dbg_log("");
+       /*_mmcam_dbg_log("");*/
 
        if (!hcamcorder) {
                _mmcam_dbg_err("Not initialized");
@@ -622,13 +856,6 @@ int _mmcamcorder_realize(MMHandleType handle)
                return ret;
        }
 
-       /* Check quick-device-close for emergency */
-       if (hcamcorder->quick_device_close) {
-               _mmcam_dbg_err("_mmcamcorder_realize can't be called!!!!");
-               ret = MM_ERROR_CAMCORDER_DEVICE;
-               goto _ERR_CAMCORDER_CMD_PRECON;
-       }
-
        if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) {
                _mmcam_dbg_err("Another command is running.");
                ret = MM_ERROR_CAMCORDER_CMD_IS_RUNNING;
@@ -636,86 +863,119 @@ 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;
        }
 
-       /* 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_OPEN);
-
-               _mmcam_dbg_log("VCONFKEY_CAMERA_STATE prev %d -> cur %d",
-                              vconf_camera_state, VCONFKEY_CAMERA_STATE_OPEN);
-       }
+       /* Get profile mode and gdbus connection */
+       mm_camcorder_get_attributes(handle, NULL,
+               MMCAM_MODE, &hcamcorder->type,
+               MMCAM_GDBUS_CONNECTION, &hcamcorder->gdbus_conn, &conn_size,
+               NULL);
 
-       /* Set async state */
-       ret = _mmcamcorder_set_async_state(handle, state_TO);
-       if (ret < 0) {
-               _mmcam_dbg_err("Can't set async state");
+       if (!hcamcorder->gdbus_conn) {
+               _mmcam_dbg_err("gdbus connection NULL");
+               ret = MM_ERROR_CAMCORDER_RESOURCE_CREATION;
                goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
        }
 
+       _mmcam_dbg_log("Profile mode [%d], gdbus connection [%p]",
+               hcamcorder->type, hcamcorder->gdbus_conn);
+
        mm_camcorder_get_attributes(handle, NULL,
-                                   MMCAM_MODE, &hcamcorder->type,
-                                   MMCAM_DISPLAY_SURFACE, &display_surface_type,
-                                   MMCAM_CAMERA_RECORDING_MOTION_RATE, &motion_rate,
-                                   NULL);
-
-       /* Get profile mode */
-       _mmcam_dbg_log("Profile mode set is (%d)", hcamcorder->type);
-
-       /* Check and make SHARE session as PLAYING */
-       if (MM_ERROR_NONE != _mm_session_util_read_type(-1, &sessionType)) {
-               _mmcam_dbg_log("_mm_session_util_read_type Fail. but keep going...");
-               sessionType = MM_SESSION_TYPE_SHARE;
-       }
-       if ((sessionType != MM_SESSION_TYPE_CALL) && (sessionType != MM_SESSION_TYPE_VIDEOCALL)) {
-               ASM_resource_t mm_resource = ASM_RESOURCE_NONE;
-               
-               switch (hcamcorder->type) {
-               case MM_CAMCORDER_MODE_AUDIO:
-                       mm_resource = ASM_RESOURCE_NONE;
-                       break;
-               case MM_CAMCORDER_MODE_VIDEO_CAPTURE:
-               default:
-                       mm_resource = ASM_RESOURCE_CAMERA | ASM_RESOURCE_VIDEO_OVERLAY | ASM_RESOURCE_HW_ENCODER;
-                       break;
-               }
+               MMCAM_DISPLAY_SURFACE, &display_surface_type,
+               MMCAM_CAMERA_RECORDING_MOTION_RATE, &motion_rate,
+               NULL);
+
+       /* sound focus */
+       if (hcamcorder->sound_focus_register) {
+               /* acquire sound focus or set sound focus watch callback */
+               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(hcamcorder->sound_focus_id, FOCUS_FOR_BOTH, NULL);
+                       if (ret_sound != MM_ERROR_NONE) {
+                               _mmcam_dbg_err("mm_sound_acquire_focus failed [0x%x]", ret_sound);
+
+                               ret = MM_ERROR_POLICY_BLOCKED;
+                               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+                       }
 
-               if (!ASM_set_sound_state(hcamcorder->asm_handle_sh, ASM_EVENT_SHARE_MMCAMCORDER,
-                                        ASM_STATE_PLAYING, mm_resource, &errorcode)) {
-                       _mmcam_dbg_err("Set state to playing failed 0x%x", errorcode);
-                       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 {
+                       /* unset remained watch cb */
+                       if (hcamcorder->sound_focus_watch_id > 0) {
+                               mm_sound_unset_focus_watch_callback(hcamcorder->sound_focus_watch_id);
+                               _mmcam_dbg_warn("unset sound focus watch cb [id %d] done", hcamcorder->sound_focus_watch_id);
+                               hcamcorder->sound_focus_watch_id = 0;
+                       }
+
+                       /* set sound focus watch callback */
+                       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);
+                       }
+
+                       _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);
+
+                               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");
        }
 
        /* 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(hcamcorder->conf_main,
-                                       CONFIGURE_CATEGORY_MAIN_CAPTURE,
-                                       "UseEncodebin",
-                                       &(hcamcorder->sub_context->bencbin_capture));
+       _mmcamcorder_conf_get_value_int(handle, hcamcorder->conf_main,
+               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));
+
+               _mmcam_dbg_warn("SupportDualStream [%d]", hcamcorder->sub_context->info_video->support_dual_stream);
+       }
 
        switch (display_surface_type) {
-       case MM_DISPLAY_SURFACE_X:
-               videosink_element_type = strdup("VideosinkElementX");
+       case MM_DISPLAY_SURFACE_OVERLAY:
+               videosink_element_type = strdup("VideosinkElementOverlay");
                break;
        case MM_DISPLAY_SURFACE_EVAS:
                videosink_element_type = strdup("VideosinkElementEvas");
@@ -726,133 +986,358 @@ int _mmcamcorder_realize(MMHandleType handle)
        case MM_DISPLAY_SURFACE_NULL:
                videosink_element_type = strdup("VideosinkElementNull");
                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");
+               } else {
+                       videosink_element_type = strdup("VideosinkElementRemote");
+               }
+               break;
        default:
-               videosink_element_type = strdup("VideosinkElementX");
+               videosink_element_type = strdup("VideosinkElementOverlay");
                break;
        }
 
        /* check string of videosink element */
        if (videosink_element_type) {
-               _mmcamcorder_conf_get_element(hcamcorder->conf_main,
-                                             CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT,
-                                             videosink_element_type,
-                                             &hcamcorder->sub_context->VideosinkElement);
+               _mmcamcorder_conf_get_element(handle, hcamcorder->conf_main,
+                       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(hcamcorder->conf_main,
-                                             CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT,
-                                             _MMCAMCORDER_DEFAULT_VIDEOSINK_TYPE,
-                                             &hcamcorder->sub_context->VideosinkElement );
+               _mmcamcorder_conf_get_element(handle, hcamcorder->conf_main,
+                       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);
        _mmcam_dbg_log("Videosink name : %s", videosink_name);
 
-       _mmcamcorder_conf_get_value_int(hcamcorder->conf_ctrl,
-                                       CONFIGURE_CATEGORY_CTRL_CAPTURE,
-                                       "SensorEncodedCapture",
-                                       &(hcamcorder->sub_context->SensorEncodedCapture));
+       /* get videoconvert element */
+       _mmcamcorder_conf_get_element(handle, hcamcorder->conf_main,
+               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));
        _mmcam_dbg_log("Support sensor encoded capture : %d", hcamcorder->sub_context->SensorEncodedCapture);
 
-       /* create pipeline */
-       __ta__("    _mmcamcorder_create_pipeline",
-       ret = _mmcamcorder_create_pipeline(handle, hcamcorder->type);
-       );
-       if (ret != MM_ERROR_NONE) {
-               /* check internal error of gstreamer */
-               if (hcamcorder->sub_context->error_code != MM_ERROR_NONE) {
-                       ret = hcamcorder->sub_context->error_code;
-                       _mmcam_dbg_log("gstreamer error is occurred. return it %x", ret);
-               }
+       if (hcamcorder->type == MM_CAMCORDER_MODE_VIDEO_CAPTURE) {
+               int dpm_camera_state = DPM_ALLOWED;
 
-               /* release sub context */
-               _mmcamcorder_dealloc_subcontext(hcamcorder->sub_context);
-               hcamcorder->sub_context = NULL;
-               goto _ERR_CAMCORDER_CMD;
-       }
+               /* 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;
 
-       /* set command function */
-       ret = _mmcamcorder_set_functions(handle, hcamcorder->type);
-       if (ret != MM_ERROR_NONE) {
-               _mmcamcorder_destroy_pipeline(handle, hcamcorder->type);
-               _mmcamcorder_dealloc_subcontext(hcamcorder->sub_context);
-               hcamcorder->sub_context = NULL;
-               goto _ERR_CAMCORDER_CMD;
-       }
+                                       _mmcamcorder_request_dpm_popup(hcamcorder->gdbus_conn, "camera");
 
-       _mmcamcorder_set_state(handle, state_TO);
+                                       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");
+               }
 
-       _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+               /* check connection */
+               if (hcamcorder->resource_manager.is_connected == FALSE) {
+                       _mmcam_dbg_warn("resource manager disconnected before, try to reconnect");
 
-       return MM_ERROR_NONE;
+                       /* release remained resource */
+                       _mmcamcorder_resource_manager_deinit(&hcamcorder->resource_manager);
 
-_ERR_CAMCORDER_CMD:
-       /* set async state and (set async cancel or set state) are pair. */
-       _mmcamcorder_set_async_cancel(handle);
+                       /* init resource manager and wait for connection */
+                       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_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+                       }
 
-_ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
-       _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
-       
-_ERR_CAMCORDER_CMD_PRECON:
-       _mmcam_dbg_err("Realize fail (type %d, state %d, ret %x)",
-                      hcamcorder->type, state, ret);
+                       ret = _mmcamcorder_resource_wait_for_connection(&hcamcorder->resource_manager, (void *)hcamcorder);
+                       if (ret != MM_ERROR_NONE) {
+                               _mmcam_dbg_err("failed to connect resource manager");
+                               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+                       }
+               }
 
-       /* rollback camera state to vconf key */
-       if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
-               int vconf_camera_state = 0;
+               ret = _mmcamcorder_resource_create_resource_set(&hcamcorder->resource_manager);
+               if (ret != MM_ERROR_NONE) {
+                       goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+               }
 
-               /* 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);
+               hcamcorder->resource_manager.acquire_count = 0;
 
-               _mmcam_dbg_log("VCONFKEY_CAMERA_STATE prev %d -> cur %d",
-                              vconf_camera_state, VCONFKEY_CAMERA_STATE_NULL);
-       }
+               /* prepare resource manager for camera */
+               ret = _mmcamcorder_resource_manager_prepare(&hcamcorder->resource_manager, MM_CAMCORDER_RESOURCE_TYPE_CAMERA);
+               if (ret != MM_ERROR_NONE) {
+                       _mmcam_dbg_err("could not prepare for camera resource");
+                       ret = MM_ERROR_CAMCORDER_INTERNAL;
+                       goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+               }
 
-       return ret;
-}
+               /* prepare resource manager for "video_overlay only if display surface is X" */
+               if (display_surface_type == MM_DISPLAY_SURFACE_OVERLAY) {
+                       ret = _mmcamcorder_resource_manager_prepare(&hcamcorder->resource_manager, MM_CAMCORDER_RESOURCE_TYPE_VIDEO_OVERLAY);
+                       if (ret != MM_ERROR_NONE) {
+                               _mmcam_dbg_err("could not prepare for video overlay resource");
+                               ret = MM_ERROR_CAMCORDER_INTERNAL;
+                               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+                       }
+               }
 
+               /* acquire resources */
+               _MMCAMCORDER_LOCK_RESOURCE(hcamcorder);
 
-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;
-       int sessionType = MM_SESSION_TYPE_SHARE;
-       ASM_resource_t mm_resource = ASM_RESOURCE_NONE;
+               ret = _mmcamcorder_resource_manager_acquire(&hcamcorder->resource_manager);
+               if (ret != MM_ERROR_NONE) {
+                       _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
 
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
+                       _mmcam_dbg_err("could not acquire resources");
 
-       _mmcam_dbg_log("");
+                       goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+               }
 
-       if (!hcamcorder) {
-               _mmcam_dbg_err("Not initialized");
-               ret = MM_ERROR_CAMCORDER_NOT_INITIALIZED;
-               return ret;
-       }
+               if (hcamcorder->resource_manager.acquire_remain > 0) {
+                       gint64 end_time = 0;
 
-       if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) {
-               _mmcam_dbg_err("Another command is running.");
-               ret = MM_ERROR_CAMCORDER_CMD_IS_RUNNING;
-               goto _ERR_CAMCORDER_CMD_PRECON;
-       }
+                       _mmcam_dbg_warn("wait for resource state change");
 
-       state = _mmcamcorder_get_state(handle);
-       if (state != state_FROM) {
-               _mmcam_dbg_err("Wrong state(%d)", state);
-               ret = MM_ERROR_CAMCORDER_INVALID_STATE;
-               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
-       }
+                       /* wait for resource state change */
+                       end_time = g_get_monotonic_time() + (__MMCAMCORDER_RESOURCE_WAIT_TIME * G_TIME_SPAN_SECOND);
 
-       /* set async state */
-       ret = _mmcamcorder_set_async_state(handle, state_TO);
+                       if (_MMCAMCORDER_RESOURCE_WAIT_UNTIL(hcamcorder, end_time)) {
+                               _mmcam_dbg_warn("signal received");
+                       } else {
+                               _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
+                               _mmcam_dbg_err("timeout");
+                               ret = MM_ERROR_RESOURCE_INTERNAL;
+                               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+                       }
+               } else {
+                       _mmcam_dbg_log("already all acquired");
+               }
+
+               _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
+
+#ifdef _MMCAMCORDER_RM_SUPPORT
+               mm_camcorder_get_attributes(handle, NULL,
+                       MMCAM_PID_FOR_SOUND_FOCUS, &app_pid,
+                       NULL);
+               rci.app_pid = app_pid;
+               aul_app_get_appid_bypid(rci.app_pid, rci.app_id, sizeof(rci.app_id));
+
+               /* RM register */
+               if (hcamcorder->rm_handle == 0) {
+                       iret = rm_register((rm_resource_cb)_mmcamcorder_rm_callback, (void*)hcamcorder, &(hcamcorder->rm_handle), &rci);
+                       if (iret != RM_OK) {
+                               _mmcam_dbg_err("rm_register fail");
+                               ret = MM_ERROR_POLICY_BLOCKED;
+                               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+                       }
+               }
+
+               mm_camcorder_get_attributes(handle, NULL,
+                       MMCAM_CAMERA_FORMAT, &preview_format,
+                       NULL);
+
+               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_POLICY_BLOCKED;
+                       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) {
+                       ret = hcamcorder->error_code;
+                       _mmcam_dbg_log("gstreamer error is occurred. return it %x", ret);
+               }
+
+               /* release sub context */
+               _mmcamcorder_dealloc_subcontext(hcamcorder->sub_context);
+               hcamcorder->sub_context = NULL;
+               goto _ERR_CAMCORDER_CMD;
+       }
+
+       /* set command function */
+       ret = _mmcamcorder_set_functions(handle, hcamcorder->type);
        if (ret != MM_ERROR_NONE) {
-               _mmcam_dbg_err("Can't set async state");
+               _mmcamcorder_destroy_pipeline(handle, hcamcorder->type);
+               _mmcamcorder_dealloc_subcontext(hcamcorder->sub_context);
+               hcamcorder->sub_context = NULL;
+               goto _ERR_CAMCORDER_CMD;
+       }
+
+       _mmcamcorder_set_state(handle, MM_CAMCORDER_STATE_READY);
+
+       _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
+
+       return MM_ERROR_NONE;
+
+_ERR_CAMCORDER_CMD:
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+       /* release hw resources */
+       if (hcamcorder->type == MM_CAMCORDER_MODE_VIDEO_CAPTURE) {
+               int ret_resource = _mmcamcorder_resource_manager_release(&hcamcorder->resource_manager);
+               if (ret_resource == MM_ERROR_RESOURCE_INVALID_STATE) {
+                       _mmcam_dbg_warn("it could be in the middle of resource callback or there's no acquired resource");
+               } else if (ret_resource != MM_ERROR_NONE) {
+                       _mmcam_dbg_err("failed to release resource, ret_resource(0x%x)", ret_resource);
+               }
+       }
+#endif /* _MMCAMCORDER_MURPHY_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 ");
+               }
+
+               /* 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_watch_id > 0) {
+               mm_sound_unset_focus_watch_callback(hcamcorder->sound_focus_watch_id);
+               _mmcam_dbg_warn("unset sound focus watch cb [id %d] done", hcamcorder->sound_focus_watch_id);
+               hcamcorder->sound_focus_watch_id = 0;
+       }
+
+       if (hcamcorder->acquired_focus > 0) {
+               mm_sound_release_focus(hcamcorder->sound_focus_id, hcamcorder->acquired_focus, NULL);
+               _mmcam_dbg_warn("release sound focus [focus %d] done", hcamcorder->acquired_focus);
+               hcamcorder->acquired_focus = 0;
+       }
+
+_ERR_CAMCORDER_CMD_PRECON:
+       _mmcam_dbg_err("Realize fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret);
+
+       return ret;
+}
+
+
+int _mmcamcorder_unrealize(MMHandleType handle)
+{
+       int ret = MM_ERROR_NONE;
+       int state = MM_CAMCORDER_STATE_NONE;
+
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
+
+       _mmcam_dbg_log("");
+
+       if (!hcamcorder) {
+               _mmcam_dbg_err("Not initialized");
+               ret = MM_ERROR_CAMCORDER_NOT_INITIALIZED;
+               return ret;
+       }
+
+       if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) {
+               _mmcam_dbg_err("Another command is running.");
+               ret = MM_ERROR_CAMCORDER_CMD_IS_RUNNING;
+               goto _ERR_CAMCORDER_CMD_PRECON;
+       }
+
+       state = _mmcamcorder_get_state(handle);
+       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;
        }
 
@@ -865,55 +1350,95 @@ int _mmcamcorder_unrealize(MMHandleType handle)
                hcamcorder->sub_context = NULL;
        }
 
-       /* Deinitialize main context member */
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+       _mmcam_dbg_warn("lock resource - cb calling %d", hcamcorder->resource_release_cb_calling);
 
-       hcamcorder->command = NULL;
+       _MMCAMCORDER_LOCK_RESOURCE(hcamcorder);
+
+       if (hcamcorder->type == MM_CAMCORDER_MODE_VIDEO_CAPTURE &&
+               hcamcorder->state_change_by_system != _MMCAMCORDER_STATE_CHANGE_BY_RM &&
+               hcamcorder->resource_release_cb_calling == FALSE) {
+               gint64 end_time = 0;
+
+               /* release resource */
+               ret = _mmcamcorder_resource_manager_release(&hcamcorder->resource_manager);
+               if (ret == MM_ERROR_RESOURCE_INVALID_STATE) {
+                       _mmcam_dbg_warn("it could be in the middle of resource callback or there's no acquired resource");
+                       ret = MM_ERROR_NONE;
+               } else if (ret != MM_ERROR_NONE) {
+                       _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");
 
-       /* check who calls unrealize. it's no need to set ASM state if caller is ASM */
-       if (hcamcorder->state_change_by_system != _MMCAMCORDER_STATE_CHANGE_BY_ASM) {
-               if (MM_ERROR_NONE != _mm_session_util_read_type(-1, &sessionType)) {
-                       _mmcam_dbg_log("_mm_session_util_read_type Fail. but keep going...");
-                       sessionType = MM_SESSION_TYPE_SHARE;
+                       goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
                }
 
-               /* Call session is not ended here */
-               if ((sessionType != MM_SESSION_TYPE_CALL) && (sessionType != MM_SESSION_TYPE_VIDEOCALL)) {
-                       mm_resource = ASM_RESOURCE_NONE;
+               if (hcamcorder->resource_manager.acquire_remain < hcamcorder->resource_manager.acquire_count) {
+                       /* wait for resource release */
+                       _mmcam_dbg_log("resource is not released all. wait for signal...");
 
-                       switch (hcamcorder->type) {
-                       case MM_CAMCORDER_MODE_AUDIO:
-                               mm_resource = ASM_RESOURCE_NONE;
-                               break;
-                       case MM_CAMCORDER_MODE_VIDEO_CAPTURE:
-                       default:
-                               mm_resource = ASM_RESOURCE_CAMERA | ASM_RESOURCE_VIDEO_OVERLAY | ASM_RESOURCE_HW_ENCODER;
-                               break;
-                       }
+                       end_time = g_get_monotonic_time() + (__MMCAMCORDER_RESOURCE_WAIT_TIME * G_TIME_SPAN_SECOND);
 
-                       /* STOP SHARE session */
-                       if (!ASM_set_sound_state(hcamcorder->asm_handle_sh, ASM_EVENT_SHARE_MMCAMCORDER,
-                                                ASM_STATE_STOP, mm_resource, &ret)) {
-                               _mmcam_dbg_err("SHARE Set state to STOP failed 0x%x", ret);
-                       }
+                       _MMCAMCORDER_RESOURCE_WAIT_UNTIL(hcamcorder, end_time);
                }
        }
 
-       _mmcamcorder_set_state(handle, state_TO);
+       _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
 
-       /* set camera state to vconf key */
-       if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
-               int vconf_camera_state = 0;
+       _mmcam_dbg_warn("unlock resource");
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
+
+#ifdef _MMCAMCORDER_RM_SUPPORT
+       if (hcamcorder->rm_handle && (hcamcorder->returned_devices.allocated_num > 0)) {
+                       int iret = RM_OK;
+                       int idx = 0;
+                       rm_device_request_s requested;
+                       memset(&requested, 0x0, sizeof(rm_device_request_s));
+                       requested.request_num = hcamcorder->returned_devices.allocated_num;
+                       for (idx = 0; idx < requested.request_num; idx++)
+                               requested.device_id[idx] = hcamcorder->returned_devices.device_id[idx];
 
-               /* 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);
+                       iret = rm_deallocate_resources(hcamcorder->rm_handle, &requested);
+                       if (iret != RM_OK)
+                               _mmcam_dbg_err("Resource deallocation request failed ");
+               }
+#endif /* _MMCAMCORDER_RM_SUPPORT*/
+
+       /* Deinitialize main context member */
+       hcamcorder->command = NULL;
+
+       _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);
+
+       /* release sound focus or unset sound focus watch callback */
+       _mmcam_dbg_log("by_system %d, flag 0x%x, acquired_focus %d, focus_id %d, 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_FOCUS) {
+               if (hcamcorder->sound_focus_watch_id > 0) {
+                       mm_sound_unset_focus_watch_callback(hcamcorder->sound_focus_watch_id);
+                       _mmcam_dbg_warn("unset sound focus watch cb [id %d] done", hcamcorder->sound_focus_watch_id);
+                       hcamcorder->sound_focus_watch_id = 0;
+               }
 
-               _mmcam_dbg_log("VCONFKEY_CAMERA_STATE prev %d -> cur %d",
-                              vconf_camera_state, VCONFKEY_CAMERA_STATE_NULL);
+               if (hcamcorder->acquired_focus > 0) {
+                       mm_sound_release_focus(hcamcorder->sound_focus_id, hcamcorder->acquired_focus, NULL);
+                       _mmcam_dbg_warn("release sound focus [focus %d] done", hcamcorder->acquired_focus);
+                       hcamcorder->acquired_focus = 0;
+               }
+       } else {
+               _mmcam_dbg_warn("state change by focus. so, no need to unset watch callback");
+               /* acquired focus will be released automatically */
+               hcamcorder->acquired_focus = 0;
        }
 
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
+       _mmcamcorder_set_state(handle, MM_CAMCORDER_STATE_NULL);
+
        return MM_ERROR_NONE;
 
 _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
@@ -921,8 +1446,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;
 }
@@ -931,8 +1455,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);
@@ -948,13 +1470,6 @@ int _mmcamcorder_start(MMHandleType handle)
        sc = MMF_CAMCORDER_SUBCONTEXT(handle);
        mmf_return_val_if_fail(sc, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
-       /* check quick-device-close for emergency */
-       if (hcamcorder->quick_device_close) {
-               _mmcam_dbg_err("_mmcamcorder_start can't be called!!!!");
-               ret = MM_ERROR_CAMCORDER_DEVICE;
-               goto _ERR_CAMCORDER_CMD_PRECON;
-       }
-
        if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) {
                _mmcam_dbg_err("Another command is running.");
                ret = MM_ERROR_CAMCORDER_CMD_IS_RUNNING;
@@ -962,66 +1477,53 @@ 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;
        }
 
        /* initialize error code */
-       hcamcorder->sub_context->error_code = MM_ERROR_NONE;
+       hcamcorder->error_code = MM_ERROR_NONE;
 
-       /* set async state */
-       ret = _mmcamcorder_set_async_state(handle, state_TO);
-       if (ret != MM_ERROR_NONE) {
-               _mmcam_dbg_err("Can't set async state");
-               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
-       }
+       /* set attributes related sensor */
+       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) {
-               goto _ERR_CAMCORDER_CMD;
+               /* check internal error of gstreamer */
+               if (hcamcorder->error_code != MM_ERROR_NONE) {
+                       ret = hcamcorder->error_code;
+                       _mmcam_dbg_log("gstreamer error is occurred. return it %x", ret);
+               }
+               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;
-
-               _mmcamcorder_set_attribute_to_camsensor(handle);
-
-               /* 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);
 
        return MM_ERROR_NONE;
 
-_ERR_CAMCORDER_CMD:
-       /* set async state and (set async cancel or set state) are pair. */
-       _mmcamcorder_set_async_cancel(handle);
-       
 _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
 _ERR_CAMCORDER_CMD_PRECON:
        /* check internal error of gstreamer */
-       if (hcamcorder->sub_context->error_code != MM_ERROR_NONE) {
-               ret = hcamcorder->sub_context->error_code;
-               hcamcorder->sub_context->error_code = MM_ERROR_NONE;
+       if (hcamcorder->error_code != MM_ERROR_NONE) {
+               ret = hcamcorder->error_code;
+               hcamcorder->error_code = MM_ERROR_NONE;
 
                _mmcam_dbg_log("gstreamer error is occurred. return it %x", ret);
        }
 
        _mmcam_dbg_err("Start fail (type %d, state %d, ret %x)",
-                      hcamcorder->type, state, ret);
+                                  hcamcorder->type, state, ret);
 
        return ret;
 }
@@ -1030,9 +1532,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;
-       int frame_rate = 0;
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
@@ -1051,58 +1550,45 @@ 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;
        }
 
-       /* set async state */
-       ret = _mmcamcorder_set_async_state(handle, state_TO);
-       if (ret != MM_ERROR_NONE) {
-               _mmcam_dbg_err("Can't set async state");
-               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
-       }
-
        ret = hcamcorder->command((MMHandleType)hcamcorder, _MMCamcorder_CMD_PREVIEW_STOP);
-       if (ret != MM_ERROR_NONE) {
-               goto _ERR_CAMCORDER_CMD;
-       }
-
-       /* KPI : frame rate */
-       frame_rate=_mmcamcorder_video_average_framerate(handle);
-       __ta__(__tafmt__("MM_CAM_006:: Frame per sec : %d", frame_rate), ;);
+       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);
 
        return MM_ERROR_NONE;
 
-_ERR_CAMCORDER_CMD:
-       /* set async state and (set async cancel or set state) are pair. */
-       _mmcamcorder_set_async_cancel(handle);
-
 _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
 _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;
 }
@@ -1115,8 +1601,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;
-       char *err_name = NULL;
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
@@ -1135,41 +1619,54 @@ 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;
        }
 
-       /* set async state */
-       ret = _mmcamcorder_set_async_state(handle, state_TO);
-       if (ret != MM_ERROR_NONE) {
-               _mmcam_dbg_err("Can't set async state");
-               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+       /* Handle capture in recording case */
+       if (state == state_FROM_1 || state == state_FROM_2) {
+               if (hcamcorder->capture_in_recording == TRUE) {
+                       _mmcam_dbg_err("Capturing in recording (%d)", state);
+                       ret = MM_ERROR_CAMCORDER_DEVICE_BUSY;
+                       goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+               } else {
+                       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");
+                               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);
+                               g_mutex_unlock(&hcamcorder->task_thread_lock);
+                               ret = MM_ERROR_CAMCORDER_INVALID_STATE;
+                               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+                       }
+               }
        }
 
        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);
-       }
-
-       /* Init break continuous shot attr */
-       mm_camcorder_set_attributes(handle, &err_name, "capture-break-cont-shot", 0, NULL);
+       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)
+               _mmcam_dbg_warn("capture-break-cont-shot set 0 failed");
+
        return MM_ERROR_NONE;
 
 _ERR_CAMCORDER_CMD:
-       /* set async state and (set async cancel or set state) are pair. */
-       _mmcamcorder_set_async_cancel(handle);
+       if (hcamcorder->capture_in_recording)
+               hcamcorder->capture_in_recording = FALSE;
 
 _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
@@ -1177,7 +1674,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;
 }
@@ -1186,8 +1683,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("");
@@ -1205,43 +1700,29 @@ 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;
        }
 
-       /* set async state */
-       ret = _mmcamcorder_set_async_state(handle, state_TO);
-       if (ret != MM_ERROR_NONE) {
-               _mmcam_dbg_err("Can't set async state");
-               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
-       }
-
        ret = hcamcorder->command((MMHandleType)hcamcorder, _MMCamcorder_CMD_PREVIEW_START);
-       if (ret != MM_ERROR_NONE) {
-               goto _ERR_CAMCORDER_CMD;
-       }
+       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);
 
-       MMTA_ACUM_ITEM_END("Real First Capture Start", FALSE);
-
        return MM_ERROR_NONE;
 
-_ERR_CAMCORDER_CMD:
-       /* set async state and (set async cancel or set state) are pair. */
-       _mmcamcorder_set_async_cancel(handle);
-
 _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
 _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;
 }
@@ -1250,10 +1731,7 @@ 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 sessionType = MM_SESSION_TYPE_SHARE;
+       int dpm_mic_state = DPM_ALLOWED;
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
@@ -1272,90 +1750,64 @@ 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;
        }
 
        /* initialize error code */
-       hcamcorder->sub_context->error_code = MM_ERROR_NONE;
+       hcamcorder->error_code = MM_ERROR_NONE;
 
-       /* Check and register EXCLUSIVE ASM */
-       if (MM_ERROR_NONE != _mm_session_util_read_type(-1, &sessionType)) {
-               _mmcam_dbg_log("_mm_session_util_read_type Fail. but keep going...");
-               sessionType = MM_SESSION_TYPE_SHARE;
-       }
-       if ((sessionType != MM_SESSION_TYPE_CALL) && (sessionType != MM_SESSION_TYPE_VIDEOCALL)) {
-               int errorcode;
-               ASM_resource_t mm_resource = ASM_RESOURCE_NONE;
+       /* check mic policy from DPM */
+       if (hcamcorder->dpm_handle) {
+               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;
 
-               switch (hcamcorder->type) {
-               case MM_CAMCORDER_MODE_AUDIO:
-                       mm_resource = ASM_RESOURCE_NONE;
-                       break;
-               case MM_CAMCORDER_MODE_VIDEO_CAPTURE:
-               default:
-                       mm_resource = ASM_RESOURCE_CAMERA | ASM_RESOURCE_VIDEO_OVERLAY | ASM_RESOURCE_HW_ENCODER;
-                       break;
-               }
+                               _mmcamcorder_request_dpm_popup(hcamcorder->gdbus_conn, "microphone");
 
-               if (!ASM_set_sound_state(hcamcorder->asm_handle_ex, ASM_EVENT_EXCLUSIVE_MMCAMCORDER,
-                                        ASM_STATE_PLAYING, mm_resource, &errorcode)) {
-                       _mmcam_dbg_err("Set state to playing failed 0x%x", errorcode);
-                       ret = MM_ERROR_POLICY_BLOCKED;
-                       goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+                               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+                       }
+               } else {
+                       _mmcam_dbg_err("get DPM mic state failed, keep going...");
                }
-       }
-
-       /* set async state */
-       ret = _mmcamcorder_set_async_state(handle, state_TO);
-       if (ret != MM_ERROR_NONE) {
-               _mmcam_dbg_err("Can't set async state");
-               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+       } else {
+               _mmcam_dbg_warn("NULL dpm_handle");
        }
 
        ret = hcamcorder->command((MMHandleType)hcamcorder, _MMCamcorder_CMD_RECORD);
        if (ret != MM_ERROR_NONE) {
-               goto _ERR_CAMCORDER_CMD;
+               /* check internal error of gstreamer */
+               if (hcamcorder->error_code != MM_ERROR_NONE) {
+                       ret = hcamcorder->error_code;
+                       _mmcam_dbg_log("gstreamer error is occurred. return it %x", ret);
+               }
+               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);
-       }
+       _mmcamcorder_set_state(handle, MM_CAMCORDER_STATE_RECORDING);
 
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
        return MM_ERROR_NONE;
 
-_ERR_CAMCORDER_CMD:
-       /* set async state and (set async cancel or set state) are pair. */
-       _mmcamcorder_set_async_cancel(handle);
-
 _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
 _ERR_CAMCORDER_CMD_PRECON:
        /* check internal error of gstreamer */
-       if (hcamcorder->sub_context->error_code != MM_ERROR_NONE) {
-               ret = hcamcorder->sub_context->error_code;
-               hcamcorder->sub_context->error_code = MM_ERROR_NONE;
+       if (hcamcorder->error_code != MM_ERROR_NONE) {
+               ret = hcamcorder->error_code;
+               hcamcorder->error_code = MM_ERROR_NONE;
 
                _mmcam_dbg_log("gstreamer error is occurred. return it %x", ret);
        }
 
        _mmcam_dbg_err("Record fail (type %d, state %d, ret %x)",
-                      hcamcorder->type, state, ret);
+                                  hcamcorder->type, state, ret);
 
        return ret;
 }
@@ -1365,8 +1817,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);
 
@@ -1385,53 +1835,28 @@ 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;
        }
 
-       /* set async state */
-       ret = _mmcamcorder_set_async_state(handle, state_TO);
-       if (ret != MM_ERROR_NONE) {
-               _mmcam_dbg_err("Can't set async state");
-               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
-       }
-
        ret = hcamcorder->command((MMHandleType)hcamcorder, _MMCamcorder_CMD_PAUSE);
-       if (ret != MM_ERROR_NONE) {
-               goto _ERR_CAMCORDER_CMD;
-       }
-
-       _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);
+       if (ret != MM_ERROR_NONE)
+               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
 
-               _mmcam_dbg_log("VCONFKEY_CAMERA_STATE prev %d -> cur %d",
-                              vconf_camera_state, VCONFKEY_CAMERA_STATE_RECORDING_PAUSE);
-       }
+       _mmcamcorder_set_state(handle, MM_CAMCORDER_STATE_PAUSED);
 
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
        return MM_ERROR_NONE;
 
-_ERR_CAMCORDER_CMD:
-       /* set async state and (set async cancel or set state) are pair. */
-       _mmcamcorder_set_async_cancel(handle);
-
 _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
 _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;
 }
@@ -1441,12 +1866,9 @@ 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);
-       
+
        _mmcam_dbg_log("");
 
        if (!hcamcorder) {
@@ -1462,99 +1884,43 @@ 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;
        }
 
-       /* set async state */
-       ret = _mmcamcorder_set_async_state(handle, state_TO);
-       if (ret != MM_ERROR_NONE) {
-               _mmcam_dbg_err("Can't set async 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) {
-               goto _ERR_CAMCORDER_CMD;
-       }
+       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);
 
-       /* set camera state to vconf key */
-       if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
-               int vconf_camera_state = 0;
+       _MMCAMCORDER_UNLOCK_CMD(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_PREVIEW);
+       return MM_ERROR_NONE;
 
-               _mmcam_dbg_log("VCONFKEY_CAMERA_STATE prev %d -> cur %d",
-                              vconf_camera_state, VCONFKEY_CAMERA_STATE_PREVIEW);
-       }
+_ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
+       _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
-       /* check who calls unrealize. it's no need to set ASM state if caller is ASM */
-       if (hcamcorder->state_change_by_system != _MMCAMCORDER_STATE_CHANGE_BY_ASM) {
-               int sessionType = MM_SESSION_TYPE_SHARE;
-               ASM_resource_t mm_resource = ASM_RESOURCE_NONE;
+_ERR_CAMCORDER_CMD_PRECON:
+       /* send message */
+       _mmcam_dbg_err("Commit fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret);
 
-               if (MM_ERROR_NONE != _mm_session_util_read_type(-1, &sessionType)) {
-                       _mmcam_dbg_log("_mm_session_util_read_type Fail. but keep going...");
-                       sessionType = MM_SESSION_TYPE_SHARE;
-               }
-
-               /* Call session is not ended here */
-               if ((sessionType != MM_SESSION_TYPE_CALL) && (sessionType != MM_SESSION_TYPE_VIDEOCALL)) {
-                       switch (hcamcorder->type) {
-                       case MM_CAMCORDER_MODE_AUDIO:
-                               mm_resource = ASM_RESOURCE_NONE;
-                               break;
-                       case MM_CAMCORDER_MODE_VIDEO_CAPTURE:
-                       default:
-                               mm_resource = ASM_RESOURCE_CAMERA | ASM_RESOURCE_VIDEO_OVERLAY | ASM_RESOURCE_HW_ENCODER;
-                               break;
-                       }
-
-                       /* STOP EXCLUSIVE session */
-                       if (!ASM_set_sound_state(hcamcorder->asm_handle_ex, ASM_EVENT_EXCLUSIVE_MMCAMCORDER,
-                                                ASM_STATE_STOP, mm_resource, &ret)) {
-                               _mmcam_dbg_err("EXCLUSIVE Set state to STOP failed 0x%x", ret);
-                       }
-               }
-       }
-
-       _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
-
-       return MM_ERROR_NONE;
-
-_ERR_CAMCORDER_CMD:
-       /* set async state and (set async cancel or set state) are pair. */
-       _mmcamcorder_set_async_cancel(handle);
-
-_ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
-       _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
-
-_ERR_CAMCORDER_CMD_PRECON:
-       /* send message */
-       _mmcam_dbg_err("Commit fail (type %d, state %d, ret %x)",
-                      hcamcorder->type, state, ret);
-
-       return ret;
-}
+       return ret;
+}
 
 
 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;
-       int sessionType = MM_SESSION_TYPE_SHARE;
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-       
+
        _mmcam_dbg_log("");
 
        if (!hcamcorder) {
@@ -1570,80 +1936,29 @@ 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;
        }
 
-       /* set async state */
-       ret = _mmcamcorder_set_async_state(handle, state_TO);
-       if (ret != MM_ERROR_NONE) {
-               _mmcam_dbg_err("Can't set async state");
-               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
-       }
-
        ret = hcamcorder->command((MMHandleType)hcamcorder, _MMCamcorder_CMD_CANCEL);
-       if (ret != MM_ERROR_NONE) {
-               goto _ERR_CAMCORDER_CMD;
-       }
-
-       _mmcamcorder_set_state(handle, state_TO);
-
-       /* read session type */
-       if (MM_ERROR_NONE != _mm_session_util_read_type(-1, &sessionType)) {
-               _mmcam_dbg_log("_mm_session_util_read_type Fail. but keep going...");
-               sessionType = MM_SESSION_TYPE_SHARE;
-       }
-
-       /* Call session is not ended here */
-       if ((sessionType != MM_SESSION_TYPE_CALL) && (sessionType != MM_SESSION_TYPE_VIDEOCALL)) {
-               ASM_resource_t mm_resource = ASM_RESOURCE_NONE;
-
-               switch (hcamcorder->type) {
-               case MM_CAMCORDER_MODE_AUDIO:
-                       mm_resource = ASM_RESOURCE_NONE;
-                       break;
-               case MM_CAMCORDER_MODE_VIDEO_CAPTURE:
-               default:
-                       mm_resource = ASM_RESOURCE_CAMERA | ASM_RESOURCE_VIDEO_OVERLAY | ASM_RESOURCE_HW_ENCODER;
-                       break;
-               }
-
-               /* STOP EXCLUSIVE session */
-               if (!ASM_set_sound_state(hcamcorder->asm_handle_ex, ASM_EVENT_EXCLUSIVE_MMCAMCORDER,
-                                        ASM_STATE_STOP, mm_resource, &ret)) {
-                       _mmcam_dbg_err("EXCLUSIVE Set state to STOP failed 0x%x", ret);
-               }
-       }
-
-       /* 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);
+       if (ret != MM_ERROR_NONE)
+               goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
 
-               _mmcam_dbg_log("VCONFKEY_CAMERA_STATE prev %d -> cur %d",
-                              vconf_camera_state, VCONFKEY_CAMERA_STATE_PREVIEW);
-       }
+       _mmcamcorder_set_state(handle, MM_CAMCORDER_STATE_PREPARE);
 
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
        return MM_ERROR_NONE;
 
-_ERR_CAMCORDER_CMD:
-       /* set async state and (set async cancel or set state) are pair. */
-       _mmcamcorder_set_async_cancel(handle);
-
 _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK:
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
 _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;
 }
@@ -1669,9 +1984,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");
@@ -1692,13 +2006,12 @@ int _mmcamcorder_set_video_stream_callback(MMHandleType handle, mm_camcorder_vid
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
-       _mmcam_dbg_log("");
+       /*_mmcam_dbg_log("");*/
 
        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");
@@ -1722,9 +2035,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");
@@ -1740,6 +2052,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);
@@ -1748,9 +2085,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");
@@ -1788,7 +2124,6 @@ int _mmcamcorder_init_focusing(MMHandleType handle)
        int current_af_range = 0;
        mmf_camcorder_t *hcamcorder = NULL;
        _MMCamcorderSubContext *sc = NULL;
-       mmf_attrs_t *attr = NULL;
        GstCameraControl *control = NULL;
 
        _mmcam_dbg_log("");
@@ -1808,7 +2143,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;
        }
@@ -1818,7 +2153,13 @@ int _mmcamcorder_init_focusing(MMHandleType handle)
                _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
                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;
+       }
 
        ret = gst_camera_control_stop_auto_focus(control);
        if (!ret) {
@@ -1828,21 +2169,19 @@ int _mmcamcorder_init_focusing(MMHandleType handle)
        }
 
        /* Initialize lens position */
-       attr = (mmf_attrs_t *)MMF_CAMCORDER_ATTRS(handle);
        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;
        }
 
@@ -1867,35 +2206,48 @@ int _mmcamcorder_adjust_focus(MMHandleType handle, int direction)
        mmf_return_val_if_fail(handle, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
        mmf_return_val_if_fail(direction, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
 
-       _mmcam_dbg_log("");
+       /*_mmcam_dbg_log("");*/
+
+       if (!_MMCAMCORDER_TRYLOCK_CMD(handle)) {
+               _mmcam_dbg_err("Another command is running.");
+               return MM_ERROR_CAMCORDER_CMD_IS_RUNNING;
+       }
 
        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;
        }
 
        /* 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) {
-               return _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) {
-               return _mmcamcorder_adjust_auto_focus(handle);
-       } else {
+       switch (focus_mode) {
+       case MM_CAMCORDER_FOCUS_MODE_MANUAL:
+               ret = _mmcamcorder_adjust_manual_focus(handle, direction);
+               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);
+               break;
+       default:
                _mmcam_dbg_err("It doesn't adjust focus. Focusing mode(%d)", focus_mode);
-               return MM_ERROR_CAMCORDER_NOT_SUPPORTED;
+               ret = MM_ERROR_CAMCORDER_NOT_SUPPORTED;
        }
+
+       _MMCAMCORDER_UNLOCK_CMD(handle);
+
+       return ret;
 }
 
 int _mmcamcorder_adjust_manual_focus(MMHandleType handle, int direction)
@@ -1914,8 +2266,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);
@@ -1924,12 +2276,16 @@ int _mmcamcorder_adjust_manual_focus(MMHandleType handle, int direction)
                _mmcam_dbg_log("Can't cast Video source into camera control.");
                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);
 
@@ -1938,18 +2294,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.");
@@ -1969,7 +2323,7 @@ int _mmcamcorder_adjust_auto_focus(MMHandleType handle)
 
        mmf_return_val_if_fail(handle, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
-       _mmcam_dbg_log("");
+       /*_mmcam_dbg_log("");*/
 
        sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
 
@@ -1977,10 +2331,16 @@ int _mmcamcorder_adjust_auto_focus(MMHandleType handle)
                _mmcam_dbg_log("Can't cast Video source into camera control.");
                return MM_ERROR_NONE;
        }
-       control = GST_CAMERA_CONTROL (sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst);
 
-       /* Start AF */
-       ret = gst_camera_control_start_auto_focus(control);
+       control = GST_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst);
+       if (control) {
+               /* Start AF */
+               ret = gst_camera_control_start_auto_focus(control);
+       } else {
+               _mmcam_dbg_err("cast CAMERA_CONTROL failed");
+               ret = FALSE;
+       }
+
        if (ret) {
                _mmcam_dbg_log("Auto focusing start success.");
                return MM_ERROR_NONE;
@@ -2000,7 +2360,7 @@ int _mmcamcorder_stop_focusing(MMHandleType handle)
 
        mmf_return_val_if_fail(handle, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
-       _mmcam_dbg_log("");
+       /*_mmcam_dbg_log("");*/
 
        sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
 
@@ -2010,9 +2370,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;
        }
@@ -2022,9 +2381,14 @@ int _mmcamcorder_stop_focusing(MMHandleType handle)
                _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
                return MM_ERROR_NONE;
        }
-       control = GST_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst);
 
-       ret = gst_camera_control_stop_auto_focus(control);
+       control = GST_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst);
+       if (control) {
+               ret = gst_camera_control_stop_auto_focus(control);
+       } else {
+               _mmcam_dbg_err("cast CAMERA_CONTROL failed");
+               ret = FALSE;
+       }
 
        _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
 
@@ -2061,9 +2425,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);
 
@@ -2073,40 +2436,32 @@ __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 */
-       __ta__("        gst_init_check",
-       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 */
        for (i = 0; i < *argc; i++) {
                if (argv[i]) {
-                       free(argv[i]);
+                       g_free(argv[i]);
                        argv[i] = NULL;
                }
        }
@@ -2150,7 +2505,7 @@ int _mmcamcorder_get_state(MMHandleType handle)
        _MMCAMCORDER_LOCK_STATE(handle);
 
        state = hcamcorder->state;
-       _mmcam_dbg_log("state=%d",state);
+       /*_mmcam_dbg_log("state=%d",state);*/
 
        _MMCAMCORDER_UNLOCK_STATE(handle);
 
@@ -2158,6 +2513,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;
@@ -2166,22 +2538,30 @@ void _mmcamcorder_set_state(MMHandleType handle, int state)
 
        mmf_return_if_fail(hcamcorder);
 
-       _mmcam_dbg_log("");
+       /*_mmcam_dbg_log("");*/
 
        _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:
+               case _MMCAMCORDER_STATE_CHANGE_BY_FOCUS:
                        msg.id = MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_ASM;
-                       msg.param.state.code = hcamcorder->asm_event_code;
+                       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:
@@ -2193,8 +2573,8 @@ void _mmcamcorder_set_state(MMHandleType handle, int state)
                msg.param.state.previous = old_state;
                msg.param.state.current = state;
 
-               _mmcam_dbg_log("_mmcamcroder_send_message : msg : %p, id:%x", &msg, msg.id);
-               _mmcamcroder_send_message(handle, &msg);
+               /*_mmcam_dbg_log("_mmcamcorder_send_message : msg : %p, id:%x", &msg, msg.id);*/
+               _mmcamcorder_send_message(handle, &msg);
        }
 
        _MMCAMCORDER_UNLOCK_STATE(handle);
@@ -2203,118 +2583,12 @@ 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;
-}
-
-int _mmcamcorder_set_async_state(MMHandleType handle, int target_state)
-{
-       int error = MM_ERROR_NONE;
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-
-       mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_INVALID_CONDITION);
-               
-       _mmcam_dbg_log("");
-
-       if (hcamcorder->sync_state_change) {
-               return error;
-       }
-
-       _MMCAMCORDER_LOCK_STATE(handle);
-
-       /* check changing state */
-       if (hcamcorder->state != hcamcorder->target_state) {
-               _mmcam_dbg_warn("State is changing now.");
-               error = MM_ERROR_CAMCORDER_CMD_IS_RUNNING;
-               goto _SET_ASYNC_END;
-       }
-
-       /* check already set */
-       if (hcamcorder->state == target_state) {
-               _mmcam_dbg_log("Target state already set.");
-               error = MM_ERROR_CAMCORDER_INVALID_STATE;
-               goto _SET_ASYNC_END;
-       }
-
-       hcamcorder->target_state = target_state;
-
-       _mmcam_dbg_log("Done");
-
-_SET_ASYNC_END:
-       _MMCAMCORDER_UNLOCK_STATE(handle);
-       return error;
-}
-
-
-gboolean _mmcamcorder_set_async_cancel(MMHandleType handle)
-{
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-       
-       mmf_return_val_if_fail(hcamcorder, FALSE);
-       
-       _mmcam_dbg_log("");
-
-       if (hcamcorder->sync_state_change) {
-               return TRUE;
-       }
-
-       _MMCAMCORDER_LOCK_STATE(handle);
-
-       if (hcamcorder->target_state != hcamcorder->state) {
-               hcamcorder->target_state = hcamcorder->state;
-               _mmcam_dbg_log("Async state change is canceled.");
-               _MMCAMCORDER_UNLOCK_STATE(handle);
-               return TRUE;
-       } else {
-               _mmcam_dbg_log("Nothing to be cancel or Already processed.");
-       }
-
-       _MMCAMCORDER_UNLOCK_STATE(handle);
-
-       return FALSE;
-}
-
-
-gboolean _mmcamcorder_is_state_changing(MMHandleType handle)
-{
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-
-       mmf_return_val_if_fail(hcamcorder, FALSE);
-       
-       _mmcam_dbg_log("(%d)", (hcamcorder->target_state != hcamcorder->state));
-
-       if (hcamcorder->sync_state_change) {
-               return FALSE;
-       }
-
-       _MMCAMCORDER_LOCK_STATE(handle);
-
-       if (hcamcorder->target_state != hcamcorder->state) {
-               _MMCAMCORDER_UNLOCK_STATE(handle);
-               return TRUE;
-       }
-
-       _MMCAMCORDER_UNLOCK_STATE(handle);
-
-       return FALSE;
-}
-
-
 _MMCamcorderSubContext *_mmcamcorder_alloc_subcontext(int type)
 {
        int i;
        _MMCamcorderSubContext *sc = NULL;
 
-       _mmcam_dbg_log("");
+       /*_mmcam_dbg_log("");*/
 
        /* alloc container */
        sc = (_MMCamcorderSubContext *)malloc(sizeof(_MMCamcorderSubContext));
@@ -2323,62 +2597,61 @@ _MMCamcorderSubContext *_mmcamcorder_alloc_subcontext(int type)
        /* init members */
        memset(sc, 0x00, sizeof(_MMCamcorderSubContext));
 
-       sc->element_num = _MMCamcorder_PIPELINE_ELEMENT_NUM;
+       sc->element_num = _MMCAMCORDER_PIPELINE_ELEMENT_NUM;
+       sc->encode_element_num = _MMCAMCORDER_ENCODE_PIPELINE_ELEMENT_NUM;
 
        /* alloc info for each mode */
        switch (type) {
        case MM_CAMCORDER_MODE_AUDIO:
-               sc->info_audio = malloc( sizeof(_MMCamcorderAudioInfo));
-               if(sc->info_audio == NULL) {
+               sc->info_audio = g_malloc0(sizeof(_MMCamcorderAudioInfo));
+               if (!sc->info_audio) {
                        _mmcam_dbg_err("Failed to alloc info structure");
-                       free(sc);
-                       return NULL;
+                       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 == NULL) {
+               sc->info_image = g_malloc0(sizeof(_MMCamcorderImageInfo));
+               if (!sc->info_image) {
                        _mmcam_dbg_err("Failed to alloc info structure");
-                       free(sc);
-                       return NULL;
+                       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 == NULL) {
+               sc->info_video = g_malloc0(sizeof(_MMCamcorderVideoInfo));
+               if (!sc->info_video) {
                        _mmcam_dbg_err("Failed to alloc info structure");
-                       free(sc->info_image);
-                       free(sc);
-                       return NULL;
+                       goto ALLOC_SUBCONTEXT_FAILED;
                }
-               memset(sc->info_video, 0x00, sizeof(_MMCamcorderVideoInfo));
+               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");
-               if (type == MM_CAMCORDER_MODE_AUDIO) {
-                       free(sc->info_audio);
-               } else {
-                       free(sc->info_image);
-                       free(sc->info_video);
-               }
-               free(sc);
-               return NULL;
+               goto ALLOC_SUBCONTEXT_FAILED;
+       }
+
+       sc->encode_element = (_MMCamcorderGstElement *)malloc(sizeof(_MMCamcorderGstElement) * sc->encode_element_num);
+       if (!sc->encode_element) {
+               _mmcam_dbg_err("Failed to alloc encode element structure");
+               goto ALLOC_SUBCONTEXT_FAILED;
        }
 
-       for (i = 0; i< sc->element_num; i++) {
+       for (i = 0 ; i < sc->element_num ; i++) {
                sc->element[i].id = _MMCAMCORDER_NONE;
                sc->element[i].gst = NULL;
        }
 
+       for (i = 0 ; i < sc->encode_element_num ; i++) {
+               sc->encode_element[i].id = _MMCAMCORDER_NONE;
+               sc->encode_element[i].gst = NULL;
+       }
+
        sc->fourcc = 0x80000000;
        sc->cam_stability_count = 0;
        sc->drop_vframe = 0;
@@ -2386,6 +2659,28 @@ _MMCamcorderSubContext *_mmcamcorder_alloc_subcontext(int type)
        sc->is_modified_rate = FALSE;
 
        return sc;
+
+ALLOC_SUBCONTEXT_FAILED:
+       if (sc) {
+               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;
+               }
+               if (sc->encode_element) {
+                       free(sc->encode_element);
+                       sc->encode_element = NULL;
+               }
+               free(sc);
+               sc = NULL;
+       }
+
+       return NULL;
 }
 
 
@@ -2395,10 +2690,17 @@ void _mmcamcorder_dealloc_subcontext(_MMCamcorderSubContext *sc)
 
        if (sc) {
                if (sc->element) {
+                       _mmcam_dbg_log("release element");
                        free(sc->element);
                        sc->element = NULL;
                }
 
+               if (sc->encode_element) {
+                       _mmcam_dbg_log("release encode_element");
+                       free(sc->encode_element);
+                       sc->encode_element = NULL;
+               }
+
                if (sc->info_image) {
                        _mmcam_dbg_log("release info_image");
                        free(sc->info_image);
@@ -2407,12 +2709,15 @@ void _mmcamcorder_dealloc_subcontext(_MMCamcorderSubContext *sc)
 
                if (sc->info_video) {
                        _mmcam_dbg_log("release info_video");
+                       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");
+                       SAFE_G_FREE(sc->info_audio->filename);
                        free(sc->info_audio);
                        sc->info_audio = NULL;
                }
@@ -2429,7 +2734,7 @@ int _mmcamcorder_set_functions(MMHandleType handle, int type)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
-       _mmcam_dbg_log("");
+       /*_mmcam_dbg_log("");*/
 
        switch (type) {
        case MM_CAMCORDER_MODE_AUDIO:
@@ -2448,12 +2753,11 @@ int _mmcamcorder_set_functions(MMHandleType handle, int type)
 gboolean _mmcamcorder_pipeline_cb_message(GstBus *bus, GstMessage *message, gpointer data)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(data);
-       _MMCamcorderMsgItem msg;
        _MMCamcorderSubContext *sc = NULL;
 
        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:
@@ -2461,55 +2765,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:
@@ -2523,7 +2816,7 @@ gboolean _mmcamcorder_pipeline_cb_message(GstBus *bus, GstMessage *message, gpoi
                break;
        case GST_MESSAGE_STATE_CHANGED:
        {
-               GValue *vnewstate;
+               const GValue *vnewstate;
                GstState newstate;
                GstElement *pipeline = NULL;
 
@@ -2532,9 +2825,13 @@ gboolean _mmcamcorder_pipeline_cb_message(GstBus *bus, GstMessage *message, gpoi
                        if (sc->element[_MMCAMCORDER_MAIN_PIPE].gst) {
                                pipeline = sc->element[_MMCAMCORDER_MAIN_PIPE].gst;
                                if (message->src == (GstObject*)pipeline) {
-                                       vnewstate = (GValue*)gst_structure_get_value(message->structure, "new-state");
-                                       newstate = (GstState)vnewstate->data[0].v_int;
-                                       _mmcam_dbg_log("GST_MESSAGE_STATE_CHANGED[%s]",gst_element_state_get_name(newstate));
+                                       vnewstate = gst_structure_get_value(gst_message_get_structure(message), "new-state");
+                                       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");
+                                       }
                                }
                        }
                }
@@ -2554,74 +2851,203 @@ gboolean _mmcamcorder_pipeline_cb_message(GstBus *bus, GstMessage *message, gpoi
                break;
        case GST_MESSAGE_NEW_CLOCK:
        {
-               GstClock *clock;
-               gst_message_parse_new_clock(message, &clock);
-               _mmcam_dbg_log("GST_MESSAGE_NEW_CLOCK : %s", (clock ? GST_OBJECT_NAME (clock) : "NULL"));
+               GstClock *pipe_clock = NULL;
+               gst_message_parse_new_clock(message, &pipe_clock);
+               /*_mmcam_dbg_log("GST_MESSAGE_NEW_CLOCK : %s", (clock ? GST_OBJECT_NAME (clock) : "NULL"));*/
                break;
        }
        case GST_MESSAGE_STRUCTURE_CHANGE:
                _mmcam_dbg_log("GST_MESSAGE_STRUCTURE_CHANGE");
                break;
        case GST_MESSAGE_STREAM_STATUS:
-               _mmcam_dbg_log("GST_MESSAGE_STREAM_STATUS");
+               /*_mmcam_dbg_log("GST_MESSAGE_STREAM_STATUS");*/
                break;
        case GST_MESSAGE_APPLICATION:
                _mmcam_dbg_log("GST_MESSAGE_APPLICATION");
                break;
        case GST_MESSAGE_ELEMENT:
-               _mmcam_dbg_log("GST_MESSAGE_ELEMENT");
+               /*_mmcam_dbg_log("GST_MESSAGE_ELEMENT");*/
+               break;
+       case GST_MESSAGE_SEGMENT_START:
+               _mmcam_dbg_log("GST_MESSAGE_SEGMENT_START");
+               break;
+       case GST_MESSAGE_SEGMENT_DONE:
+               _mmcam_dbg_log("GST_MESSAGE_SEGMENT_DONE");
+               break;
+       case GST_MESSAGE_DURATION_CHANGED:
+               _mmcam_dbg_log("GST_MESSAGE_DURATION_CHANGED");
+               break;
+       case GST_MESSAGE_LATENCY:
+               _mmcam_dbg_log("GST_MESSAGE_LATENCY");
+               break;
+       case GST_MESSAGE_ASYNC_START:
+               _mmcam_dbg_log("GST_MESSAGE_ASYNC_START");
+               break;
+       case GST_MESSAGE_ASYNC_DONE:
+               /*_mmcam_dbg_log("GST_MESSAGE_ASYNC_DONE");*/
+               break;
+       case GST_MESSAGE_ANY:
+               _mmcam_dbg_log("GST_MESSAGE_ANY");
+               break;
+       case GST_MESSAGE_QOS:
+               /* _mmcam_dbg_log("GST_MESSAGE_QOS"); */
+               break;
+       default:
+               _mmcam_dbg_log("not handled message type=(%d)", GST_MESSAGE_TYPE(message));
+               break;
+       }
+
+       return TRUE;
+}
+
+
+GstBusSyncReply _mmcamcorder_pipeline_bus_sync_callback(GstBus *bus, GstMessage *message, gpointer data)
+{
+       GstElement *element = NULL;
+       GError *err = NULL;
+       gchar *debug_info = NULL;
+
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(data);
+       _MMCamcorderSubContext *sc = NULL;
+
+       mmf_return_val_if_fail(hcamcorder, GST_BUS_PASS);
+       mmf_return_val_if_fail(message, GST_BUS_PASS);
+
+       sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
+       mmf_return_val_if_fail(sc, GST_BUS_PASS);
+
+       if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_ERROR) {
+               /* parse error message */
+               gst_message_parse_error(message, &err, &debug_info);
+
+               if (debug_info) {
+                       _mmcam_dbg_err("GST ERROR : %s", debug_info);
+                       g_free(debug_info);
+                       debug_info = NULL;
+               }
+
+               if (!err) {
+                       _mmcam_dbg_warn("failed to parse error message");
+                       return GST_BUS_PASS;
+               }
+
+               /* set videosrc element to compare */
+               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) {
+                       switch (err->code) {
+                       case GST_RESOURCE_ERROR_BUSY:
+                               _mmcam_dbg_err("Camera device [busy]");
+                               hcamcorder->error_code = MM_ERROR_CAMCORDER_DEVICE_BUSY;
+                               break;
+                       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 */
+                               break;
+                       case GST_RESOURCE_ERROR_OPEN_READ_WRITE:
+                               _mmcam_dbg_err("Camera device [open failed]");
+                               hcamcorder->error_code = MM_ERROR_CAMCORDER_DEVICE_OPEN;
+                               break;
+                       case GST_RESOURCE_ERROR_OPEN_READ:
+                               _mmcam_dbg_err("Camera device [register trouble]");
+                               hcamcorder->error_code = MM_ERROR_CAMCORDER_DEVICE_REG_TROUBLE;
+                               break;
+                       case GST_RESOURCE_ERROR_NOT_FOUND:
+                               _mmcam_dbg_err("Camera device [device not found]");
+                               hcamcorder->error_code = MM_ERROR_CAMCORDER_DEVICE_NOT_FOUND;
+                               break;
+                       case GST_RESOURCE_ERROR_TOO_LAZY:
+                               _mmcam_dbg_err("Camera device [timeout]");
+                               hcamcorder->error_code = MM_ERROR_CAMCORDER_DEVICE_TIMEOUT;
+                               break;
+                       case GST_RESOURCE_ERROR_SETTINGS:
+                               _mmcam_dbg_err("Camera device [not supported]");
+                               hcamcorder->error_code = MM_ERROR_CAMCORDER_NOT_SUPPORTED;
+                               break;
+                       case GST_RESOURCE_ERROR_FAILED:
+                               _mmcam_dbg_err("Camera device [working failed].");
+                               hcamcorder->error_code = MM_ERROR_CAMCORDER_DEVICE_IO;
+                               break;
+                       default:
+                               _mmcam_dbg_err("Camera device [General(%d)]", err->code);
+                               hcamcorder->error_code = MM_ERROR_CAMCORDER_DEVICE;
+                               break;
+                       }
+
+                       hcamcorder->error_occurs = TRUE;
+               }
+
+               g_error_free(err);
 
-               if (gst_structure_has_name(message->structure, "avsysvideosrc-AF") ||
-                   gst_structure_has_name(message->structure, "camerasrc-AF")) {
+               /* store error code and drop this message if cmd is running */
+               if (hcamcorder->error_code != MM_ERROR_NONE) {
+                       _MMCamcorderMsgItem msg;
+
+                       /* post error to application */
+                       hcamcorder->error_occurs = TRUE;
+                       msg.id = MM_MESSAGE_CAMCORDER_ERROR;
+                       msg.param.code = hcamcorder->error_code;
+                       _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg);
+
+                       goto DROP_MESSAGE;
+               }
+       } else if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_ELEMENT) {
+               _MMCamcorderMsgItem msg;
+
+               if (gst_structure_has_name(gst_message_get_structure(message), "avsysvideosrc-AF") ||
+                   gst_structure_has_name(gst_message_get_structure(message), "camerasrc-AF")) {
                        int focus_state = 0;
 
-                       gst_structure_get_int(message->structure, "focus-state", &focus_state);
+                       gst_structure_get_int(gst_message_get_structure(message), "focus-state", &focus_state);
                        _mmcam_dbg_log("Focus State:%d", focus_state);
 
                        msg.id = MM_MESSAGE_CAMCORDER_FOCUS_CHANGED;
                        msg.param.code = focus_state;
-                       _mmcamcroder_send_message((MMHandleType)hcamcorder, &msg);
-               } else if (gst_structure_has_name(message->structure, "camerasrc-HDR")) {
+                       _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg);
+
+                       goto DROP_MESSAGE;
+               } else if (gst_structure_has_name(gst_message_get_structure(message), "camerasrc-HDR")) {
                        int progress = 0;
                        int status = 0;
 
-                       gst_structure_get_int(message->structure, "progress", &progress);
-                       gst_structure_get_int(message->structure, "status", &status);
-                       _mmcam_dbg_log("HDR progress %d percent, status %d", progress, status);
+                       if (gst_structure_get_int(gst_message_get_structure(message), "progress", &progress)) {
+                               gst_structure_get_int(gst_message_get_structure(message), "status", &status);
+                               _mmcam_dbg_log("HDR progress %d percent, status %d", progress, status);
+
+                               msg.id = MM_MESSAGE_CAMCORDER_HDR_PROGRESS;
+                               msg.param.code = progress;
+                               _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg);
+                       }
 
-                       msg.id = MM_MESSAGE_CAMCORDER_HDR_PROGRESS;
-                       msg.param.code = progress;
-                       _mmcamcroder_send_message((MMHandleType)hcamcorder, &msg);
-               } else if (gst_structure_has_name(message->structure, "camerasrc-FD")) {
+                       goto DROP_MESSAGE;
+               } else if (gst_structure_has_name(gst_message_get_structure(message), "camerasrc-FD")) {
                        int i = 0;
-                       const GValue *g_value = gst_structure_get_value(message->structure, "face-info");;
+                       const GValue *g_value = gst_structure_get_value(gst_message_get_structure(message), "face-info");;
                        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");
-                               return TRUE;
+                               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;
-
-                               return TRUE;
+                               SAFE_FREE(fd_info);
+                               goto DROP_MESSAGE;
                        }
 
                        /* set total face count */
                        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++) {
@@ -2633,20 +3059,19 @@ gboolean _mmcamcorder_pipeline_cb_message(GstBus *bus, GstMessage *message, gpoi
                                                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;
@@ -2659,45 +3084,39 @@ gboolean _mmcamcorder_pipeline_cb_message(GstBus *bus, GstMessage *message, gpoi
                                msg.param.size = sizeof(MMCamFaceDetectInfo);
                                msg.param.code = 0;
 
-                               _mmcamcroder_send_message((MMHandleType)hcamcorder, &msg);
+                               _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg);
                        }
 
                        /* free fd_info allocated by plugin */
                        free(fd_info);
                        fd_info = NULL;
+
+                       goto DROP_MESSAGE;
+               } else if (gst_structure_has_name(gst_message_get_structure(message), "camerasrc-Capture")) {
+                       int capture_done = FALSE;
+
+                       if (gst_structure_get_int(gst_message_get_structure(message), "capture-done", &capture_done)) {
+                               if (sc->info_image) {
+                                       /* play capture sound */
+                                       _mmcamcorder_sound_solo_play((MMHandleType)hcamcorder, _MMCAMCORDER_SAMPLE_SOUND_NAME_CAPTURE01, FALSE);
+                               }
+                       }
+
+                       goto DROP_MESSAGE;
                }
-               break;
-       case GST_MESSAGE_SEGMENT_START:
-               _mmcam_dbg_log("GST_MESSAGE_SEGMENT_START");
-               break;
-       case GST_MESSAGE_SEGMENT_DONE:
-               _mmcam_dbg_log("GST_MESSAGE_SEGMENT_DONE");
-               break;
-       case GST_MESSAGE_DURATION:
-               _mmcam_dbg_log("GST_MESSAGE_DURATION");
-               break;
-       case GST_MESSAGE_LATENCY:
-               _mmcam_dbg_log("GST_MESSAGE_LATENCY");
-               break;
-       case GST_MESSAGE_ASYNC_START:
-               _mmcam_dbg_log("GST_MESSAGE_ASYNC_START");
-               break;
-       case GST_MESSAGE_ASYNC_DONE:
-               _mmcam_dbg_log("GST_MESSAGE_ASYNC_DONE");
-               break;
-       case GST_MESSAGE_ANY:
-               _mmcam_dbg_log("GST_MESSAGE_ANY");
-               break;
-       default:
-               _mmcam_dbg_log("not handled message type=(%d)", GST_MESSAGE_TYPE(message));
-               break;
        }
 
-       return TRUE;
+       return GST_BUS_PASS;
+
+DROP_MESSAGE:
+       gst_message_unref(message);
+       message = NULL;
+
+       return GST_BUS_DROP;
 }
 
 
-GstBusSyncReply _mmcamcorder_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;
@@ -2712,245 +3131,356 @@ GstBusSyncReply _mmcamcorder_pipeline_bus_sync_callback(GstBus *bus, GstMessage
        sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
        mmf_return_val_if_fail(sc, GST_BUS_PASS);
 
-       sc->error_code = MM_ERROR_NONE;
+       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;
 
-       if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_ERROR) {
                /* parse error message */
                gst_message_parse_error(message, &err, &debug_info);
 
-               if (!err) {
-                       _mmcam_dbg_warn("failed to parse error message");
-                       return GST_BUS_PASS;
-               }
-
                if (debug_info) {
                        _mmcam_dbg_err("GST ERROR : %s", debug_info);
                        g_free(debug_info);
                        debug_info = NULL;
                }
 
+               if (!err) {
+                       _mmcam_dbg_warn("failed to parse error message");
+                       return GST_BUS_PASS;
+               }
+
                /* set videosrc element to compare */
-               element = GST_ELEMENT_CAST(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst);
+               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) {
                        switch (err->code) {
-                       case GST_RESOURCE_ERROR_BUSY:
-                               _mmcam_dbg_err("Camera device [busy]");
-                               sc->error_code = MM_ERROR_CAMCORDER_DEVICE_BUSY;
-                               break;
                        case GST_RESOURCE_ERROR_OPEN_READ_WRITE:
                        case GST_RESOURCE_ERROR_OPEN_WRITE:
-                               _mmcam_dbg_err("Camera device [open failed]");
-                               sc->error_code = MM_ERROR_CAMCORDER_DEVICE_OPEN;
-                               break;
-                       case GST_RESOURCE_ERROR_OPEN_READ:
-                               _mmcam_dbg_err("Camera device [register trouble]");
-                               sc->error_code = MM_ERROR_CAMCORDER_DEVICE_REG_TROUBLE;
+                               _mmcam_dbg_err("audio device [open failed]");
+
+                               /* 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;
+
+                               _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg);
+
+                               _mmcam_dbg_err(" error : sc->error_occurs %d", hcamcorder->error_occurs);
+
+                               goto DROP_MESSAGE;
+                       default:
                                break;
-                       case GST_RESOURCE_ERROR_NOT_FOUND:
-                               _mmcam_dbg_err("Camera device [device not found]");
-                               sc->error_code = MM_ERROR_CAMCORDER_DEVICE_NOT_FOUND;
+                       }
+               } 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;
+                       }
+
+                       _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;
+                               }
+
+                               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_TOO_LAZY:
-                               _mmcam_dbg_err("Camera device [timeout]");
-                               sc->error_code = MM_ERROR_CAMCORDER_DEVICE_TIMEOUT;
+                       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_SETTINGS:
-                               _mmcam_dbg_err("Camera device [not supported]");
-                               sc->error_code = MM_ERROR_CAMCORDER_NOT_SUPPORTED;
+                       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_FAILED:
-                               _mmcam_dbg_err("Camera device [working failed].");
-                               sc->error_code = MM_ERROR_CAMCORDER_DEVICE_IO;
+                       case GST_RESOURCE_ERROR_SEEK:
+                               _mmcam_dbg_err("File read(seek)");
+                               hcamcorder->error_code = MM_ERROR_FILE_READ;
                                break;
                        default:
-                               _mmcam_dbg_err("Camera device [General(%d)]", err->code);
-                               sc->error_code = MM_ERROR_CAMCORDER_DEVICE;
+                               _mmcam_dbg_err("Resource error(%d)", err->code);
+                               hcamcorder->error_code = MM_ERROR_CAMCORDER_GST_RESOURCE;
                                break;
                        }
 
-                       sc->error_occurs = TRUE;
-               }
+                       if (b_commiting) {
+                               _MMCAMCORDER_SIGNAL(hcamcorder);
+                               _MMCAMCORDER_UNLOCK(hcamcorder);
+                       } else {
+                               _MMCAMCORDER_UNLOCK(hcamcorder);
 
-               g_error_free(err);
+                               msg.id = MM_MESSAGE_CAMCORDER_ERROR;
+                               msg.param.code = hcamcorder->error_code;
 
-               /* store error code and drop this message if cmd is running */
-               if (sc->error_code != MM_ERROR_NONE) {
-                       if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) {
-                               _mmcam_dbg_err("cmd is running and will be returned with this error %x",
-                                              sc->error_code);
-                               return GST_BUS_DROP;
+                               _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg);
                        }
 
-                       _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
+                       goto DROP_MESSAGE;
                }
        }
 
-       return GST_BUS_PASS;
-}
+       if (err) {
+               g_error_free(err);
+               err = NULL;
+       }
 
+       return GST_BUS_PASS;
 
-static int __mmcamcorder_asm_get_event_type(int sessionType)
-{
-       switch (sessionType) {
-       case MM_SESSION_TYPE_SHARE:
-               return ASM_EVENT_SHARE_MMCAMCORDER;
-       case MM_SESSION_TYPE_EXCLUSIVE:
-               return ASM_EVENT_EXCLUSIVE_MMCAMCORDER;
-       case MM_SESSION_TYPE_NOTIFY:
-               return ASM_EVENT_NOTIFY;
-       case MM_SESSION_TYPE_CALL:
-               return ASM_EVENT_CALL;
-       case MM_SESSION_TYPE_VIDEOCALL:
-               return ASM_EVENT_VIDEOCALL;
-       case MM_SESSION_TYPE_ALARM:
-               return ASM_EVENT_ALARM;
-       default:
-               return ASM_EVENT_SHARE_MMCAMCORDER;
+DROP_MESSAGE:
+       if (err) {
+               g_error_free(err);
+               err = NULL;
        }
+
+       gst_message_unref(message);
+       message = NULL;
+
+       return GST_BUS_DROP;
 }
 
-ASM_cb_result_t _mmcamcorder_asm_callback_sh(int handle, ASM_event_sources_t event_src,
-                                             ASM_sound_commands_t command,
-                                             unsigned int sound_status, void* cb_data)
+
+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,
+       int option, const char *additional_info, void *user_data)
 {
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(cb_data);
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(user_data);
        int current_state = MM_CAMCORDER_STATE_NONE;
-       ASM_cb_result_t cb_res = ASM_CB_RES_NONE;
 
-       mmf_return_val_if_fail((MMHandleType)hcamcorder, ASM_CB_RES_NONE);
+       mmf_return_if_fail((MMHandleType)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, %d)", hcamcorder, command, current_state);
+       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;
        }
 
-       /* set value to inform a status is changed by asm */
-       hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_BY_ASM;
-       /* set ASM event code for sending it to application */
-       hcamcorder->asm_event_code = event_src;
+       _mmcam_dbg_warn("sound focus callback : focus state %d, reason %s",
+                                  focus_state, reason_for_change ? reason_for_change : "N/A");
 
-       _mmcam_dbg_log("ASM SHARE callback : event code 0x%x, command 0x%x", event_src, command);
+       if (hcamcorder->session_flags & MM_SESSION_OPTION_UNINTERRUPTIBLE) {
+               _mmcam_dbg_warn("session flag is UNINTERRUPTIBLE. do nothing.");
+               return;
+       }
 
-       switch (command) {
-       case ASM_COMMAND_STOP:
-       case ASM_COMMAND_PAUSE:
-               _mmcam_dbg_log("Got msg from asm to Stop or Pause(%d, %d)", command, current_state);
+       _MMCAMCORDER_LOCK_ASM(hcamcorder);
 
-               __mmcamcorder_force_stop(hcamcorder);
-               cb_res = ASM_CB_RES_STOP;
+       /* 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;
+       }
 
-               _mmcam_dbg_log("Finish opeartion. Camera is released.(%d)", cb_res);
-               break;
-       case ASM_COMMAND_PLAY:
-               _mmcam_dbg_log("Got msg from asm to Play(%d, %d)", command, current_state);
+       if (focus_state == FOCUS_IS_RELEASED) {
+               hcamcorder->acquired_focus &= ~focus_type;
 
-               if (current_state >= MM_CAMCORDER_STATE_PREPARE) {
-                       _mmcam_dbg_log("Already start previewing");
-               } else {
-                       __mmcamcorder_force_resume(hcamcorder);
-               }
+               _mmcam_dbg_warn("FOCUS is released [type %d, remained focus %d] : Stop pipeline[state:%d]",
+                       focus_type, hcamcorder->acquired_focus, current_state);
 
-               cb_res = ASM_CB_RES_PLAYING;
+               __mmcamcorder_force_stop(hcamcorder, _MMCAMCORDER_STATE_CHANGE_BY_FOCUS);
 
-               _mmcam_dbg_log("Finish opeartion. Preview is started.(%d)", cb_res);
-               break;
-       case ASM_COMMAND_RESUME:
-       {
+               _mmcam_dbg_warn("Finish opeartion. Pipeline is released");
+       } else if (focus_state == FOCUS_IS_ACQUIRED) {
                _MMCamcorderMsgItem msg;
 
-               _mmcam_dbg_log("Got msg from asm to Resume(%d, %d)", command, current_state);
+               hcamcorder->acquired_focus |= focus_type;
+
+               _mmcam_dbg_warn("FOCUS is acquired [type %d, new focus %d]",
+                       focus_type, hcamcorder->acquired_focus);
 
                msg.id = MM_MESSAGE_READY_TO_RESUME;
-               _mmcamcroder_send_message((MMHandleType)hcamcorder, &msg);
-               cb_res = ASM_CB_RES_PLAYING;
+               _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg);
 
-               _mmcam_dbg_log("Finish opeartion.(%d)", cb_res);
-               break;
+               _mmcam_dbg_warn("Finish opeartion");
+       } else {
+               _mmcam_dbg_warn("unknown focus state %d", focus_state);
        }
-       default: /* should not be reached here */
-               cb_res = ASM_CB_RES_PLAYING;
-               _mmcam_dbg_err("Command err.");
-               break;
+
+       _MMCAMCORDER_UNLOCK_ASM(hcamcorder);
+
+       _mmcam_dbg_warn("done");
+
+       return;
+}
+
+
+void _mmcamcorder_sound_signal_callback(mm_sound_signal_name_t signal, int value, void *user_data)
+{
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(user_data);
+
+       mmf_return_if_fail(hcamcorder);
+
+       _mmcam_dbg_warn("sound signal %d - value %d", signal, value);
+
+       _MMCAMCORDER_LOCK_ASM(hcamcorder);
+
+       if (signal == MM_SOUND_SIGNAL_RELEASE_INTERNAL_FOCUS && value == 1) {
+               _mmcam_dbg_warn("focus id %d, focus watch id %d",
+                       hcamcorder->sound_focus_id, hcamcorder->sound_focus_watch_id);
+
+               /* unregister focus related callback */
+               if (hcamcorder->sound_focus_id > 0) {
+                       if (hcamcorder->acquired_focus > 0) {
+                               mm_sound_release_focus(hcamcorder->sound_focus_id, hcamcorder->acquired_focus, NULL);
+                               _mmcam_dbg_warn("release acquired focus [focus %d] done", hcamcorder->acquired_focus);
+                               hcamcorder->acquired_focus = 0;
+                       }
+
+                       mm_sound_unregister_focus(hcamcorder->sound_focus_id);
+                       _mmcam_dbg_warn("unregister sound focus done");
+                       hcamcorder->sound_focus_id = 0;
+               }
+
+               if (hcamcorder->sound_focus_watch_id > 0) {
+                       mm_sound_unset_focus_watch_callback(hcamcorder->sound_focus_watch_id);
+                       _mmcam_dbg_warn("unset watch cb done");
+                       hcamcorder->sound_focus_watch_id = 0;
+               }
        }
 
-       /* restore value */
-       hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_NORMAL;
+       /* reset flag not to run sound focus related code since now */
+       hcamcorder->sound_focus_register = FALSE;
 
-       return cb_res;
+       _MMCAMCORDER_UNLOCK_ASM(hcamcorder);
+
+       _mmcam_dbg_warn("done");
+
+       return;
 }
 
 
-ASM_cb_result_t _mmcamcorder_asm_callback_ex(int handle, ASM_event_sources_t event_src,
-                                             ASM_sound_commands_t command,
-                                             unsigned int sound_status, void* cb_data)
+void _mmcamcorder_sound_focus_watch_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(cb_data);
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(user_data);
        int current_state = MM_CAMCORDER_STATE_NONE;
-       ASM_cb_result_t cb_res = ASM_CB_RES_NONE;
 
-       mmf_return_val_if_fail((MMHandleType)hcamcorder, ASM_CB_RES_NONE);
+       mmf_return_if_fail(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;
+       }
+
+       _mmcam_dbg_warn("sound focus watch callback : id %d, focus state %d, reason %s",
+               id, 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);
 
-       _mmcam_dbg_log("ASM EXCLUSIVE callback : event code 0x%x, command 0x%x, current state %d",
-                      event_src, command, current_state);
+       /* 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;
+       }
 
-       /* set value to inform a status is changed by asm */
-       hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_BY_ASM;
+       if (focus_state == FOCUS_IS_RELEASED) {
+               _MMCamcorderMsgItem msg;
 
-       /* set ASM event code for sending it to application */
-       hcamcorder->asm_event_code = event_src;
+               _mmcam_dbg_warn("other process's FOCUS is released");
+
+               msg.id = MM_MESSAGE_READY_TO_RESUME;
+               _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg);
 
-       switch (command) {
-       case ASM_COMMAND_STOP:
-       case ASM_COMMAND_PAUSE:
-               _mmcam_dbg_log("Got msg from asm to Stop or Pause(%d, %d)", command, current_state);
+               _mmcam_dbg_warn("Finish opeartion");
+       } else if (focus_state == FOCUS_IS_ACQUIRED) {
+               _mmcam_dbg_warn("other process's FOCUS is acquired : Stop pipeline[state:%d]", current_state);
+
+               __mmcamcorder_force_stop(hcamcorder, _MMCAMCORDER_STATE_CHANGE_BY_FOCUS);
+
+               _mmcam_dbg_warn("Finish opeartion. Pipeline is released");
+       } else {
+               _mmcam_dbg_warn("unknown focus state %d", focus_state);
+       }
 
-               __mmcamcorder_force_stop(hcamcorder);
-               cb_res = ASM_CB_RES_STOP;
+       _MMCAMCORDER_UNLOCK_ASM(hcamcorder);
+
+       _mmcam_dbg_warn("done");
+
+       return;
+}
+
+
+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;
 
-               _mmcam_dbg_log("Finish opeartion. Camera is released.(%d)", cb_res);
-               break;
-       case ASM_COMMAND_PLAY:
-               _mmcam_dbg_log("Got msg from asm to Play(%d, %d)", command, current_state);
+       mmf_return_if_fail(hcamcorder);
+       mmf_return_if_fail(value);
 
-               if (current_state >= MM_CAMCORDER_STATE_PREPARE) {
-                       _mmcam_dbg_log("Already start previewing");
-               } else {
-                       __mmcamcorder_force_resume(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;
+       }
 
-               cb_res = ASM_CB_RES_PLAYING;
+       _mmcam_dbg_warn("camera policy [%s], current state [%d]", value, current_state);
 
-               _mmcam_dbg_log("Finish opeartion. Preview is started.(%d)", cb_res);
-               break;
-       case ASM_COMMAND_RESUME:
-       {
-               _MMCamcorderMsgItem msg;
+       if (!strcmp(value, "disallowed")) {
+               _MMCAMCORDER_LOCK_ASM(hcamcorder);
 
-               _mmcam_dbg_log("Got msg from asm to Resume(%d, %d)", command, current_state);
+               __mmcamcorder_force_stop(hcamcorder, _MMCAMCORDER_STATE_CHANGE_BY_DPM);
 
-               msg.id = MM_MESSAGE_READY_TO_RESUME;
-               _mmcamcroder_send_message((MMHandleType)hcamcorder, &msg);
-               cb_res = ASM_CB_RES_PLAYING;
+               _MMCAMCORDER_UNLOCK_ASM(hcamcorder);
 
-               _mmcam_dbg_log("Finish opeartion.(%d)", cb_res);
-               break;
-       }
-       default: /* should not be reached here */
-               cb_res = ASM_CB_RES_PLAYING;
-               _mmcam_dbg_err("Command err.");
-               break;
+               _mmcamcorder_request_dpm_popup(hcamcorder->gdbus_conn, "camera");
        }
 
-       /* restore value */
-       hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_NORMAL;
+       _mmcam_dbg_warn("done");
 
-       return cb_res;
+       return;
 }
 
 
@@ -2970,51 +3500,45 @@ int _mmcamcorder_create_pipeline(MMHandleType handle, int type)
 
        switch (type) {
        case MM_CAMCORDER_MODE_AUDIO:
-               __ta__("        _mmcamcorder_create_audio_pipeline",
                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:
-               __ta__("        _mmcamcorder_create_preview_pipeline",
                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) {
-                       __ta__("        _mmcamcorder_connect_capture_signal",
                        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) {
-               if (hcamcorder->sync_state_change) {
-                       ret = _mmcamcorder_gst_set_state(handle, pipeline, GST_STATE_READY);
-               } else {
-                       ret = _mmcamcorder_gst_set_state_async(handle, pipeline, GST_STATE_READY);
-                       if (ret == GST_STATE_CHANGE_FAILURE) {
-                               return MM_ERROR_CAMCORDER_GST_STATECHANGE;
-                       }
-               }
+               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);
+       if (ret != MM_ERROR_NONE) {
+               _mmcam_dbg_err("error : destroy pipeline");
+               _mmcamcorder_destroy_pipeline(handle, hcamcorder->type);
+       }
+
        return ret;
 }
 
@@ -3022,8 +3546,10 @@ int _mmcamcorder_create_pipeline(MMHandleType handle, int type)
 void _mmcamcorder_destroy_pipeline(MMHandleType handle, int type)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-       _MMCamcorderSubContext *sc = NULL;      
+       _MMCamcorderSubContext *sc = NULL;
        gint i = 0;
+       int element_num = 0;
+       _MMCamcorderGstElement *element = NULL;
        GstBus *bus = NULL;
 
        mmf_return_if_fail(hcamcorder);
@@ -3033,14 +3559,18 @@ void _mmcamcorder_destroy_pipeline(MMHandleType handle, int type)
 
        _mmcam_dbg_log("");
 
-       bus = gst_pipeline_get_bus(GST_PIPELINE(sc->element[_MMCAMCORDER_MAIN_PIPE].gst));
-
        /* Inside each pipeline destroy function, Set GST_STATE_NULL to Main pipeline */
        switch (type) {
        case MM_CAMCORDER_MODE_VIDEO_CAPTURE:
+               element = sc->element;
+               element_num = sc->element_num;
+               bus = gst_pipeline_get_bus(GST_PIPELINE(sc->element[_MMCAMCORDER_MAIN_PIPE].gst));
                _mmcamcorder_destroy_video_capture_pipeline(handle);
                break;
        case MM_CAMCORDER_MODE_AUDIO:
+               element = sc->encode_element;
+               element_num = sc->encode_element_num;
+               bus = gst_pipeline_get_bus(GST_PIPELINE(sc->encode_element[_MMCAMCORDER_ENCODE_MAIN_PIPE].gst));
                _mmcamcorder_destroy_audio_pipeline(handle);
                break;
        default:
@@ -3051,50 +3581,43 @@ void _mmcamcorder_destroy_pipeline(MMHandleType handle, int type)
        _mmcam_dbg_log("Pipeline clear!!");
 
        /* Remove pipeline message callback */
-       g_source_remove(hcamcorder->pipeline_cb_event_id);
+       if (hcamcorder->pipeline_cb_event_id > 0) {
+               g_source_remove(hcamcorder->pipeline_cb_event_id);
+               hcamcorder->pipeline_cb_event_id = 0;
+       }
 
        /* Remove remained message in bus */
-       if (bus != NULL) {
+       if (bus) {
                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 < _MMCamcorder_PIPELINE_ELEMENT_NUM ; i++ ) {
-               if (sc->element[i].gst) {
-                       if (GST_IS_ELEMENT(sc->element[i].gst)) {
+       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]",
-                                               sc->element[i].id,
-                                               GST_OBJECT_NAME(sc->element[i].gst),
-                                               GST_OBJECT_REFCOUNT_VALUE(sc->element[i].gst),
-                                               gst_element_state_get_name (GST_STATE (sc->element[i].gst)));
-                               g_object_weak_unref(G_OBJECT(sc->element[i].gst), (GWeakNotify)_mmcamcorder_element_release_noti, sc);
+                                       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", sc->element[i].id);
+                               _mmcam_dbg_warn("The element[%d] is still aliving, check it", element[i].id);
                        }
 
-                       sc->element[i].id = _MMCAMCORDER_NONE;
-                       sc->element[i].gst = NULL;
+                       element[i].id = _MMCAMCORDER_NONE;
+                       element[i].gst = NULL;
                }
        }
-}
-
 
-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;
+       return;
 }
 
 
@@ -3120,33 +3643,45 @@ static gboolean __mmcamcorder_set_attr_to_camsensor_cb(gpointer data)
 #endif /* _MMCAMCORDER_USE_SET_ATTR_CB */
 
 
-int _mmcamcorder_gst_set_state (MMHandleType handle, GstElement *pipeline, GstState target_state)
+int _mmcamcorder_gst_set_state(MMHandleType handle, GstElement *pipeline, GstState target_state)
 {
        unsigned int k = 0;
+       _MMCamcorderSubContext *sc = NULL;
        GstState pipeline_state = GST_STATE_VOID_PENDING;
        GstStateChangeReturn setChangeReturn = GST_STATE_CHANGE_FAILURE;
        GstStateChangeReturn getChangeReturn = GST_STATE_CHANGE_FAILURE;
        GstClockTime get_timeout = __MMCAMCORDER_SET_GST_STATE_TIMEOUT * GST_SECOND;
+       GMutex *state_lock = NULL;
 
        mmf_return_val_if_fail(handle, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
+       sc = MMF_CAMCORDER_SUBCONTEXT(handle);
+       mmf_return_val_if_fail(sc && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
-       _mmcam_dbg_log("Set state to %d", target_state);
+       if (sc->element[_MMCAMCORDER_MAIN_PIPE].gst == pipeline) {
+               _mmcam_dbg_log("Set state to %d - PREVIEW PIPELINE", target_state);
+               state_lock = &_MMCAMCORDER_GET_GST_STATE_LOCK(handle);
+       } else {
+               _mmcam_dbg_log("Set state to %d - ENDODE PIPELINE", target_state);
+               state_lock = &_MMCAMCORDER_GET_GST_ENCODE_STATE_LOCK(handle);
+       }
 
-       _MMCAMCORDER_LOCK_GST_STATE(handle);
+       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) {
-                                       _MMCAMCORDER_UNLOCK_GST_STATE(handle);
+                                       _mmcam_dbg_log("Set state to %d - DONE", target_state);
+                                       g_mutex_unlock(state_lock);
                                        return MM_ERROR_NONE;
                                }
                                break;
@@ -3154,23 +3689,26 @@ int _mmcamcorder_gst_set_state (MMHandleType handle, GstElement *pipeline, GstSt
                                _mmcam_dbg_log("status=GST_STATE_CHANGE_ASYNC.");
                                break;
                        default:
-                               _MMCAMCORDER_UNLOCK_GST_STATE(handle);
+                               g_mutex_unlock(state_lock);
                                _mmcam_dbg_log("status=GST_STATE_CHANGE_FAILURE.");
                                return MM_ERROR_CAMCORDER_GST_STATECHANGE;
                        }
 
-                       _MMCAMCORDER_UNLOCK_GST_STATE(handle);
+                       g_mutex_unlock(state_lock);
+
                        _mmcam_dbg_err("timeout of gst_element_get_state()!!");
+
                        return MM_ERROR_CAMCORDER_RESPONSE_TIMEOUT;
                }
+
                usleep(_MMCAMCORDER_STATE_CHECK_INTERVAL);
        }
 
-       _MMCAMCORDER_UNLOCK_GST_STATE(handle);
+       g_mutex_unlock(state_lock);
 
        _mmcam_dbg_err("Failure. gst_element_set_state timeout!!");
 
-       return MM_ERROR_CAMCORDER_RESPONSE_TIMEOUT;     
+       return MM_ERROR_CAMCORDER_RESPONSE_TIMEOUT;
 }
 
 
@@ -3184,7 +3722,7 @@ int _mmcamcorder_video_current_framerate(MMHandleType handle)
 
        sc = MMF_CAMCORDER_SUBCONTEXT(handle);
        mmf_return_val_if_fail(sc, -1);
-       
+
        return sc->kpi.current_fps;
 }
 
@@ -3218,27 +3756,40 @@ void _mmcamcorder_video_current_framerate_init(MMHandleType handle)
        return;
 }
 
-/* Async state change */
-void _mmcamcorder_delete_command_info(__MMCamcorderCmdInfo *cmdinfo)
-{
-       if (cmdinfo) {
-               g_free(cmdinfo);
-       }
-}
 
-static 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;
        int itr_cnt = 0;
        int result = MM_ERROR_NONE;
+       int cmd_try_count = 0;
        int current_state = MM_CAMCORDER_STATE_NONE;
 
        mmf_return_if_fail(hcamcorder);
 
+       /* check command running */
+       do {
+               if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) {
+                       if (cmd_try_count++ < __MMCAMCORDER_FORCE_STOP_TRY_COUNT) {
+                               _mmcam_dbg_warn("Another command is running. try again after %d ms", __MMCAMCORDER_FORCE_STOP_WAIT_TIME/1000);
+                               usleep(__MMCAMCORDER_FORCE_STOP_WAIT_TIME);
+                       } else {
+                               _mmcam_dbg_err("wait timeout");
+                               break;
+                       }
+               } else {
+                       _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
+                       break;
+               }
+       } while (TRUE);
+
        current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder);
 
-       _mmcam_dbg_log( "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;
 
        for (loop = 0 ; current_state > MM_CAMCORDER_STATE_NULL && loop < __MMCAMCORDER_CMD_ITERATE_MAX * 3 ; loop++) {
                itr_cnt = __MMCAMCORDER_CMD_ITERATE_MAX;
@@ -3251,316 +3802,81 @@ static void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder)
                        mmf_return_if_fail(sc);
                        mmf_return_if_fail((info = sc->info_image));
 
-                       _mmcam_dbg_log("Stop capturing.");
+                       _mmcam_dbg_warn("Stop capturing.");
 
                        /* 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;
                }
                case MM_CAMCORDER_STATE_RECORDING:
                case MM_CAMCORDER_STATE_PAUSED:
                {
-                       _mmcam_dbg_log("Stop recording.");
+                       _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_log("Stop preview.");
+                       _mmcam_dbg_warn("Stop preview.");
 
                        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_log("unrealize");
+                       _mmcam_dbg_warn("unrealize");
 
                        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_log("Already stopped.");
+                       _mmcam_dbg_warn("Already stopped.");
                        break;
                }
 
                current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder);
        }
 
-       _mmcam_dbg_log( "Done." );
-
-       return;
-}
-
-
-static void __mmcamcorder_force_resume(mmf_camcorder_t *hcamcorder)
-{
-       int loop = 0;
-       int result = MM_ERROR_NONE;
-       int itr_cnt = 0;
-       int current_state = MM_CAMCORDER_STATE_NONE;
-
-       mmf_return_if_fail(hcamcorder);
-
-       _mmcam_dbg_log("Force RESUME MMFW Camcorder");
-
-       current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder);
-
-       for (loop = 0 ; current_state < MM_CAMCORDER_STATE_PREPARE && loop < __MMCAMCORDER_CMD_ITERATE_MAX * 3 ; loop++) {
-               itr_cnt = __MMCAMCORDER_CMD_ITERATE_MAX;
-
-               switch (current_state) {
-               case MM_CAMCORDER_STATE_NULL:
-                       _mmcam_dbg_log("Realize");
-                       while ((itr_cnt--) && ((result = _mmcamcorder_realize((MMHandleType)hcamcorder)) != MM_ERROR_NONE)) {
-                               _mmcam_dbg_warn("Can't realize.(%x)", result);
-                       }
-                       break;
-               case MM_CAMCORDER_STATE_READY:
-                       _mmcam_dbg_log("Start previewing");
-
-                       while ((itr_cnt--) && ((result = _mmcamcorder_start((MMHandleType)hcamcorder)) != MM_ERROR_NONE)) {
-                               _mmcam_dbg_warn("Can't start previewing.(%x)", result);
-                       }
-                       break;
-               default:
-                       _mmcam_dbg_log("Abnormal state.");
-                       break;
-               }
-
-               current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder);
-       }
+       /* restore */
+       hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_NORMAL;
 
-       _mmcam_dbg_log( "Done." );
+       _mmcam_dbg_warn("Done.");
 
        return;
 }
 
-int _mmcamcorder_create_command_loop(MMHandleType handle)
-{
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-       _MMCamcorderCommand *cmd;
-
-       mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
-
-       _mmcam_dbg_log("");
-
-       cmd = (_MMCamcorderCommand *)&(hcamcorder->cmd);
-       cmd->cmd_queue = g_queue_new();
-       mmf_return_val_if_fail(cmd->cmd_queue, MM_ERROR_CAMCORDER_INVALID_CONDITION);
-
-       sem_init(&cmd->sema, 0, 0);
-
-       if (pthread_create(&cmd->pCommandThread, NULL, _mmcamcorder_command_loop_thread, hcamcorder)) {
-               perror("Make Command Thread Fail");
-               return MM_ERROR_COMMON_UNKNOWN;
-       }
-
-       return MM_ERROR_NONE;
-}
-
-
-int _mmcamcorder_destroy_command_loop(MMHandleType handle)
-{
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-       _MMCamcorderCommand *cmd;
-
-       mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
-       _mmcam_dbg_log("");
-
-       cmd = (_MMCamcorderCommand *)&(hcamcorder->cmd);
-       mmf_return_val_if_fail(cmd->cmd_queue, MM_ERROR_CAMCORDER_INVALID_CONDITION);
-
-       _mmcamcorder_append_simple_command(handle, _MMCAMCORDER_CMD_QUIT);
-
-       sem_post(&cmd->sema); /* why is this needed? */
-
-       _mmcam_dbg_log("wait for pthread join");
-
-       pthread_join(cmd->pCommandThread, NULL);
-
-       _mmcam_dbg_log("pthread join!!");
-       
-       sem_destroy(&cmd->sema);
-
-       while (!g_queue_is_empty(cmd->cmd_queue)) {
-               __MMCamcorderCmdInfo *info = NULL;
-               info = g_queue_pop_head(cmd->cmd_queue);
-               _mmcamcorder_delete_command_info(info);
-       }
-       g_queue_free(cmd->cmd_queue);
-
-       _mmcam_dbg_log("Command loop clear.");  
-
-       return MM_ERROR_NONE;
-}
-
-
-int _mmcamcorder_append_command(MMHandleType handle, __MMCamcorderCmdInfo *info)
-{
-       int value = 0;
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-       _MMCamcorderCommand *cmd;
-
-       mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
-
-       _mmcam_dbg_log("");
-
-       cmd = (_MMCamcorderCommand *)&(hcamcorder->cmd);
-       mmf_return_val_if_fail(cmd->cmd_queue, MM_ERROR_CAMCORDER_INVALID_CONDITION);
-
-       g_queue_push_tail (cmd->cmd_queue, (gpointer)info);
-
-       sem_getvalue(&cmd->sema, &value);
-
-       if (value == 0) {
-               sem_post(&cmd->sema);
-       } else {
-               /* Don't need to post. */
-       }
-
-       return MM_ERROR_NONE;
-}
-
-
-int _mmcamcorder_append_simple_command(MMHandleType handle, _MMCamcorderCommandType type)
-{
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-       __MMCamcorderCmdInfo *info = NULL;
-
-       mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
-
-       _mmcam_dbg_log("Command Type=%d", type);
-
-       info = (__MMCamcorderCmdInfo*)malloc(sizeof(__MMCamcorderCmdInfo));
-
-       info->handle = handle;
-       info->type = type;
-
-       _mmcamcorder_append_command(handle, info);      
-
-       return MM_ERROR_NONE;
-}
-
-
-void *_mmcamcorder_command_loop_thread(void *arg)
-{
-       gboolean bExit_loop = FALSE;
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(arg);
-       _MMCamcorderCommand *cmd = NULL;
-       __MMCamcorderCmdInfo *cmdinfo = NULL;
-
-       mmf_return_val_if_fail(hcamcorder, NULL);
-
-       cmd = (_MMCamcorderCommand *)&(hcamcorder->cmd);
-       mmf_return_val_if_fail(cmd->cmd_queue, NULL);
-
-       _mmcam_dbg_log("");
-
-       while (!bExit_loop) {
-               sem_wait(&cmd->sema);
-
-               /* send command */
-               while (!g_queue_is_empty (cmd->cmd_queue)) {
-                       int bRet = MM_ERROR_NONE;
-
-                       cmdinfo = g_queue_pop_head(cmd->cmd_queue);
-                       if (cmdinfo->handle == (MMHandleType)NULL) {
-                               _mmcam_dbg_log("Handle in cmdinfo is Null.");
-                               bRet = MM_ERROR_CAMCORDER_NOT_INITIALIZED;
-                       } else {
-                               switch (cmdinfo->type) {
-                               case _MMCAMCORDER_CMD_CREATE:
-                               case _MMCAMCORDER_CMD_DESTROY:
-                               case _MMCAMCORDER_CMD_CAPTURESTART:
-                               case _MMCAMCORDER_CMD_CAPTURESTOP:
-                               case _MMCAMCORDER_CMD_RECORD:
-                               case _MMCAMCORDER_CMD_PAUSE:
-                               case _MMCAMCORDER_CMD_COMMIT:
-                                       __ta__("_mmcamcorder_commit",
-                                       bRet = _mmcamcorder_commit(cmdinfo->handle);
-                                       );
-                                       break;
-                               case _MMCAMCORDER_CMD_CANCEL:
-                                       //Not used yet.
-                                       break;
-                               case _MMCAMCORDER_CMD_REALIZE:
-                                       __ta__("_mmcamcorder_realize",
-                                       bRet = _mmcamcorder_realize(cmdinfo->handle);
-                                       );
-                                       break;
-                               case _MMCAMCORDER_CMD_UNREALIZE:
-                                       __ta__("_mmcamcorder_unrealize",
-                                       bRet = _mmcamcorder_unrealize(cmdinfo->handle);
-                                       );
-                                       break;
-                               case _MMCAMCORDER_CMD_START:
-                                       __ta__("_mmcamcorder_start",
-                                       bRet = _mmcamcorder_start(cmdinfo->handle);
-                                       );
-                                       break;
-                               case _MMCAMCORDER_CMD_STOP:
-                                       __ta__("_mmcamcorder_stop",
-                                       bRet = _mmcamcorder_stop(cmdinfo->handle);
-                                       );
-                                       break;
-                               case _MMCAMCORDER_CMD_QUIT:
-                                       _mmcam_dbg_log("Exit command loop!!");
-                                       bExit_loop = TRUE;
-                                       break;
-                               default:
-                                       _mmcam_dbg_log("Wrong command type!!!");
-                                       break;
-                               }
-                       }
-
-                       if (bRet != MM_ERROR_NONE) {
-                               _mmcam_dbg_log("Error on command process!(%x)", bRet);
-                               /* Do something? */
-                       }
-
-                       _mmcamcorder_delete_command_info(cmdinfo);
-
-                       if (bExit_loop) {
-                               break;
-                       }
-                       usleep(1);
-               }
-       }
-
-       return NULL;
-}
-
 
 static gboolean __mmcamcorder_handle_gst_error(MMHandleType handle, GstMessage *message, GError *error)
 {
        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);
        sc = MMF_CAMCORDER_SUBCONTEXT(handle);
@@ -3599,10 +3915,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
@@ -3613,10 +3929,12 @@ static gboolean __mmcamcorder_handle_gst_error(MMHandleType handle, GstMessage *
        }
 #endif /* _MMCAMCORDER_SKIP_GST_FLOW_ERROR */
 
-       /* post error to application */
-       sc->error_occurs = TRUE;
-       msg.id = MM_MESSAGE_CAMCORDER_ERROR;
-       _mmcamcroder_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;
 }
@@ -3636,38 +3954,36 @@ static gint __mmcamcorder_gst_handle_core_error(MMHandleType handle, int code, G
        mmf_return_val_if_fail(sc, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
        /* Specific plugin - video encoder plugin */
-       element = GST_ELEMENT_CAST(sc->element[_MMCAMCORDER_ENCSINK_VENC].gst);
+       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;
        }
 }
 
@@ -3720,8 +4036,44 @@ static gint __mmcamcorder_gst_handle_resource_error(MMHandleType handle, int cod
                }
        }
 
+       /* audiosrc */
+       element = GST_ELEMENT_CAST(sc->encode_element[_MMCAMCORDER_AUDIOSRC_SRC].gst);
+       if (GST_ELEMENT_CAST(message->src) == element) {
+               if (code == GST_RESOURCE_ERROR_FAILED) {
+                       int ret = MM_ERROR_NONE;
+                       int current_state = MM_CAMCORDER_STATE_NONE;
+
+                       _mmcam_dbg_err("DPM mic DISALLOWED - current state %d", current_state);
+
+                       _MMCAMCORDER_LOCK_ASM(hcamcorder);
+
+                       current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder);
+                       if (current_state >= MM_CAMCORDER_STATE_RECORDING) {
+                               /* set value to inform a status is changed by DPM */
+                               hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_BY_DPM;
+
+                               ret = _mmcamcorder_commit((MMHandleType)hcamcorder);
+                               _mmcam_dbg_log("commit result : 0x%x", ret);
+
+                               if (ret != MM_ERROR_NONE) {
+                                       _mmcam_dbg_err("commit failed, cancel it");
+                                       ret = _mmcamcorder_cancel((MMHandleType)hcamcorder);
+                               }
+                       }
+
+                       /* restore value */
+                       hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_NORMAL;
+
+                       _MMCAMCORDER_UNLOCK_ASM(hcamcorder);
+
+                       _mmcamcorder_request_dpm_popup(hcamcorder->gdbus_conn, "microphone");
+
+                       return MM_ERROR_POLICY_RESTRICTED;
+               }
+       }
+
        /* encodebin */
-       element = GST_ELEMENT_CAST(sc->element[_MMCAMCORDER_ENCSINK_VENC].gst);
+       element = GST_ELEMENT_CAST(sc->encode_element[_MMCAMCORDER_ENCSINK_VENC].gst);
        if (GST_ELEMENT_CAST(message->src) == element) {
                if (code == GST_RESOURCE_ERROR_FAILED) {
                        _mmcam_dbg_err("Encoder [Resource error]");
@@ -3767,9 +4119,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);
@@ -3778,7 +4130,7 @@ static gint __mmcamcorder_gst_handle_stream_error(MMHandleType handle, int code,
 
        /* Specific plugin */
        /* video encoder */
-       element = GST_ELEMENT_CAST(sc->element[_MMCAMCORDER_ENCSINK_VENC].gst);
+       element = GST_ELEMENT_CAST(sc->encode_element[_MMCAMCORDER_ENCSINK_VENC].gst);
        if (GST_ELEMENT_CAST(message->src) == element) {
                switch (code) {
                case GST_STREAM_ERROR_WRONG_TYPE:
@@ -3822,7 +4174,7 @@ 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;
@@ -3842,7 +4194,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);
@@ -3853,7 +4205,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;
        }
@@ -3866,10 +4218,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);
@@ -3883,7 +4235,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;
                }
        }
@@ -3911,3 +4263,56 @@ static gint __mmcamcorder_gst_handle_resource_warning(MMHandleType handle, GstMe
 
        return MM_ERROR_NONE;
 }
+
+
+void _mmcamcorder_emit_signal(MMHandleType handle, const char *object_name,
+       const char *interface_name, const char *signal_name, int value)
+{
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
+
+       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_RM_SUPPORT
+rm_cb_result _mmcamcorder_rm_callback(int handle, rm_callback_type event_src,
+       rm_device_request_s *info, void* cb_data)
+{
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(cb_data);
+       int current_state = MM_CAMCORDER_STATE_NONE;
+       rm_cb_result cb_res = RM_CB_RESULT_OK;
+
+       mmf_return_val_if_fail((MMHandleType)hcamcorder, RM_CB_RESULT_OK);
+
+       current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder);
+       if (current_state <= MM_CAMCORDER_STATE_NONE || current_state >= MM_CAMCORDER_STATE_NUM) {
+               _mmcam_dbg_err("Abnormal state. Or null handle. (%p, %d)", hcamcorder, current_state);
+       }
+
+       _MMCAMCORDER_LOCK_ASM(hcamcorder);
+
+       /* set 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;
+       }
+
+       _MMCAMCORDER_UNLOCK_ASM(hcamcorder);
+
+       return cb_res;
+}
+#endif /* _MMCAMCORDER_RM_SUPPORT */