[Release version 0.10.64] Fix Tizen coding rule violation
[platform/core/multimedia/libmm-camcorder.git] / src / mm_camcorder_stillshot.c
index f6ef4fe..0775a7b 100644 (file)
 /*=======================================================================================
 |  INCLUDE FILES                                                                       |
 =======================================================================================*/
+#include <stdlib.h>
 #include <sys/time.h>
 #include <sys/times.h>
-#include <gst/interfaces/cameracontrol.h>
+#include <gst/video/cameracontrol.h>
+#include <mm_sound.h>
 #include "mm_camcorder_internal.h"
 #include "mm_camcorder_stillshot.h"
 #include "mm_camcorder_exifinfo.h"
 #include "mm_camcorder_exifdef.h"
+#include <libexif/exif-loader.h>
+#include <libexif/exif-utils.h>
+#include <libexif/exif-data.h>
 
 /*---------------------------------------------------------------------------------------
 |    GLOBAL VARIABLE DEFINITIONS for internal                                          |
 ---------------------------------------------------------------------------------------*/
-#define EXIF_SET_ERR( return_type,tag_id) \
-       _mmcam_dbg_err("error=%x,tag=%x",return_type,tag_id); \
-       if (return_type == MM_ERROR_CAMCORDER_LOW_MEMORY) { \
+#define EXIF_SET_ERR(return_type, tag_id) \
+       _mmcam_dbg_err("error=%x,tag=%x", return_type, tag_id); \
+       if (return_type == (int)MM_ERROR_CAMCORDER_LOW_MEMORY) { \
                goto exit; \
        }
 
 /*---------------------------------------------------------------------------------------
 |    LOCAL VARIABLE DEFINITIONS for internal                                           |
 ---------------------------------------------------------------------------------------*/
+#define THUMBNAIL_WIDTH         320
+#define THUMBNAIL_HEIGHT        240
+#define THUMBNAIL_JPEG_QUALITY  90
+#define TRY_LOCK_MAX_COUNT      100
+#define TRY_LOCK_TIME           20000   /* ms */
+#define H264_PREVIEW_BITRATE    1024*10 /* kbps */
+#define H264_PREVIEW_NEWGOP_INTERVAL    1000 /* ms */
+#define _MMCAMCORDER_MAKE_THUMBNAIL_INTERNAL_ENCODE
 
 
 /*---------------------------------------------------------------------------------------
 int _mmcamcorder_image_cmd_capture(MMHandleType handle);
 int _mmcamcorder_image_cmd_preview_start(MMHandleType handle);
 int _mmcamcorder_image_cmd_preview_stop(MMHandleType handle);
-static void __mmcamcorder_image_capture_cb(GstElement *element, GstBuffer *buffer1, GstBuffer *buffer2, GstBuffer *buffer3, gpointer u_data);
+static void __mmcamcorder_image_capture_cb(GstElement *element, GstSample *sample1, GstSample *sample2, GstSample *sample3, gpointer u_data);
 
-/* Functions for JPEG capture with Encode bin */
-int _mmcamcorder_image_cmd_capture_with_encbin(MMHandleType handle);
-int _mmcamcorder_image_cmd_preview_start_with_encbin(MMHandleType handle);
-int _mmcamcorder_image_cmd_preview_stop_with_encbin(MMHandleType handle);
-static gboolean        __mmcamcorder_encodesink_handoff_callback(GstElement *fakesink, GstBuffer *buffer, GstPad *pad, gpointer u_data);
+/* sound status changed callback */
+static void __sound_status_changed_cb(keynode_t* node, void *data);
 
 /*=======================================================================================
 |  FUNCTION DEFINITIONS                                                                        |
@@ -69,191 +79,215 @@ static gboolean   __mmcamcorder_encodesink_handoff_callback(GstElement *fakesink,
 ---------------------------------------------------------------------------------------*/
 
 
-int _mmcamcorder_add_stillshot_pipeline(MMHandleType handle)
+int _mmcamcorder_create_stillshot_pipeline(MMHandleType handle)
 {
        int err = MM_ERROR_UNKNOWN;
-
        GstPad *srcpad = NULL;
        GstPad *sinkpad = NULL;
 
-       mmf_camcorder_t *hcamcorder= MMF_CAMCORDER(handle);
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        _MMCamcorderSubContext *sc = NULL;
-       _MMCamcorderImageInfo *info = NULL;
-       
+
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
        sc = MMF_CAMCORDER_SUBCONTEXT(handle);
-       mmf_return_val_if_fail(sc && sc->info && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
-
-       info = sc->info;
+       mmf_return_val_if_fail(sc && sc->info_image && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
        _mmcam_dbg_log("");
 
-       //Create gstreamer element
-       //Check main pipeline
-       if (!sc->element[_MMCAMCORDER_MAIN_PIPE].gst) {
-               _mmcam_dbg_err( "Main Pipeline is not existed." );
-               err = MM_ERROR_CAMCORDER_RESOURCE_CREATION;
-               goto pipeline_creation_error;
-       }
-
-       _mmcamcorder_conf_get_value_int(hcamcorder->conf_main,
-                                       CONFIGURE_CATEGORY_MAIN_CAPTURE,
-                                       "UseEncodebin",
-                                       &sc->bencbin_capture);
-
-       if (sc->bencbin_capture) {
-               _mmcam_dbg_log("Using Encodebin for capturing");
-               __ta__("        _mmcamcorder_create_encodesink_bin",
-               err = _mmcamcorder_create_encodesink_bin((MMHandleType)hcamcorder);
-               );
-               if (err != MM_ERROR_NONE) {
-                       return err;
-               }
-
-               gst_bin_add_many(GST_BIN(sc->element[_MMCAMCORDER_MAIN_PIPE].gst),
-                                sc->element[_MMCAMCORDER_ENCSINK_BIN].gst,
-                                NULL);
-
-               /* Link each element */
-               srcpad = gst_element_get_static_pad(sc->element[_MMCAMCORDER_VIDEOSRC_BIN].gst, "src1");
-               sinkpad = gst_element_get_static_pad(sc->element[_MMCAMCORDER_ENCSINK_BIN].gst, "image_sink0");
-               _MM_GST_PAD_LINK_UNREF(srcpad, sinkpad, err, element_link_error)
-
-               MMCAMCORDER_SIGNAL_CONNECT(sc->element[_MMCAMCORDER_ENCSINK_SINK].gst,
-                                          _MMCAMCORDER_HANDLER_STILLSHOT, "handoff",
-                                          G_CALLBACK(__mmcamcorder_encodesink_handoff_callback),
-                                          hcamcorder);
-       } else {
-               _mmcam_dbg_log("NOT using Encodebin for capturing");
+       /* Create gstreamer element */
+       _mmcam_dbg_log("Using Encodebin for capturing");
 
-               /*set video source element*/
-               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "signal-still-capture", TRUE);
+       /* Create capture pipeline */
+       _MMCAMCORDER_PIPELINE_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCODE_MAIN_PIPE, "capture_pipeline", err);
 
-               MMCAMCORDER_SIGNAL_CONNECT(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst,
-                                          _MMCAMCORDER_HANDLER_STILLSHOT, "still-capture",
-                                          G_CALLBACK(__mmcamcorder_image_capture_cb),
-                                          hcamcorder);
-       }
+       err = _mmcamcorder_create_encodesink_bin((MMHandleType)hcamcorder, MM_CAMCORDER_ENCBIN_PROFILE_IMAGE);
+       if (err != MM_ERROR_NONE)
+               return err;
 
-       return MM_ERROR_NONE;
+       /* add element and encodesink bin to encode main pipeline */
+       gst_bin_add_many(GST_BIN(sc->encode_element[_MMCAMCORDER_ENCODE_MAIN_PIPE].gst),
+               sc->encode_element[_MMCAMCORDER_ENCSINK_SRC].gst,
+               sc->encode_element[_MMCAMCORDER_ENCSINK_FILT].gst,
+               sc->encode_element[_MMCAMCORDER_ENCSINK_BIN].gst,
+               NULL);
 
-element_link_error:
-       if (sc->bencbin_capture) {
-               _mmcam_dbg_err("Link encodebin failed!");
+       /* Link each element : appsrc - capsfilter - encodesink bin */
+       srcpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_SRC].gst, "src");
+       sinkpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_FILT].gst, "sink");
+       _MM_GST_PAD_LINK_UNREF(srcpad, sinkpad, err, pipeline_creation_error);
 
-               if (sc->element[_MMCAMCORDER_ENCSINK_BIN].gst != NULL) {
-                       int ret = MM_ERROR_NONE;
+       srcpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_FILT].gst, "src");
+       sinkpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_BIN].gst, "image_sink0");
+       _MM_GST_PAD_LINK_UNREF(srcpad, sinkpad, err, pipeline_creation_error);
 
-                       __ta__( "        EncodeBin Set NULL",
-                       ret = _mmcamcorder_gst_set_state(handle, sc->element[_MMCAMCORDER_ENCSINK_BIN].gst, GST_STATE_NULL);
-                       );
-                       if (ret != MM_ERROR_NONE) {
-                               _mmcam_dbg_err("Faile to change encode bin state[%d]", ret);
-                               /* Can't return here. */
-                               /* return ret; */
-                       }
+       /* connect handoff signal to get capture data */
+       MMCAMCORDER_SIGNAL_CONNECT(sc->encode_element[_MMCAMCORDER_ENCSINK_SINK].gst,
+               _MMCAMCORDER_HANDLER_STILLSHOT, "handoff",
+               G_CALLBACK(__mmcamcorder_handoff_callback),
+               hcamcorder);
 
-                       gst_bin_remove(GST_BIN(sc->element[_MMCAMCORDER_MAIN_PIPE].gst),
-                                      sc->element[_MMCAMCORDER_ENCSINK_BIN].gst);
+       return MM_ERROR_NONE;
 
-                       _mmcamcorder_remove_element_handle(handle, _MMCAMCORDER_ENCSINK_BIN, _MMCAMCORDER_ENCSINK_SINK);
+pipeline_creation_error:
+       _mmcamcorder_remove_stillshot_pipeline(handle);
+       return err;
+}
 
-                       _mmcam_dbg_log("Encodebin removed");
-               }
-       }
 
-       return MM_ERROR_CAMCORDER_GST_LINK;
+int _mmcamcorder_connect_capture_signal(MMHandleType handle)
+{
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
+       _MMCamcorderSubContext *sc = NULL;
+
+       mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
-pipeline_creation_error:
-       return err;
+       sc = MMF_CAMCORDER_SUBCONTEXT(handle);
+       mmf_return_val_if_fail(sc && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
+
+       /* check video source element */
+       if (sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst) {
+               _mmcam_dbg_warn("connect capture signal to _MMCAMCORDER_VIDEOSRC_SRC");
+               MMCAMCORDER_SIGNAL_CONNECT(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst,
+                       _MMCAMCORDER_HANDLER_STILLSHOT, "still-capture",
+                       G_CALLBACK(__mmcamcorder_image_capture_cb),
+                       hcamcorder);
+
+               return MM_ERROR_NONE;
+       } else {
+               _mmcam_dbg_err("videosrc element is not created yet");
+               return MM_ERROR_CAMCORDER_NOT_INITIALIZED;
+       }
 }
 
 
 int _mmcamcorder_remove_stillshot_pipeline(MMHandleType handle)
 {
+       int ret = MM_ERROR_NONE;
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        _MMCamcorderSubContext *sc = NULL;
-       _MMCamcorderImageInfo *info = NULL;
 
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
        sc = MMF_CAMCORDER_SUBCONTEXT(handle);
-       mmf_return_val_if_fail(sc && sc->info && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
-
-       info = sc->info;
+       mmf_return_val_if_fail(sc && sc->info_image && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
        _mmcam_dbg_log("");
 
        /* Check pipeline */
-       if (sc->element[_MMCAMCORDER_MAIN_PIPE].gst) {
-               _mmcamcorder_remove_all_handlers(handle, _MMCAMCORDER_HANDLER_STILLSHOT);
+       if (sc->encode_element[_MMCAMCORDER_ENCODE_MAIN_PIPE].gst) {
+               ret = _mmcamcorder_gst_set_state(handle, sc->encode_element[_MMCAMCORDER_ENCODE_MAIN_PIPE].gst, GST_STATE_NULL);
+               if (ret != MM_ERROR_NONE) {
+                       _mmcam_dbg_err("Faile to change encode main pipeline state [0x%x]", ret);
+                       return ret;
+               }
 
-               if (sc->bencbin_capture) {
-                       GstPad *srcpad = NULL, *sinkpad = NULL;
-                       if (!sc->element[_MMCAMCORDER_ENCSINK_BIN].gst) {
-                               _mmcam_dbg_log("ENCSINK_BIN is already removed");
-                       } else {
-                               /* Unlink each element */
-                               srcpad = gst_element_get_static_pad(sc->element[_MMCAMCORDER_VIDEOSRC_BIN].gst, "src1");
-                               sinkpad = gst_element_get_static_pad(sc->element[_MMCAMCORDER_ENCSINK_BIN].gst, "image_sink0");
-                               _MM_GST_PAD_UNLINK_UNREF(srcpad, sinkpad);
+               _mmcamcorder_remove_all_handlers(handle, _MMCAMCORDER_HANDLER_STILLSHOT | _MMCAMCORDER_HANDLER_VIDEOREC);
 
-                               gst_bin_remove(GST_BIN(sc->element[_MMCAMCORDER_MAIN_PIPE].gst),
-                                       sc->element[_MMCAMCORDER_ENCSINK_BIN].gst);
+               GstPad *reqpad = NULL;
 
-                               _mmcamcorder_remove_element_handle(handle, _MMCAMCORDER_ENCSINK_BIN, _MMCAMCORDER_ENCSINK_SINK);
-                       }
+               /* release request pad */
+               reqpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "image");
+               if (reqpad) {
+                       gst_element_release_request_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, reqpad);
+                       gst_object_unref(reqpad);
+                       reqpad = NULL;
                }
+
+               /* release encode main pipeline */
+               gst_object_unref(sc->encode_element[_MMCAMCORDER_ENCODE_MAIN_PIPE].gst);
+
+               _mmcam_dbg_log("Encoder pipeline removed");
        } else {
-               _mmcam_dbg_log("MAIN_PIPE is already removed");
+               _mmcam_dbg_log("encode main pipeline is already removed");
        }
 
        return MM_ERROR_NONE;
 }
 
 
-void _mmcamcorder_destroy_image_pipeline(MMHandleType handle)
+void _mmcamcorder_destroy_video_capture_pipeline(MMHandleType handle)
 {
-       GstPad *reqpad1 = NULL;
-       GstPad *reqpad2 = NULL;
-
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        _MMCamcorderSubContext *sc = NULL;
+       int display_reuse_hint = FALSE;
+       GstElement *sink_element = NULL;
+       mmf_attrs_t *attrs = NULL;
+       int attr_index = 0;
+       mmf_attribute_t *attr_item = NULL;
 
        mmf_return_if_fail(hcamcorder);
 
        sc = MMF_CAMCORDER_SUBCONTEXT(handle);
        mmf_return_if_fail(sc && sc->element);
-       
+
        _mmcam_dbg_log("");
 
        if (sc->element[_MMCAMCORDER_MAIN_PIPE].gst) {
-               MMCAMCORDER_G_OBJECT_SET( sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", TRUE);
+               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst, "empty-buffers", TRUE);
+               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", TRUE);
+
+               /* check reuse flag for display element */
+               mm_camcorder_get_attributes(handle, NULL,
+                       MMCAM_DISPLAY_REUSE_HINT, &display_reuse_hint,
+                       NULL);
+
+               _mmcam_dbg_log("display reuse hint %d", display_reuse_hint);
+
+               if (!display_reuse_hint)
+                       goto _REUSE_CHECK_DONE;
+
+               sink_element = sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst;
+               if (!sink_element) {
+                       _mmcam_dbg_warn("sink element is NULL");
+                       goto _REUSE_CHECK_DONE;
+               }
+
+               attrs = (mmf_attrs_t *)MMF_CAMCORDER_ATTRS(handle);
+               if (!attrs) {
+                       _mmcam_dbg_warn("attribute is NULL");
+                       goto _REUSE_CHECK_DONE;
+               }
+
+               _mmcam_dbg_log("REF sink element %p and set it to attribute", sink_element);
+
+               /* ref element before remove it from pipeline */
+               gst_object_ref(sink_element);
+
+               if (!gst_bin_remove(GST_BIN(sc->element[_MMCAMCORDER_MAIN_PIPE].gst), sink_element))
+                       _mmcam_dbg_warn("failed to remove sink element from pipeline");
+
+               /* set sink element pointer to attribute */
+               mm_attrs_get_index((MMHandleType)attrs, MMCAM_DISPLAY_REUSE_ELEMENT, &attr_index);
+               attr_item = &attrs->items[attr_index];
+               mmf_attribute_set_data(attr_item, (void *)sink_element, sizeof(sink_element));
+               mmf_attribute_commit(attr_item);
+
+               /* remove notify callback */
+               g_object_weak_unref(G_OBJECT(sink_element), (GWeakNotify)_mmcamcorder_element_release_noti, sc);
+
+               sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst = NULL;
+               sc->element[_MMCAMCORDER_VIDEOSINK_SINK].id = _MMCAMCORDER_NONE;
+
+_REUSE_CHECK_DONE:
+               traceBegin(TTRACE_TAG_CAMERA, "MMCAMCORDER:UNREALIZE:SET_NULL_TO_PIPELINE");
+
                _mmcamcorder_gst_set_state(handle, sc->element[_MMCAMCORDER_MAIN_PIPE].gst, GST_STATE_NULL);
 
+               traceEnd(TTRACE_TAG_CAMERA);
+
                _mmcamcorder_remove_all_handlers(handle, _MMCAMCORDER_HANDLER_CATEGORY_ALL);
 
-               reqpad1 = gst_element_get_static_pad(sc->element[_MMCAMCORDER_VIDEOSRC_TEE].gst, "src0");
-               reqpad2 = gst_element_get_static_pad(sc->element[_MMCAMCORDER_VIDEOSRC_TEE].gst, "src1");
-               gst_element_release_request_pad(sc->element[_MMCAMCORDER_VIDEOSRC_TEE].gst, reqpad1);
-               gst_element_release_request_pad(sc->element[_MMCAMCORDER_VIDEOSRC_TEE].gst, reqpad2);
-               gst_object_unref(reqpad1);
-               gst_object_unref(reqpad2);
-
-               if (sc->bencbin_capture) {
-                       if (sc->element[_MMCAMCORDER_ENCSINK_ENCBIN].gst) {
-                               GstPad *reqpad0 = NULL;
-                               reqpad0 = gst_element_get_static_pad(sc->element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "image");
-                               gst_element_release_request_pad(sc->element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, reqpad0);
-                               gst_object_unref(reqpad0);
-                       }
-               }
+               traceBegin(TTRACE_TAG_CAMERA, "MMCAMCORDER:UNREALIZE:UNREF_PIPELINE");
 
                gst_object_unref(sc->element[_MMCAMCORDER_MAIN_PIPE].gst);
-               /* Why is this commented? */
-               /* sc->element[_MMCAMCORDER_MAIN_PIPE].gst = NULL; */
+
+               traceEnd(TTRACE_TAG_CAMERA);
+
+               /* NULL initialization will be done in _mmcamcorder_element_release_noti */
        }
+
+       return;
 }
 
 
@@ -265,135 +299,157 @@ int _mmcamcorder_image_cmd_capture(MMHandleType handle)
        int height = 0;
        int fps = 0;
        int cap_format = MM_PIXEL_FORMAT_NV12;
-       int cap_jpeg_quality = 0;
        int image_encoder = MM_IMAGE_CODEC_JPEG;
+       int strobe_mode = MM_CAMCORDER_STROBE_MODE_OFF;
+       int is_modified_size = FALSE;
+       int tag_orientation = 0;
        unsigned int cap_fourcc = 0;
 
        char *err_name = NULL;
-       char *videosrc_name = NULL;
+       const char *videosrc_name = NULL;
 
-       GstElement *pipeline = NULL;
        GstCameraControl *control = NULL;
-       GstCaps *caps = NULL;
-       GstClock *clock = NULL;
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        _MMCamcorderImageInfo *info = NULL;
        _MMCamcorderSubContext *sc = NULL;
        type_element *VideosrcElement = NULL;
+       MMCamcorderStateType current_state = MM_CAMCORDER_STATE_NONE;
 
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
        sc = MMF_CAMCORDER_SUBCONTEXT(handle);
-       mmf_return_val_if_fail(sc && sc->info && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
+       mmf_return_val_if_fail(sc && sc->info_image && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
        _mmcam_dbg_log("");
 
-       pipeline = sc->element[_MMCAMCORDER_MAIN_PIPE].gst;
-       info = sc->info;
+       info = sc->info_image;
+
+       if (info->capturing) {
+               _mmcam_dbg_err("already capturing");
+               return MM_ERROR_CAMCORDER_DEVICE_BUSY;
+       }
 
-       _mmcamcorder_conf_get_value_int(hcamcorder->conf_main,
-                                       CONFIGURE_CATEGORY_MAIN_CAPTURE,
-                                       "UseCaptureMode",
-                                       &UseCaptureMode);
+       _mmcamcorder_conf_get_value_int(handle, hcamcorder->conf_main,
+               CONFIGURE_CATEGORY_MAIN_CAPTURE,
+               "UseCaptureMode",
+               &UseCaptureMode);
 
-       _mmcamcorder_conf_get_element(hcamcorder->conf_main,
-                                     CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
-                                     "VideosrcElement",
-                                     &VideosrcElement);
+       _mmcamcorder_conf_get_element(handle, hcamcorder->conf_main,
+               CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
+               "VideosrcElement",
+               &VideosrcElement);
 
        _mmcamcorder_conf_get_value_element_name(VideosrcElement, &videosrc_name);
 
-       if (info->capturing) {
-               ret = MM_ERROR_CAMCORDER_DEVICE_BUSY;
-               goto cmd_error;
-       }
-
-       MMTA_ACUM_ITEM_BEGIN("Real First Capture Start",false);
+       /* get current state */
+       mm_camcorder_get_state(handle, &current_state);
 
        /* set capture flag */
        info->capturing = TRUE;
 
        ret = mm_camcorder_get_attributes(handle, &err_name,
-                                         MMCAM_IMAGE_ENCODER_QUALITY, &cap_jpeg_quality,
-                                         MMCAM_IMAGE_ENCODER, &image_encoder,
-                                         MMCAM_CAMERA_WIDTH, &width,
-                                         MMCAM_CAMERA_HEIGHT, &height,
-                                         MMCAM_CAMERA_FPS, &fps,
-                                         MMCAM_CAPTURE_FORMAT, &cap_format,
-                                         MMCAM_CAPTURE_WIDTH, &info->width,
-                                         MMCAM_CAPTURE_HEIGHT, &info->height,
-                                         MMCAM_CAPTURE_COUNT, &info->count,
-                                         MMCAM_CAPTURE_INTERVAL, &info->interval,
-                                         NULL);
-       if (ret != MM_ERROR_NONE) {
-               _mmcam_dbg_warn("Get attrs fail. (%s:%x)", err_name, ret);
-               SAFE_FREE (err_name);
-               goto cmd_error;
-       }
-
+               MMCAM_IMAGE_ENCODER, &image_encoder,
+               MMCAM_CAMERA_WIDTH, &width,
+               MMCAM_CAMERA_HEIGHT, &height,
+               MMCAM_CAMERA_FPS, &fps,
+               MMCAM_CAPTURE_FORMAT, &cap_format,
+               MMCAM_CAPTURE_WIDTH, &info->width,
+               MMCAM_CAPTURE_HEIGHT, &info->height,
+               MMCAM_CAPTURE_COUNT, &info->count,
+               MMCAM_CAPTURE_INTERVAL, &info->interval,
+               MMCAM_STROBE_MODE, &strobe_mode,
+               MMCAM_TAG_ORIENTATION, &tag_orientation,
+               NULL);
+       if (err_name) {
+               _mmcam_dbg_warn("get_attributes err %s, ret 0x%x", err_name, ret);
+               SAFE_FREE(err_name);
+       }
+
+       ret = MM_ERROR_NONE;
+
+       /* check capture count */
        if (info->count < 1) {
                _mmcam_dbg_err("capture count[%d] is invalid", info->count);
                ret = MM_ERROR_CAMCORDER_INVALID_ARGUMENT;
-               goto cmd_error;
+               goto cmd_done;
        } else if (info->count == 1) {
                info->type = _MMCamcorder_SINGLE_SHOT;
        } else {
                info->type = _MMCamcorder_MULTI_SHOT;
                info->next_shot_time = 0;
                info->multi_shot_stop = FALSE;
+
+               /* sound init to pause other session */
+               _mmcamcorder_sound_init(handle);
+       }
+
+       _mmcam_dbg_log("preview(%dx%d,fmt:%d), capture(%dx%d,fmt:%d), count(%d), hdr mode(%d), interval (%d)",
+               width, height, info->preview_format, info->width, info->height, cap_format,
+               info->count, info->hdr_capture_mode, info->interval);
+
+       /* check state */
+       if (current_state >= MM_CAMCORDER_STATE_RECORDING) {
+               if (info->type == _MMCamcorder_MULTI_SHOT ||
+                   info->hdr_capture_mode != MM_CAMCORDER_HDR_OFF) {
+                       _mmcam_dbg_err("does not support multi/HDR capture while recording");
+                       ret = MM_ERROR_CAMCORDER_INVALID_STATE;
+                       goto cmd_done;
+               }
+
+               /* check capture size if ZSL is not supported*/
+               if (hcamcorder->support_zsl_capture == FALSE) {
+                       _mmcam_dbg_warn("Capture size should be same with preview size while recording");
+                       _mmcam_dbg_warn("Capture size %dx%d -> %dx%d", info->width, info->height, width, height);
+
+                       info->width = width;
+                       info->height = height;
+
+                       _mmcam_dbg_log("set capture width and height [%dx%d] to camera plugin", width, height);
+                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "capture-width", width);
+                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "capture-height", height);
+
+                       is_modified_size = TRUE;
+               }
        }
 
        info->capture_cur_count = 0;
        info->capture_send_count = 0;
 
-       _mmcam_dbg_log("videosource(%dx%d), capture(%dx%d), count(%d)",
-                      width, height, info->width, info->height, info->count);
-
        sc->internal_encode = FALSE;
 
-       if (!strcmp(videosrc_name, "avsysvideosrc") || !strcmp(videosrc_name, "camerasrc")) {
+       if (!sc->bencbin_capture) {
                /* Check encoding method */
                if (cap_format == MM_PIXEL_FORMAT_ENCODED) {
-                       if (sc->SensorEncodedCapture && info->type == _MMCamcorder_SINGLE_SHOT) {
+                       if ((sc->SensorEncodedCapture && info->type == _MMCamcorder_SINGLE_SHOT) ||
+                           hcamcorder->support_zsl_capture || is_modified_size) {
                                cap_fourcc = _mmcamcorder_get_fourcc(cap_format, image_encoder, hcamcorder->use_zero_copy_format);
-                               _mmcam_dbg_log("Sensor JPEG Capture");
+                               _mmcam_dbg_log("Sensor JPEG Capture [is_modified_size:%d]", is_modified_size);
                        } else {
-                               int raw_capture_format = MM_PIXEL_FORMAT_I420;
-
-                               ret = mm_camcorder_get_attributes(handle, &err_name,
-                                                                 MMCAM_RECOMMEND_PREVIEW_FORMAT_FOR_CAPTURE, &raw_capture_format,
-                                                                 NULL );
-                               if (ret != MM_ERROR_NONE) {
-                                       _mmcam_dbg_warn("Get Recommend capture format failed.");
-                                       SAFE_FREE(err_name);
-                                       goto cmd_error;
-                               }
+                               /* no need to encode internally if ITLV format */
+                               if (info->preview_format != MM_PIXEL_FORMAT_ITLV_JPEG_UYVY)
+                                       sc->internal_encode = TRUE;
 
-                               cap_fourcc = _mmcamcorder_get_fourcc(raw_capture_format, image_encoder, hcamcorder->use_zero_copy_format);
-                               sc->internal_encode = TRUE;
+                               cap_fourcc = _mmcamcorder_get_fourcc(info->preview_format, image_encoder, hcamcorder->use_zero_copy_format);
 
-                               _mmcam_dbg_log("MSL JPEG Capture");
+                               _mmcam_dbg_log("MSL JPEG Capture : capture fourcc %c%c%c%c",
+                                       cap_fourcc, cap_fourcc>>8, cap_fourcc>>16, cap_fourcc>>24);
                        }
                } else {
                        cap_fourcc = _mmcamcorder_get_fourcc(cap_format, MM_IMAGE_CODEC_INVALID, hcamcorder->use_zero_copy_format);
-                       if (info->type == _MMCamcorder_SINGLE_SHOT && !strcmp(videosrc_name, "camerasrc")) {
-                               MMCAMCORDER_G_OBJECT_SET( sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", TRUE );
-                               MMCAMCORDER_G_OBJECT_SET( sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, "stop-video", TRUE );
-                       }
                }
 
-               _mmcam_dbg_log("capture format (%d), jpeg quality (%d)", cap_format, cap_jpeg_quality);
+               _mmcam_dbg_log("capture format (%d)", cap_format);
 
                /* Note: width/height of capture is set in commit function of attribute or in create function of pipeline */
                MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "capture-fourcc", cap_fourcc);
                MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "capture-interval", info->interval);
                MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "capture-count", info->count);
-               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "capture-jpg-quality", cap_jpeg_quality);
 
                if (!GST_IS_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst)) {
                        _mmcam_dbg_err("Can't cast Video source into camera control.");
-                       return MM_ERROR_CAMCORDER_NOT_SUPPORTED;
+                       ret = MM_ERROR_CAMCORDER_NOT_SUPPORTED;
+                       goto cmd_done;
                }
 
                control = GST_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst);
@@ -402,20 +458,47 @@ int _mmcamcorder_image_cmd_capture(MMHandleType handle)
                int need_change = 0;
                int set_width = 0;
                int set_height = 0;
+               int cap_jpeg_quality = 0;
+
+               if (current_state >= MM_CAMCORDER_STATE_RECORDING) {
+                       _mmcam_dbg_err("could not capture in this target while recording");
+                       ret = MM_ERROR_CAMCORDER_INVALID_STATE;
+                       goto cmd_done;
+               }
 
                if (UseCaptureMode) {
-                       if (width != MMFCAMCORDER_HIGHQUALITY_WIDTH || height != MMFCAMCORDER_HIGHQUALITY_HEIGHT) {
+                       if (width != MMFCAMCORDER_HIGHQUALITY_WIDTH || height != MMFCAMCORDER_HIGHQUALITY_HEIGHT)
                                need_change = 1;
-                       }
                } else {
-                       if (width != info->width || height != info->height) {
+                       if (width != info->width || height != info->height)
                                need_change = 1;
-                       }
                }
 
                if (need_change) {
+                       int rotation = 0;
+
                        _mmcam_dbg_log("Need to change resolution");
 
+                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst, "empty-buffers", TRUE);
+                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", TRUE);
+
+                       /* make pipeline state as READY */
+                       ret = _mmcamcorder_gst_set_state(handle, sc->element[_MMCAMCORDER_MAIN_PIPE].gst, GST_STATE_READY);
+
+                       /* check decoder recreation */
+                       if (!_mmcamcorder_recreate_decoder_for_encoded_preview(handle)) {
+                               _mmcam_dbg_err("_mmcamcorder_recreate_decoder_for_encoded_preview failed");
+                               return MM_ERROR_CAMCORDER_INTERNAL;
+                       }
+
+                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst, "empty-buffers", FALSE);
+                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", FALSE);
+
+                       if (ret != MM_ERROR_NONE) {
+                               _mmcam_dbg_err("failed to set state PAUSED %x", ret);
+                               goto cmd_done;
+                       }
+
                        if (UseCaptureMode) {
                                set_width = MMFCAMCORDER_HIGHQUALITY_WIDTH;
                                set_height = MMFCAMCORDER_HIGHQUALITY_HEIGHT;
@@ -424,44 +507,95 @@ int _mmcamcorder_image_cmd_capture(MMHandleType handle)
                                set_height = info->height;
                        }
 
-                       caps = gst_caps_new_simple("video/x-raw-yuv",
-                                                  "format", GST_TYPE_FOURCC, sc->fourcc,
-                                                  "width", G_TYPE_INT, set_width,
-                                                  "height", G_TYPE_INT, set_height,
-                                                  "framerate", GST_TYPE_FRACTION, fps, 1,
-                                                  "rotate", G_TYPE_INT, 0,
-                                                  NULL);
-                       if (caps == NULL) {
-                               _mmcam_dbg_err("failed to create caps");
-                               ret = MM_ERROR_CAMCORDER_LOW_MEMORY;
-                               goto cmd_error;
+                       mm_camcorder_get_attributes(handle, &err_name,
+                               MMCAM_CAMERA_ROTATION, &rotation,
+                               NULL);
+                       if (err_name) {
+                               _mmcam_dbg_warn("get_attributes err %s", err_name);
+                               SAFE_FREE(err_name);
                        }
 
-                       info->resolution_change = TRUE;
-                       MMCAMCORDER_G_OBJECT_SET( sc->element[_MMCAMCORDER_VIDEOSRC_FILT].gst, "caps", caps);
-                       gst_caps_unref(caps);
+                       /* set new caps */
+                       ret = _mmcamcorder_set_videosrc_caps(handle, sc->fourcc, set_width, set_height, fps, rotation);
+                       if (!ret) {
+                               _mmcam_dbg_err("_mmcamcorder_set_videosrc_caps failed");
+                               ret = MM_ERROR_CAMCORDER_INTERNAL;
+                               goto cmd_done;
+                       }
 
-                       /*MMCAMCORDER_G_OBJECT_SET( sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "num-buffers", info->count);*/
-                       MMCAMCORDER_G_OBJECT_SET( sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "req-negotiation",TRUE);
+                       info->resolution_change = TRUE;
 
-                       /* FIXME: consider delay */
-                       clock = gst_pipeline_get_clock(GST_PIPELINE(pipeline));
-                       sc->stillshot_time = gst_clock_get_time(clock) - gst_element_get_base_time(GST_ELEMENT(pipeline));
-                       MMCAMCORDER_G_OBJECT_SET( sc->element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "block", FALSE);
+                       /* make pipeline state as PLAYING */
+                       ret = _mmcamcorder_gst_set_state(handle, sc->element[_MMCAMCORDER_MAIN_PIPE].gst, GST_STATE_PLAYING);
+                       if (ret != MM_ERROR_NONE) {
+                               _mmcam_dbg_err("failed to set state PLAYING %x", ret);
+                               goto cmd_done;
+                       }
 
                        _mmcam_dbg_log("Change to target resolution(%d, %d)", set_width, set_height);
                } else {
                        _mmcam_dbg_log("No need to change resolution. Open toggle now.");
-                       MMCAMCORDER_G_OBJECT_SET( sc->element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "block", FALSE);
+                       info->resolution_change = FALSE;
+               }
+
+               /* add encodesinkbin */
+               ret = _mmcamcorder_create_stillshot_pipeline((MMHandleType)hcamcorder);
+               if (ret != MM_ERROR_NONE) {
+                       _mmcam_dbg_err("failed to create encodesinkbin %x", ret);
+                       goto cmd_done;
+               }
+
+               ret = mm_camcorder_get_attributes(handle, &err_name,
+                       MMCAM_IMAGE_ENCODER_QUALITY, &cap_jpeg_quality,
+                       NULL);
+               if (err_name) {
+                       _mmcam_dbg_warn("get_attributes err %s, ret 0x%x", err_name, ret);
+                       SAFE_FREE(err_name);
+               }
+
+               /* set JPEG quality */
+               MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_ENCSINK_IENC].gst, "quality", cap_jpeg_quality);
+
+               /* set handoff signal as TRUE */
+               MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_ENCSINK_SINK].gst, "signal-handoffs", TRUE);
+               MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "block", FALSE);
+
+               /* Prepare for the shutter sound when it's the bencbin mode capture */
+               sc->info_video->is_firstframe = TRUE;
+
+               /* set push encoding buffer as TRUE */
+               sc->info_video->push_encoding_buffer = PUSH_ENCODING_BUFFER_INIT;
+
+               /* make encode pipeline state as PLAYING */
+               ret = _mmcamcorder_gst_set_state(handle, sc->encode_element[_MMCAMCORDER_ENCODE_MAIN_PIPE].gst, GST_STATE_PLAYING);
+               if (ret != MM_ERROR_NONE) {
+                       _mmcam_dbg_err("failed to set state PLAYING %x", ret);
+                       goto cmd_done;
                }
        }
 
        /* Play capture sound here if single capture */
-       if (info->type == _MMCamcorder_SINGLE_SHOT) {
-               _mmcamcorder_sound_solo_play(handle, _MMCAMCORDER_FILEPATH_CAPTURE_SND, FALSE);
+       if ((info->type == _MMCamcorder_SINGLE_SHOT &&
+            (hcamcorder->support_zsl_capture == FALSE ||
+             strobe_mode == MM_CAMCORDER_STROBE_MODE_OFF)) ||
+           info->hdr_capture_mode) {
+               if (current_state < MM_CAMCORDER_STATE_RECORDING &&
+                   hcamcorder->support_zsl_capture == TRUE &&
+                   !info->hdr_capture_mode) {
+                       _mmcamcorder_sound_solo_play((MMHandleType)hcamcorder, _MMCAMCORDER_SAMPLE_SOUND_NAME_CAPTURE01, FALSE);
+               }
+
+               /* set flag */
+               info->played_capture_sound = TRUE;
+       } else {
+               /* set flag */
+               info->played_capture_sound = FALSE;
        }
 
-cmd_error:
+cmd_done:
+       if (ret != MM_ERROR_NONE)
+               info->capturing = FALSE;
+
        return ret;
 }
 
@@ -472,20 +606,14 @@ int _mmcamcorder_image_cmd_preview_start(MMHandleType handle)
        int width = 0;
        int height = 0;
        int fps = 0;
-       int cap_width = 0;
-       int cap_height = 0;
        int rotation = 0;
-       int input_index = 0;
-       int set_width = 0;
-       int set_height = 0;
-       int set_rotate = 0;
-       int current_framecount = 0;
+       unsigned int current_framecount = 0;
+       int current_state = MM_CAMCORDER_STATE_NONE;
        gboolean fps_auto = FALSE;
        char *err_name = NULL;
-       char *videosrc_name = NULL;
+       const char *videosrc_name = NULL;
 
        GstState state;
-       GstCaps *caps = NULL;
        GstElement *pipeline = NULL;
        GstCameraControl *control = NULL;
 
@@ -497,19 +625,17 @@ int _mmcamcorder_image_cmd_preview_start(MMHandleType handle)
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
        sc = MMF_CAMCORDER_SUBCONTEXT(handle);
-       mmf_return_val_if_fail(sc && sc->info && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
+       mmf_return_val_if_fail(sc && sc->info_image && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
-       _mmcam_dbg_log("");
+       /*_mmcam_dbg_log("");*/
 
        pipeline = sc->element[_MMCAMCORDER_MAIN_PIPE].gst;
-       info = sc->info;
+       info = sc->info_image;
 
-       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", TRUE);
-
-       _mmcamcorder_conf_get_element(hcamcorder->conf_main,
-                                     CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
-                                     "VideosrcElement",
-                                     &VideosrcElement);
+       _mmcamcorder_conf_get_element(handle, hcamcorder->conf_main,
+               CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
+               "VideosrcElement",
+               &VideosrcElement);
 
        _mmcamcorder_conf_get_value_element_name(VideosrcElement, &videosrc_name);
 
@@ -517,29 +643,20 @@ int _mmcamcorder_image_cmd_preview_start(MMHandleType handle)
        sc->previous_slot_time = 0;
 
        /* Image info */
-       info->capture_cur_count = 0;
-       info->capture_send_count = 0;
        info->next_shot_time = 0;
        info->multi_shot_stop = TRUE;
        info->capturing = FALSE;
 
        _mmcamcorder_vframe_stablize(handle);
 
-       if (!strcmp(videosrc_name, "avsysvideosrc") || !strcmp(videosrc_name, "camerasrc")) {
-               _mmcam_dbg_log("Capture Preview start : avsysvideosrc - No need to set new caps.");
-
-               ret = mm_camcorder_get_attributes(handle, &err_name,
-                                                 MMCAM_CAMERA_FPS_AUTO, &fps_auto,
-                                                 NULL);
-               if (ret != MM_ERROR_NONE) {
-                       _mmcam_dbg_warn("Get attrs fail. (%s:%x)", err_name, ret);
-                       SAFE_FREE (err_name);
-                       goto cmd_error;
-               }
+       current_state = _mmcamcorder_get_state(handle);
+       _mmcam_dbg_log("current state [%d]", current_state);
 
-               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "fps-auto", fps_auto);
+       if (!sc->bencbin_capture) {
+               _mmcam_dbg_log("Preview start");
 
-               if (_mmcamcorder_get_state(handle) == MM_CAMCORDER_STATE_CAPTURING) {
+               /* just set capture stop command if current state is CAPTURING */
+               if (current_state == MM_CAMCORDER_STATE_CAPTURING) {
                        if (!GST_IS_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst)) {
                                _mmcam_dbg_err("Can't cast Video source into camera control.");
                                return MM_ERROR_CAMCORDER_NOT_SUPPORTED;
@@ -551,127 +668,160 @@ int _mmcamcorder_image_cmd_preview_start(MMHandleType handle)
                        current_framecount = sc->kpi.video_framecount;
                        MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, "stop-video", FALSE);
                        if (info->type == _MMCamcorder_SINGLE_SHOT) {
+                               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst, "empty-buffers", FALSE);
                                MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", FALSE);
                        }
-               }
-       } else {
-               /* check if resolution need to rollback */
-               ret = mm_camcorder_get_attributes(handle, &err_name,
-                                                 MMCAM_CAMERA_DEVICE, &input_index,
-                                                 MMCAM_CAMERA_WIDTH, &width,
-                                                 MMCAM_CAMERA_HEIGHT, &height,
-                                                 MMCAM_CAMERA_FPS, &fps,
-                                                 MMCAM_CAMERA_FPS_AUTO, &fps_auto,
-                                                 MMCAM_CAMERA_ROTATION, &rotation,
-                                                 MMCAM_CAPTURE_WIDTH, &cap_width,
-                                                 MMCAM_CAPTURE_HEIGHT, &cap_height,
-                                                 NULL);
-               if (ret != MM_ERROR_NONE) {
-                       _mmcam_dbg_warn("Get attrs fail. (%s:%x)", err_name, ret);
-                       SAFE_FREE (err_name);
-                       goto cmd_error;
-               }
-
-               if (_mmcamcorder_get_state((MMHandleType)hcamcorder) == MM_CAMCORDER_STATE_CAPTURING) {
-                       switch (rotation) {
-                       case MM_VIDEO_INPUT_ROTATION_90:
-                               set_width = height;
-                               set_height = width;
-                               set_rotate = 90;
-                               break;
-                       case MM_VIDEO_INPUT_ROTATION_180:
-                               set_width = width;
-                               set_height = height;
-                               set_rotate = 180;
-                               break;
-                       case MM_VIDEO_INPUT_ROTATION_270:
-                               set_width = height;
-                               set_height = width;
-                               set_rotate = 270;
-                               break;
-                       case MM_VIDEO_INPUT_ROTATION_NONE:
-                       default:
-                               set_width = width;
-                               set_height = height;
-                               set_rotate = 0;
-                               break;
+               } else {
+                       int focus_mode = 0;
+                       mmf_attrs_t *attr = (mmf_attrs_t *)MMF_CAMCORDER_ATTRS(handle);
+
+                       /* This case is starting of preview */
+                       ret = mm_camcorder_get_attributes(handle, &err_name,
+                               MMCAM_CAMERA_FPS_AUTO, &fps_auto,
+                               MMCAM_CAMERA_FOCUS_MODE, &focus_mode,
+                               NULL);
+                       if (ret != MM_ERROR_NONE) {
+                               _mmcam_dbg_warn("Get attrs fail. (%s:%x)", err_name, ret);
+                               SAFE_FREE(err_name);
                        }
 
-                       caps = gst_caps_new_simple("video/x-raw-yuv",
-                                                  "format", GST_TYPE_FOURCC, sc->fourcc,
-                                                  "width", G_TYPE_INT, set_width,
-                                                  "height", G_TYPE_INT,set_height,
-                                                  "framerate", GST_TYPE_FRACTION, fps, 1,
-                                                  "rotate", G_TYPE_INT, set_rotate,
-                                                  NULL);
-                       if (caps != NULL) {
-                               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_FILT].gst, "caps", caps);
-                               gst_caps_unref(caps);
-                               _mmcam_dbg_log("Rollback to original resolution(%d, %d)", width, height);
+                       _mmcam_dbg_log("focus mode %d", focus_mode);
+
+                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "fps-auto", fps_auto);
+
+                       /* set focus mode */
+                       if (attr) {
+                               if (_mmcamcorder_check_supported_attribute(handle, MM_CAM_CAMERA_FOCUS_MODE)) {
+                                       mmf_attribute_set_modified(&(attr->items[MM_CAM_CAMERA_FOCUS_MODE]));
+                                       if (mmf_attrs_commit((MMHandleType)attr) == -1) {
+                                               _mmcam_dbg_err("set focus mode error");
+                                       } else {
+                                               _mmcam_dbg_log("set focus mode success");
+                                       }
+                               } else {
+                                       _mmcam_dbg_log("focus mode is not supported");
+                               }
                        } else {
-                               _mmcam_dbg_err("failed to create caps");
-                               ret = MM_ERROR_CAMCORDER_LOW_MEMORY;
-                               goto cmd_error;
+                               _mmcam_dbg_err("failed to get attributes");
                        }
                }
        }
 
+       /* init prev_time */
+       sc->info_video->prev_preview_ts = 0;
+
        gst_element_get_state(pipeline, &state, NULL, -1);
 
        if (state == GST_STATE_PLAYING) {
-               if (!strcmp(videosrc_name, "avsysvideosrc") || !strcmp(videosrc_name, "camerasrc")) {
+               if (!sc->bencbin_capture) {
                        int try_count = 0;
 
-                       __ta__( "    Wait preview frame after capture",
-                       while (current_framecount >= sc->kpi.video_framecount &&
-                              try_count++ < _MMCAMCORDER_CAPTURE_STOP_CHECK_COUNT) {
-                               usleep(_MMCAMCORDER_CAPTURE_STOP_CHECK_INTERVAL);
+                       if (hcamcorder->support_zsl_capture == FALSE) {
+                               mmf_attrs_t *attr = (mmf_attrs_t *)MMF_CAMCORDER_ATTRS(handle);
+
+                               /* Set strobe mode - strobe mode can not be set to driver while captuing */
+                               if (attr) {
+                                       mmf_attribute_set_modified(&(attr->items[MM_CAM_STROBE_MODE]));
+                                       if (mmf_attrs_commit((MMHandleType) attr) == -1) {
+                                               _mmcam_dbg_warn("Failed to set strobe mode");
+                                       }
+                               }
+
+                               while (current_framecount >= sc->kpi.video_framecount &&
+                                       try_count++ < _MMCAMCORDER_CAPTURE_STOP_CHECK_COUNT) {
+                                       usleep(_MMCAMCORDER_CAPTURE_STOP_CHECK_INTERVAL);
+                               }
                        }
-                       );
 
                        if (info->type == _MMCamcorder_MULTI_SHOT) {
-                               MMCAMCORDER_G_OBJECT_SET( sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", FALSE);
+                               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst, "empty-buffers", FALSE);
+                               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", FALSE);
                        }
 
                        _mmcam_dbg_log("Wait Frame Done. count before[%d],after[%d], try_count[%d]",
-                                      current_framecount, sc->kpi.video_framecount, try_count);
+                                                  current_framecount, sc->kpi.video_framecount, try_count);
                } else {
-                       ret = _mmcamcorder_gst_set_state(handle, pipeline, GST_STATE_READY);
-                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", FALSE);
-
-                       if (ret != MM_ERROR_NONE) {
+                       ret = _mmcamcorder_remove_stillshot_pipeline(handle);
+                       if (ret != MM_ERROR_NONE)
                                goto cmd_error;
-                       }
 
-                       ret = _mmcamcorder_gst_set_state(handle, pipeline, GST_STATE_PLAYING);
-                       if (ret != MM_ERROR_NONE) {
-                               goto cmd_error;
+                       if (info->resolution_change) {
+                               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst, "empty-buffers", TRUE);
+                               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", TRUE);
+
+                               ret = _mmcamcorder_gst_set_state(handle, pipeline, GST_STATE_READY);
+
+                               /* check decoder recreation */
+                               if (!_mmcamcorder_recreate_decoder_for_encoded_preview(handle)) {
+                                       _mmcam_dbg_err("_mmcamcorder_recreate_decoder_for_encoded_preview failed");
+                                       return MM_ERROR_CAMCORDER_INTERNAL;
+                               }
+
+                               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", FALSE);
+                               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst, "empty-buffers", FALSE);
+
+                               if (ret != MM_ERROR_NONE)
+                                       goto cmd_error;
+
+                               /* check if resolution need to rollback */
+                               mm_camcorder_get_attributes(handle, &err_name,
+                                       MMCAM_CAMERA_WIDTH, &width,
+                                       MMCAM_CAMERA_HEIGHT, &height,
+                                       MMCAM_CAMERA_FPS, &fps,
+                                       MMCAM_CAMERA_ROTATION, &rotation,
+                                       NULL);
+                               if (err_name) {
+                                       _mmcam_dbg_warn("get_attributes err %s, ret 0x%x", err_name, ret);
+                                       SAFE_FREE(err_name);
+                               }
+
+                               /* set new caps */
+                               ret = _mmcamcorder_set_videosrc_caps(handle, sc->fourcc, width, height, fps, rotation);
+                               if (!ret) {
+                                       _mmcam_dbg_err("_mmcamcorder_set_videosrc_caps failed");
+                                       ret = MM_ERROR_CAMCORDER_INTERNAL;
+                                       goto cmd_error;
+                               }
+
+                               ret = _mmcamcorder_gst_set_state(handle, pipeline, GST_STATE_PLAYING);
+                               if (ret != MM_ERROR_NONE)
+                                       goto cmd_error;
                        }
                }
+
+               /* sound finalize */
+               if (info->type == _MMCamcorder_MULTI_SHOT)
+                       _mmcamcorder_sound_finalize(handle);
        } else {
-               int cap_count = 0;
-               int sound_ret = FALSE;
+               if (info->preview_format == MM_PIXEL_FORMAT_ENCODED_H264) {
+                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "bitrate", H264_PREVIEW_BITRATE);
+                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "newgop-interval", H264_PREVIEW_NEWGOP_INTERVAL);
+               }
+
+               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst, "empty-buffers", FALSE);
+               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", FALSE);
 
-               MMCAMCORDER_G_OBJECT_SET( sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", FALSE);
+               traceBegin(TTRACE_TAG_CAMERA, "MMCAMCORDER:START:SET_PLAYING_TO_PIPELINE");
 
-               __ta__("        _MMCamcorder_CMD_PREVIEW_START:GST_STATE_PLAYING",  
                ret = _mmcamcorder_gst_set_state(handle, pipeline, GST_STATE_PLAYING);
-               );
-               if (ret != MM_ERROR_NONE) {
+
+               traceEnd(TTRACE_TAG_CAMERA);
+
+               if (ret != MM_ERROR_NONE)
                        goto cmd_error;
-               }
 
-               mm_camcorder_get_attributes(handle, NULL, MMCAM_CAPTURE_COUNT, &cap_count, NULL);
-               if (cap_count > 1) {
-                       __ta__("_mmcamcorder_sound_init",
-                       sound_ret = _mmcamcorder_sound_init(handle, _MMCAMCORDER_FILEPATH_CAPTURE2_SND);
-                       );
-                       if (sound_ret) {
-                               __ta__("_mmcamcorder_sound_prepare",
-                               sound_ret = _mmcamcorder_sound_prepare(handle);
-                               );
-                               _mmcam_dbg_log("sound prepare [%d]", sound_ret);
-                       }
+               /* get sound status/volume level and register changed_cb */
+               if (hcamcorder->shutter_sound_policy == VCONFKEY_CAMERA_SHUTTER_SOUND_POLICY_OFF &&
+                   info->sound_status == _SOUND_STATUS_INIT) {
+                       _mmcam_dbg_log("register vconf changed_cb and get sound status");
+
+                       /* register changed_cb */
+                       vconf_notify_key_changed(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL, __sound_status_changed_cb, hcamcorder);
+
+                       /* get sound status */
+                       vconf_get_bool(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL, &(info->sound_status));
+
+                       _mmcam_dbg_log("sound status %d", info->sound_status);
                }
        }
 
@@ -683,6 +833,11 @@ cmd_error:
 int _mmcamcorder_image_cmd_preview_stop(MMHandleType handle)
 {
        int ret = MM_ERROR_NONE;
+       int strobe_mode = MM_CAMCORDER_STROBE_MODE_OFF;
+       int set_strobe = 0;
+       int display_reuse_hint = FALSE;
+       GstCameraControl *control = NULL;
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
        GstElement *pipeline = NULL;
 
@@ -690,1061 +845,1272 @@ int _mmcamcorder_image_cmd_preview_stop(MMHandleType handle)
 
        _mmcam_dbg_log("");
 
-       mmf_return_val_if_fail(handle, 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 && sc->info && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
+       mmf_return_val_if_fail(sc && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
+
+       /* check strobe and set OFF if PERMANENT mode */
+       mm_camcorder_get_attributes(handle, NULL,
+               MMCAM_STROBE_MODE, &strobe_mode,
+               NULL);
+       if (strobe_mode == MM_CAMCORDER_STROBE_MODE_PERMANENT &&
+           GST_IS_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst)) {
+               _mmcam_dbg_log("current strobe mode is PERMANENT, set OFF");
+
+               /* get camera control */
+               control = GST_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst);
+               if (control) {
+                       /* convert MSL to sensor value */
+                       set_strobe = _mmcamcorder_convert_msl_to_sensor(handle, MM_CAM_STROBE_MODE, MM_CAMCORDER_STROBE_MODE_OFF);
+
+                       /* set strobe OFF */
+                       gst_camera_control_set_strobe(control, GST_CAMERA_CONTROL_STROBE_MODE, set_strobe);
+
+                       _mmcam_dbg_log("set strobe OFF done - value: %d", set_strobe);
+               } else {
+                       _mmcam_dbg_warn("cast CAMERA_CONTROL failed");
+               }
+       }
 
        pipeline = sc->element[_MMCAMCORDER_MAIN_PIPE].gst;
 
+       if (sc->encode_element[_MMCAMCORDER_ENCODE_MAIN_PIPE].gst) {
+               _mmcam_dbg_log("pipeline is exist so need to remove pipeline and sc->encode_element[_MMCAMCORDER_ENCODE_MAIN_PIPE].gst=%p",
+                       sc->encode_element[_MMCAMCORDER_ENCODE_MAIN_PIPE].gst);
+               _mmcamcorder_remove_recorder_pipeline(handle);
+       }
+
+       mm_camcorder_get_attributes(handle, NULL,
+               MMCAM_DISPLAY_REUSE_HINT, &display_reuse_hint,
+               NULL);
+
+       _mmcam_dbg_log("display reuse hint %d", display_reuse_hint);
+
+       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, "keep-camera-preview", display_reuse_hint);
+
+       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst, "empty-buffers", TRUE);
        MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", TRUE);
+
+       traceBegin(TTRACE_TAG_CAMERA, "MMCAMCORDER:STOP:SET_READY_TO_PIPELINE");
+
        ret = _mmcamcorder_gst_set_state(handle, pipeline, GST_STATE_READY);
+
+       traceEnd(TTRACE_TAG_CAMERA);
+
        MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", FALSE);
+       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst, "empty-buffers", FALSE);
+
+       if (display_reuse_hint)
+               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, "keep-camera-preview", FALSE);
+
+       /* deregister sound status callback */
+       if (sc->info_image->sound_status != _SOUND_STATUS_INIT) {
+               _mmcam_dbg_log("deregister sound status callback");
+
+               vconf_ignore_key_changed(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL, __sound_status_changed_cb);
+
+               sc->info_image->sound_status = _SOUND_STATUS_INIT;
+       }
 
        return ret;
 }
 
 
-int _mmcamcorder_image_cmd_capture_with_encbin(MMHandleType handle)
+int _mmcamcorder_video_capture_command(MMHandleType handle, int command)
 {
        int ret = MM_ERROR_NONE;
-       int UseCaptureMode = 0;
-       int width = 0;
-       int height = 0;
-       int fps = 0;
-       int cap_format = MM_PIXEL_FORMAT_ENCODED;
-       int cap_jpeg_quality = 0;
-       int image_encoder = MM_IMAGE_CODEC_JPEG;
-       unsigned int cap_fourcc = GST_MAKE_FOURCC('J','P','E','G');
-       char *err_name = NULL;
-       char *videosrc_name = NULL;
-
-       GstCaps *caps = NULL;
-       GstClock *clock = NULL;
-       GstElement *pipeline = NULL;
-       GstCameraControl *control = NULL;
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-       _MMCamcorderImageInfo *info = NULL;
        _MMCamcorderSubContext *sc = NULL;
-       type_element *VideosrcElement = NULL;
 
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
-       sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
-       mmf_return_val_if_fail(sc && sc->info && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
-
-       _mmcam_dbg_log("");
+       sc = MMF_CAMCORDER_SUBCONTEXT(handle);
+       mmf_return_val_if_fail(sc && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
-       pipeline = sc->element[_MMCAMCORDER_MAIN_PIPE].gst;
-       info = sc->info;
+       _mmcam_dbg_log("command %d", command);
 
-       _mmcamcorder_conf_get_value_int(hcamcorder->conf_main,
-                                       CONFIGURE_CATEGORY_MAIN_CAPTURE,
-                                       "UseCaptureMode",
-                                       &UseCaptureMode);
+       switch (command) {
+       case _MMCamcorder_CMD_CAPTURE:
+               ret = _mmcamcorder_image_cmd_capture(handle);
+               break;
+       case _MMCamcorder_CMD_PREVIEW_START:
+               ret = _mmcamcorder_image_cmd_preview_start(handle);
 
-       _mmcamcorder_conf_get_element(hcamcorder->conf_main,
-                                     CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
-                                     "VideosrcElement",
-                                     &VideosrcElement);
+               /* I place this function last because it miscalculates a buffer that sents in GST_STATE_PAUSED */
+               _mmcamcorder_video_current_framerate_init(handle);
+               break;
+       case _MMCamcorder_CMD_PREVIEW_STOP:
+               ret = _mmcamcorder_image_cmd_preview_stop(handle);
+               break;
+       case _MMCamcorder_CMD_RECORD:
+       case _MMCamcorder_CMD_PAUSE:
+       case _MMCamcorder_CMD_CANCEL:
+       case _MMCamcorder_CMD_COMMIT:
+               /* video recording command */
+               ret = _mmcamcorder_video_command(handle, command);
+               break;
+       default:
+               ret =  MM_ERROR_CAMCORDER_INVALID_ARGUMENT;
+               break;
+       }
 
-       _mmcamcorder_conf_get_value_element_name(VideosrcElement, &videosrc_name);
+       return ret;
+}
 
-       if (info->capturing) {
-               ret = MM_ERROR_CAMCORDER_DEVICE_BUSY;
-               goto cmd_error;
-       }
 
-       MMTA_ACUM_ITEM_BEGIN("Real First Capture Start",false);
+void __mmcamcorder_init_stillshot_info(MMHandleType handle)
+{
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
+       _MMCamcorderSubContext *sc = NULL;
+       _MMCamcorderImageInfo *info = NULL;
 
-       info->capturing = TRUE;
+       mmf_return_if_fail(hcamcorder);
 
-       ret = mm_camcorder_get_attributes(handle, &err_name,
-                                         MMCAM_IMAGE_ENCODER_QUALITY, &cap_jpeg_quality,
-                                         MMCAM_IMAGE_ENCODER, &image_encoder,
-                                         MMCAM_CAMERA_WIDTH, &width,
-                                         MMCAM_CAMERA_HEIGHT, &height,
-                                         MMCAM_CAMERA_FPS, &fps,
-                                         MMCAM_CAPTURE_FORMAT, &cap_format,
-                                         MMCAM_CAPTURE_WIDTH, &info->width,
-                                         MMCAM_CAPTURE_HEIGHT, &info->height,
-                                         MMCAM_CAPTURE_COUNT, &info->count,
-                                         MMCAM_CAPTURE_INTERVAL, &info->interval,
-                                         NULL);
-       if (ret != MM_ERROR_NONE) {
-               _mmcam_dbg_err("Get attrs fail. (%s:%x)", err_name, ret);
-               SAFE_FREE (err_name);
-               goto cmd_error;
-       }
+       sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
+       mmf_return_if_fail(sc && sc->info_image);
 
-       if (info->count < 1) {
-               _mmcam_dbg_err("capture count[%d] is invalid", info->count);
-               ret = MM_ERROR_CAMCORDER_INVALID_ARGUMENT;
-               goto cmd_error;
-       } else if (info->count == 1) {
-               info->type = _MMCamcorder_SINGLE_SHOT;
-       } else {
-               info->type = _MMCamcorder_MULTI_SHOT;
+       info = sc->info_image;
+
+       _mmcam_dbg_log("capture type[%d], capture send count[%d]", info->type, info->capture_send_count);
+
+       if (info->type == _MMCamcorder_SINGLE_SHOT || info->capture_send_count == info->count) {
                info->capture_cur_count = 0;
                info->capture_send_count = 0;
+               info->multi_shot_stop = TRUE;
                info->next_shot_time = 0;
-               info->multi_shot_stop = FALSE;
+
+               /* capturing flag set to FALSE here */
+               info->capturing = FALSE;
        }
 
-       _mmcam_dbg_log("videosource(%dx%d), capture(%dx%d), count(%d)",
-                      width, height, info->width, info->height, info->count);
+       return;
+}
 
-       if (!strcmp(videosrc_name, "avsysvideosrc") || !strcmp(videosrc_name, "camerasrc")) {
-               cap_fourcc = _mmcamcorder_get_fourcc(cap_format, image_encoder, hcamcorder->use_zero_copy_format);
-               _mmcam_dbg_log("capture format (%d), jpeg quality (%d)", cap_format, cap_jpeg_quality);
 
-               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "capture-fourcc", cap_fourcc);
-               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "capture-interval", info->interval);
-               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "capture-width", info->width);
-               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "capture-height", info->height);
-               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "capture-count", info->count);
-               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "capture-jpg-quality", cap_jpeg_quality);
+int __mmcamcorder_capture_save_exifinfo(MMHandleType handle, MMCamcorderCaptureDataType *original, MMCamcorderCaptureDataType *thumbnail, int provide_exif)
+{
+       int ret = MM_ERROR_NONE;
+       unsigned char *data = NULL;
+       unsigned int datalen = 0;
+       _MMCamcorderSubContext *sc = NULL;
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
-               if (!GST_IS_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst)) {
-                       _mmcam_dbg_err("Can't cast Video source into camera control.");
-                       return MM_ERROR_CAMCORDER_NOT_SUPPORTED;
-               }
+       mmf_return_val_if_fail(hcamcorder, FALSE);
+       sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
+       mmf_return_val_if_fail(sc, FALSE);
 
-               control = GST_CAMERA_CONTROL( sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst );
-               gst_camera_control_set_capture_command( control, GST_CAMERA_CONTROL_CAPTURE_COMMAND_START );
-       } else {
-               int need_change = 0;
-               int set_width = 0;
-               int set_height = 0;
+       _mmcam_dbg_log("");
 
-               if (UseCaptureMode) {
-                       if (width != MMFCAMCORDER_HIGHQUALITY_WIDTH || height != MMFCAMCORDER_HIGHQUALITY_HEIGHT) {
-                               need_change = 1;
-                       }
+       if (!original || original->data == NULL || original->length == 0) {
+               if (!original) {
+                       _mmcam_dbg_log("original is null");
                } else {
-                       if (width != info->width || height != info->height) {
-                               need_change = 1;
-                       }
+                       _mmcam_dbg_log("data=%p, length=%d", original->data, original->length);
                }
 
-               if (need_change) {
-                       _mmcam_dbg_log("Need to change resolution");
+               return MM_ERROR_CAMCORDER_INVALID_ARGUMENT;
+       } else {
+               /* original is input/output param. save original values to local var. */
+               data = original->data;
+               datalen = original->length;
+       }
 
-                       if (UseCaptureMode) {
-                               set_width = MMFCAMCORDER_HIGHQUALITY_WIDTH;
-                               set_height = MMFCAMCORDER_HIGHQUALITY_HEIGHT;
-                       } else {
-                               set_width = info->width;
-                               set_height = info->height;
-                       }
+       if (provide_exif == FALSE) {
+               if (thumbnail) {
+                       if (thumbnail->data && thumbnail->length > 0) {
+                               _mmcam_dbg_log("thumbnail is added!thumbnail->data=%p thumbnail->width=%d ,thumbnail->height=%d",
+                                       thumbnail->data, thumbnail->width, thumbnail->height);
 
-                       caps = gst_caps_new_simple("video/x-raw-yuv",
-                                                  "format", GST_TYPE_FOURCC, sc->fourcc,
-                                                  "width", G_TYPE_INT, set_width,
-                                                  "height", G_TYPE_INT, set_height,
-                                                  "framerate", GST_TYPE_FRACTION, fps, 1,
-                                                  "rotate", G_TYPE_INT, 0,
-                                                  NULL);
-                       if (caps == NULL) {
-                               _mmcam_dbg_err("failed to create caps");
-                               ret = MM_ERROR_CAMCORDER_LOW_MEMORY;
-                               goto cmd_error;
+                               /* add thumbnail exif info */
+                               ret = mm_exif_add_thumbnail_info(hcamcorder->exif_info,
+                                       thumbnail->data,
+                                       thumbnail->width,
+                                       thumbnail->height,
+                                       thumbnail->length);
+                       } else {
+                               _mmcam_dbg_err("Skip adding thumbnail (data=%p, length=%d)",
+                                       thumbnail->data, thumbnail->length);
                        }
-
-                       info->resolution_change = TRUE;
-                       MMCAMCORDER_G_OBJECT_SET( sc->element[_MMCAMCORDER_VIDEOSRC_FILT].gst, "caps", caps);
-                       gst_caps_unref(caps);
-                       
-                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "req-negotiation",TRUE);
-
-                       /* FIXME: consider delay */
-                       clock = gst_pipeline_get_clock(GST_PIPELINE(pipeline));
-                       sc->stillshot_time = gst_clock_get_time(clock) - gst_element_get_base_time(GST_ELEMENT(pipeline));
-                       _mmcam_dbg_log("Change to target resolution(%d, %d)", info->width, info->height);
-                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_ENCSINK_SINK].gst,"signal-handoffs",TRUE);
-                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "block", FALSE);
-
-               } else {
-                       _mmcam_dbg_log("No need to change resolution. Open toggle now.");
-                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_ENCSINK_SINK].gst,"signal-handoffs",TRUE);
-                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "block", FALSE);
                }
+       } else {
+               ret = MM_ERROR_NONE;
        }
 
-       /* Play capture sound here if single capture */
-       if (info->type == _MMCamcorder_SINGLE_SHOT) {
-               _mmcamcorder_sound_solo_play(handle, _MMCAMCORDER_FILEPATH_CAPTURE_SND, FALSE);
+       if (ret == MM_ERROR_NONE) {
+               /* write jpeg with exif */
+               ret = mm_exif_write_exif_jpeg_to_memory(&original->data, &original->length, hcamcorder->exif_info, data, datalen);
+               if (ret != MM_ERROR_NONE)
+                       _mmcam_dbg_err("mm_exif_write_exif_jpeg_to_memory error! [0x%x]", ret);
        }
 
-cmd_error:
+       _mmcam_dbg_log("END ret 0x%x", ret);
+
        return ret;
 }
 
 
-int _mmcamcorder_image_cmd_preview_start_with_encbin(MMHandleType handle)
+void __mmcamcorder_get_capture_data_from_buffer(MMCamcorderCaptureDataType *capture_data, int pixtype, GstSample *sample)
 {
-       int ret = MM_ERROR_NONE;
-       int width = 0;
-       int height = 0;
-       int fps = 0;
-       int cap_width = 0;
-       int cap_height = 0;
-       int rotation = 0;
-       int input_index = 0;
-       int set_width = 0;
-       int set_height = 0;
-       int set_rotate = 0;
-       int current_framecount = 0;
-       int current_state = MM_CAMCORDER_STATE_NONE;
-       gboolean fps_auto = FALSE;
-       char *err_name = NULL;
-       char *videosrc_name = NULL;
-
-       GstState state = GST_STATE_NULL;
        GstCaps *caps = NULL;
-       GstElement *pipeline = NULL;
-       GstCameraControl *control = NULL;
-
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-       _MMCamcorderImageInfo *info = NULL;
-       _MMCamcorderSubContext *sc = NULL;
-       type_element *VideosrcElement = NULL;
-
-       mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
-
-       sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
-       mmf_return_val_if_fail(sc && sc->info && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
-
-       _mmcam_dbg_log("");
-
-       info = sc->info;
-       pipeline = sc->element[_MMCAMCORDER_MAIN_PIPE].gst;
+       GstMapInfo mapinfo;
+       const GstStructure *structure;
 
-       _mmcamcorder_conf_get_element(hcamcorder->conf_main,
-                                     CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
-                                     "VideosrcElement",
-                                     &VideosrcElement);
+       mmf_return_if_fail(capture_data && sample);
 
-       _mmcamcorder_conf_get_value_element_name(VideosrcElement, &videosrc_name);
+       caps = gst_sample_get_caps(sample);
+       if (caps == NULL) {
+               _mmcam_dbg_err("failed to get caps");
+               goto GET_FAILED;
+       }
 
-       sc->display_interval = 0;
-       sc->previous_slot_time = 0;
+       structure = gst_caps_get_structure(caps, 0);
+       if (structure == NULL) {
+               _mmcam_dbg_err("failed to get structure");
+               goto GET_FAILED;
+       }
 
-       /* init image info */
-       info->capture_cur_count = 0;
-       info->capture_send_count = 0;
-       info->next_shot_time = 0;
-       info->multi_shot_stop = TRUE;
-       info->capturing = FALSE;
+       memset(&mapinfo, 0x0, sizeof(GstMapInfo));
 
-       _mmcamcorder_vframe_stablize(handle);
+       gst_buffer_map(gst_sample_get_buffer(sample), &mapinfo, GST_MAP_READ);
+       capture_data->data = mapinfo.data;
+       capture_data->format = pixtype;
+       gst_structure_get_int(structure, "width", &capture_data->width);
+       gst_structure_get_int(structure, "height", &capture_data->height);
+       capture_data->length = mapinfo.size;
+       gst_buffer_unmap(gst_sample_get_buffer(sample), &mapinfo);
 
-       current_state = _mmcamcorder_get_state(handle);
-       _mmcam_dbg_log("current state [%d]", current_state);
+       _mmcam_dbg_warn("buffer data[%p],size[%dx%d],length[%d],format[%d]",
+               capture_data->data, capture_data->width, capture_data->height,
+               capture_data->length, capture_data->format);
+       return;
 
-       if (!strcmp(videosrc_name, "avsysvideosrc") || !strcmp(videosrc_name, "camerasrc")) {
-               _mmcam_dbg_log("Capture Preview start : %s - No need to set new caps.", videosrc_name);
+GET_FAILED:
+       capture_data->data = NULL;
+       capture_data->format = MM_PIXEL_FORMAT_INVALID;
+       capture_data->length = 0;
 
-               ret = mm_camcorder_get_attributes(handle, &err_name,
-                                                 MMCAM_CAMERA_FPS_AUTO, &fps_auto,
-                                                 NULL);
-               if (ret != MM_ERROR_NONE) {
-                       _mmcam_dbg_warn("Get attrs fail. (%s:%x)", err_name, ret);
-                       SAFE_FREE (err_name);
-                       goto cmd_error;
-               }
+       return;
+}
 
-               /* set fps-auto to videosrc */
-               MMCAMCORDER_G_OBJECT_SET( sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "fps-auto", fps_auto);
 
-               if (current_state == MM_CAMCORDER_STATE_CAPTURING) {
-                       if (!GST_IS_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst)) {
-                               _mmcam_dbg_err("Can't cast Video source into camera control.");
-                               return MM_ERROR_CAMCORDER_NOT_SUPPORTED;
-                       }
+int __mmcamcorder_set_jpeg_data(MMHandleType handle, MMCamcorderCaptureDataType *dest, MMCamcorderCaptureDataType *thumbnail, int provide_exif)
+{
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
+       _MMCamcorderSubContext *sc = NULL;
 
-                       current_framecount = sc->kpi.video_framecount;
+       mmf_return_val_if_fail(hcamcorder && dest, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
 
-                       control = GST_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst);
-                       gst_camera_control_set_capture_command(control, GST_CAMERA_CONTROL_CAPTURE_COMMAND_STOP);
-               }
-       } else {
-               /* check if resolution need to roll back */
-               ret = mm_camcorder_get_attributes(handle, &err_name,
-                                                 MMCAM_CAMERA_DEVICE, &input_index,
-                                                 MMCAM_CAMERA_WIDTH, &width,
-                                                 MMCAM_CAMERA_HEIGHT, &height,
-                                                 MMCAM_CAMERA_FPS, &fps,
-                                                 MMCAM_CAMERA_FPS_AUTO, &fps_auto,
-                                                 MMCAM_CAMERA_ROTATION, &rotation,
-                                                 MMCAM_CAPTURE_WIDTH, &cap_width,
-                                                 MMCAM_CAPTURE_HEIGHT, &cap_height,
-                                                 NULL);
-               if (ret != MM_ERROR_NONE) {
-                       _mmcam_dbg_warn("Get attrs fail. (%s:%x)", err_name, ret);
-                       SAFE_FREE (err_name);
-                       goto cmd_error;
-               }
+       sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
+       mmf_return_val_if_fail(sc, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
-               if (current_state == MM_CAMCORDER_STATE_CAPTURING) {
-                       switch (rotation) {
-                       case MM_VIDEO_INPUT_ROTATION_90:
-                               set_width = height;
-                               set_height = width;
-                               set_rotate = 90;
-                               break;
-                       case MM_VIDEO_INPUT_ROTATION_180:
-                               set_width = width;
-                               set_height = height;
-                               set_rotate = 180;
-                               break;
-                       case MM_VIDEO_INPUT_ROTATION_270:
-                               set_width = height;
-                               set_height = width;
-                               set_rotate = 270;
-                               break;
-                       case MM_VIDEO_INPUT_ROTATION_NONE:
-                       default:
-                               set_width = width;
-                               set_height = height;
-                               set_rotate = 0;
-                               break;
-                       }
+       _mmcam_dbg_log("");
 
-                       caps = gst_caps_new_simple("video/x-raw-yuv",
-                                                  "format", GST_TYPE_FOURCC, sc->fourcc,
-                                                  "width", G_TYPE_INT, set_width,
-                                                  "height", G_TYPE_INT,set_height,
-                                                  "framerate", GST_TYPE_FRACTION, fps, 1,
-                                                  "rotate", G_TYPE_INT, set_rotate,
-                                                  NULL);
-                       if (caps == NULL) {
-                               _mmcam_dbg_err("failed to create caps");
-                               ret = MM_ERROR_CAMCORDER_LOW_MEMORY;
-                               goto cmd_error;
-                       }
+       /* if tag enable and doesn't provide exif, we make it */
+       _mmcam_dbg_log("Add exif information if existed(thumbnail[%p])", thumbnail);
+       if (thumbnail && thumbnail->data)
+               return __mmcamcorder_capture_save_exifinfo(handle, dest, thumbnail, provide_exif);
+       else
+               return __mmcamcorder_capture_save_exifinfo(handle, dest, NULL, provide_exif);
+}
 
-                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_FILT].gst, "caps", caps);
-                       gst_caps_unref(caps);
-                       caps = NULL;
-                       _mmcam_dbg_log("Rollback to original resolution(%d, %d)", width, height);
-               }
-       }
 
-       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", FALSE);
+void __mmcamcorder_release_jpeg_data(MMHandleType handle, MMCamcorderCaptureDataType *dest, int tag_enable, int provide_exif)
+{
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
+       _MMCamcorderSubContext *sc = NULL;
 
-       gst_element_get_state(pipeline, &state, NULL, -1);
+       mmf_return_if_fail(hcamcorder);
+       mmf_return_if_fail(dest);
 
-       if (state == GST_STATE_PLAYING) {
-               if (!strcmp(videosrc_name, "avsysvideosrc") || !strcmp(videosrc_name, "camerasrc")) {
-                       __ta__( "    Wait preview frame after capture",
-                       while (current_framecount == sc->kpi.video_framecount) {
-                               usleep(_MMCAMCORDER_CAPTURE_STOP_CHECK_INTERVAL);
-                       }
-                       );
+       sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
+       mmf_return_if_fail(sc);
 
-                       _mmcam_dbg_log("Wait Frame Done. count before[%d],after[%d]",
-                                      current_framecount, sc->kpi.video_framecount);
-               } else {
-#if 1
-                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", TRUE);
-                       ret = _mmcamcorder_gst_set_state(handle, pipeline, GST_STATE_READY);
-                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", FALSE);
-                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "block", FALSE);
-#else /* This code wasn't work. So rollback to previous code. Plz tell me why. It's weired. */
-                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "block", FALSE);
-                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", FALSE);
-                       ret = _mmcamcorder_gst_set_state(handle, pipeline, GST_STATE_READY);
-#endif
-                       if (ret != MM_ERROR_NONE) {
-                               goto cmd_error;
-                       }
+       _mmcam_dbg_log("tag : %d, provide exif : %d", tag_enable, provide_exif);
 
-                       ret = _mmcamcorder_gst_set_state(handle, pipeline, GST_STATE_PLAYING);
-                       if (ret != MM_ERROR_NONE) {
-                               goto cmd_error;
-                       }
-                       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "block", TRUE);
+       /* if dest->data is allocated in MSL, release it */
+       if (tag_enable && !provide_exif) {
+               if (dest->data) {
+                       free(dest->data);
+                       dest->length = 0;
+                       dest->data = NULL;
+                       _mmcam_dbg_log("Jpeg is released!");
                }
        } else {
-               __ta__("        _MMCamcorder_CMD_PREVIEW_START:GST_STATE_PLAYING",  
-               ret = _mmcamcorder_gst_set_state(handle, pipeline, GST_STATE_PLAYING);
-               );
-               if (ret != MM_ERROR_NONE) {
-                       goto cmd_error;
-               }
+               _mmcam_dbg_log("No need to release");
        }
 
-cmd_error:
-       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_ENCSINK_SINK].gst,"signal-handoffs",FALSE);
-       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "block", TRUE);
-       return ret;
+       return;
 }
 
 
-int _mmcamcorder_image_cmd_preview_stop_with_encbin(MMHandleType handle)
+static void __mmcamcorder_image_capture_cb(GstElement *element, GstSample *sample1, GstSample *sample2, GstSample *sample3, gpointer u_data)
 {
        int ret = MM_ERROR_NONE;
-
-       GstElement *pipeline = NULL;
-
+       int pixtype_main = MM_PIXEL_FORMAT_INVALID;
+       int pixtype_thumb = MM_PIXEL_FORMAT_INVALID;
+       int pixtype_scrnl = MM_PIXEL_FORMAT_INVALID;
+       int codectype = MM_IMAGE_CODEC_JPEG;
+       int attr_index = 0;
+       int count = 0;
+       int stop_cont_shot = FALSE;
+       int tag_enable = FALSE;
+       int provide_exif = FALSE;
+       int capture_quality = 0;
+       int try_lock_count = 0;
+       gboolean send_captured_message = FALSE;
+       unsigned char *exif_raw_data = NULL;
+       unsigned char *internal_main_data = NULL;
+       unsigned int internal_main_length = 0;
+       unsigned char *internal_thumb_data = NULL;
+       unsigned int internal_thumb_length = 0;
+       unsigned char *compare_data = NULL;
+
+       MMCamcorderStateType current_state = MM_CAMCORDER_STATE_NONE;
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(u_data);
+       _MMCamcorderImageInfo *info = NULL;
        _MMCamcorderSubContext *sc = NULL;
+       MMCamcorderCaptureDataType dest = {0,};
+       MMCamcorderCaptureDataType thumb = {0,};
+       MMCamcorderCaptureDataType scrnail = {0,};
+       MMCamcorderCaptureDataType encode_src = {0,};
+       GstMapInfo mapinfo1;
+       GstMapInfo mapinfo2;
+       GstMapInfo mapinfo3;
 
-       _mmcam_dbg_log("");
+       mmf_attrs_t *attrs = NULL;
+       mmf_attribute_t *item_screennail = NULL;
+       mmf_attribute_t *item_exif_raw_data = NULL;
 
-       mmf_return_val_if_fail(handle, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
+       mmf_return_if_fail(hcamcorder);
 
-       sc = MMF_CAMCORDER_SUBCONTEXT(handle);
-       mmf_return_val_if_fail(sc && sc->info && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
+       sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
+       mmf_return_if_fail(sc && sc->info_image);
 
-       pipeline = sc->element[_MMCAMCORDER_MAIN_PIPE].gst;
+       info = sc->info_image;
 
-       /* set signal handler off */
-       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_ENCSINK_SINK].gst,"signal-handoffs",FALSE);
+       memset(&mapinfo1, 0x0, sizeof(GstMapInfo));
+       memset(&mapinfo2, 0x0, sizeof(GstMapInfo));
+       memset(&mapinfo3, 0x0, sizeof(GstMapInfo));
 
-       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "block", FALSE);
-       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst, "empty-buffers", FALSE);
-       ret = _mmcamcorder_gst_set_state(handle, pipeline, GST_STATE_READY);
-       if (ret != MM_ERROR_NONE) {
-               goto cmd_error;
-       }
+       /* get current state */
+       current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder);
 
-cmd_error:
-       return ret;
-}
+       _mmcam_dbg_err("START - current state %d", current_state);
 
+       /* check capture state */
+       if (info->type == _MMCamcorder_MULTI_SHOT && info->capture_send_count > 0)
+               mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL, "capture-break-cont-shot", &stop_cont_shot, NULL);
 
-int _mmcamcorder_image_command(MMHandleType handle, int command)
-{
-       int ret = MM_ERROR_NONE;
+       if (!info->capturing || stop_cont_shot) {
+               _mmcam_dbg_warn("stop command[%d] or not capturing state[%d]. skip this...", stop_cont_shot, info->capturing);
 
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-       _MMCamcorderSubContext *sc = NULL;
+               /*free GstBuffer*/
+               if (sample1)
+                       gst_sample_unref(sample1);
 
-       mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
+               if (sample2)
+                       gst_sample_unref(sample2);
 
-       sc = MMF_CAMCORDER_SUBCONTEXT(handle);
-       mmf_return_val_if_fail(sc && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
+               if (sample3)
+                       gst_sample_unref(sample3);
 
-       _mmcam_dbg_log("command=%d", command);
+               return;
+       }
 
-       switch (command) {
-       case _MMCamcorder_CMD_CAPTURE:
-               if (!sc->bencbin_capture) {
-                       ret = _mmcamcorder_image_cmd_capture(handle);
-               } else {
-                       ret = _mmcamcorder_image_cmd_capture_with_encbin(handle);
+       /* check command lock to block capture callback if capture start API is not returned
+          wait for 2 seconds at worst case */
+       try_lock_count = 0;
+       do {
+               _mmcam_dbg_log("Try command LOCK");
+               if (_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) {
+                       _mmcam_dbg_log("command LOCK OK");
+                       _MMCAMCORDER_UNLOCK_CMD(hcamcorder);
+                       break;
                }
-               break;
-       case _MMCamcorder_CMD_CAPTURE_CANCEL:
-               /* TODO: Is this needed? */
-               break;
-       case _MMCamcorder_CMD_PREVIEW_START:
-               if (!sc->bencbin_capture) {
-                       ret = _mmcamcorder_image_cmd_preview_start(handle);
+
+               if (try_lock_count++ < TRY_LOCK_MAX_COUNT) {
+                       _mmcam_dbg_warn("command LOCK Failed, retry...[count %d]", try_lock_count);
+                       usleep(TRY_LOCK_TIME);
                } else {
-                       ret = _mmcamcorder_image_cmd_preview_start_with_encbin(handle);
+                       _mmcam_dbg_err("failed to lock command LOCK");
+                       break;
                }
-               /* I place this function last because it miscalculates a buffer that sents in GST_STATE_PAUSED */
-               _mmcamcorder_video_current_framerate_init(handle);
-               break;
-       case _MMCamcorder_CMD_PREVIEW_STOP:
-               if (!sc->bencbin_capture) {
-                       ret = _mmcamcorder_image_cmd_preview_stop(handle);
+       } while (TRUE);
+
+       if (current_state < MM_CAMCORDER_STATE_RECORDING) {
+               /* play capture sound here if multi capture
+                  or preview format is ITLV(because of AF and flash control in plugin) */
+               if (info->type == _MMCamcorder_MULTI_SHOT) {
+                       g_mutex_lock(&hcamcorder->task_thread_lock);
+                       _mmcam_dbg_log("send signal for sound play");
+                       hcamcorder->task_thread_state = _MMCAMCORDER_TASK_THREAD_STATE_SOUND_PLAY_START;
+                       g_cond_signal(&hcamcorder->task_thread_cond);
+                       g_mutex_unlock(&hcamcorder->task_thread_lock);
+               } else if (!info->played_capture_sound) {
+                       _mmcamcorder_sound_solo_play((MMHandleType)hcamcorder, _MMCAMCORDER_SAMPLE_SOUND_NAME_CAPTURE01, FALSE);
+               }
+       }
+
+       /* init capture data */
+       memset((void *)&dest, 0x0, sizeof(MMCamcorderCaptureDataType));
+       memset((void *)&thumb, 0x0, sizeof(MMCamcorderCaptureDataType));
+       memset((void *)&scrnail, 0x0, sizeof(MMCamcorderCaptureDataType));
+
+       /* Prepare main, thumbnail buffer */
+       pixtype_main = _mmcamcorder_get_pixel_format(gst_sample_get_caps(sample1));
+       if (pixtype_main == MM_PIXEL_FORMAT_INVALID) {
+               _mmcam_dbg_err("Unsupported pixel type");
+               MMCAM_SEND_MESSAGE(hcamcorder, MM_MESSAGE_CAMCORDER_ERROR, MM_ERROR_CAMCORDER_INTERNAL);
+               goto error;
+       }
+
+       /* Main image buffer */
+       if (!sample1 || !gst_buffer_map(gst_sample_get_buffer(sample1), &mapinfo1, GST_MAP_READ)) {
+               _mmcam_dbg_err("sample1[%p] is NULL or gst_buffer_map failed", sample1);
+               MMCAM_SEND_MESSAGE(hcamcorder, MM_MESSAGE_CAMCORDER_ERROR, MM_ERROR_CAMCORDER_INTERNAL);
+               goto error;
+       } else {
+               if ((mapinfo1.data == NULL) && (mapinfo1.size == 0)) {
+                       _mmcam_dbg_err("mapinfo1 is wrong (%p, size %d)", mapinfo1.data, mapinfo1.size);
+                       MMCAM_SEND_MESSAGE(hcamcorder, MM_MESSAGE_CAMCORDER_ERROR, MM_ERROR_CAMCORDER_INTERNAL);
+                       gst_buffer_unmap(gst_sample_get_buffer(sample1), &mapinfo1);
+                       goto error;
                } else {
-                       ret = _mmcamcorder_image_cmd_preview_stop_with_encbin(handle);
+                       __mmcamcorder_get_capture_data_from_buffer(&dest, pixtype_main, sample1);
                }
-               break;
-       default:
-               ret =  MM_ERROR_CAMCORDER_INVALID_ARGUMENT;
-               break;
        }
 
-       if (ret != MM_ERROR_NONE && sc->element && sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst) {
-               int op_status = 0;
-               MMCAMCORDER_G_OBJECT_GET (sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "operation-status", &op_status);
-               _mmcam_dbg_err("Current Videosrc status[0x%x]", op_status);
+       if (!sample2 || !gst_buffer_map(gst_sample_get_buffer(sample2), &mapinfo2, GST_MAP_READ))
+               _mmcam_dbg_log("sample2[%p] is NULL or gst_buffer_map failed. Not Error.", sample2);
+
+       if (!sample3 || !gst_buffer_map(gst_sample_get_buffer(sample3), &mapinfo3, GST_MAP_READ))
+               _mmcam_dbg_log("sample3[%p] is NULL or gst_buffer_map failed. Not Error.", sample3);
+
+       /* Screennail image buffer */
+       attrs = (mmf_attrs_t *)MMF_CAMCORDER_ATTRS(hcamcorder);
+       mm_attrs_get_index((MMHandleType)attrs, MMCAM_CAPTURED_SCREENNAIL, &attr_index);
+       item_screennail = &attrs->items[attr_index];
+
+       if (sample3 && mapinfo3.data && mapinfo3.size != 0) {
+               _mmcam_dbg_log("Screennail (sample3=%p,size=%d)", sample3, mapinfo3.size);
+
+               pixtype_scrnl = _mmcamcorder_get_pixel_format(gst_sample_get_caps(sample3));
+               __mmcamcorder_get_capture_data_from_buffer(&scrnail, pixtype_scrnl, sample3);
+
+               /* Set screennail attribute for application */
+               ret = mmf_attribute_set_data(item_screennail, &scrnail, sizeof(scrnail));
+               _mmcam_dbg_log("Screennail set attribute data %p, size %d, ret %x", &scrnail, sizeof(scrnail), ret);
+       } else {
+               _mmcam_dbg_log("Sample3 has wrong pointer. Not Error. (sample3=%p)", sample3);
+               mmf_attribute_set_data(item_screennail, NULL, 0);
        }
 
-       return ret;
-}
+       /* commit screennail data */
+       mmf_attribute_commit(item_screennail);
 
+       /* init thumb data */
+       memset(&encode_src, 0x0, sizeof(MMCamcorderCaptureDataType));
 
-void __mmcamcorder_init_stillshot_info (MMHandleType handle)
-{
-       int type = _MMCamcorder_SINGLE_SHOT;
+       /* get provide-exif */
+       MMCAMCORDER_G_OBJECT_GET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "provide-exif", &provide_exif);
 
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-       _MMCamcorderSubContext *sc = NULL;
-       _MMCamcorderImageInfo *info = NULL;
+       /* Thumbnail image buffer */
+       if (sample2 && mapinfo2.data && (mapinfo2.size != 0)) {
+               _mmcam_dbg_log("Thumbnail (buffer2=%p)", gst_sample_get_buffer(sample2));
+               pixtype_thumb = _mmcamcorder_get_pixel_format(gst_sample_get_caps(sample2));
+               __mmcamcorder_get_capture_data_from_buffer(&thumb, pixtype_thumb, sample2);
+       } else {
+               _mmcam_dbg_log("Sample2 has wrong pointer. Not Error. (sample2 %p)", sample2);
+
+               if (pixtype_main == MM_PIXEL_FORMAT_ENCODED && provide_exif) {
+                       ExifLoader *l;
+                       /* get thumbnail from EXIF */
+                       l = exif_loader_new();
+                       if (l) {
+                               ExifData *ed;
+                               char  width[10];
+                               char  height[10];
+                               ExifEntry *entry = NULL;
+
+                               exif_loader_write(l, dest.data, dest.length);
+
+                               /* Get a pointer to the EXIF data */
+                               ed = exif_loader_get_data(l);
+
+                               /* The loader is no longer needed--free it */
+                               exif_loader_unref(l);
+                               l = NULL;
+                               if (ed) {
+                                       entry = exif_content_get_entry(ed->ifd[EXIF_IFD_1], EXIF_TAG_IMAGE_WIDTH);
+                                       if (entry != NULL)
+                                               exif_entry_get_value(entry, width, 10);
+
+                                       entry = NULL;
+                                       entry = exif_content_get_entry(ed->ifd[EXIF_IFD_1], EXIF_TAG_IMAGE_LENGTH);
+                                       if (entry != NULL)
+                                               exif_entry_get_value(entry, height, 10);
+
+                                       entry = NULL;
+                                       /* Make sure the image had a thumbnail before trying to write it */
+                                       if (ed->data && ed->size) {
+                                               thumb.data = malloc(ed->size);
+                                               memcpy(thumb.data, ed->data, ed->size);
+                                               thumb.length = ed->size;
+                                               thumb.format = MM_PIXEL_FORMAT_ENCODED;
+                                               thumb.width = atoi(width);
+                                               thumb.height = atoi(height);
+                                               internal_thumb_data = thumb.data;
+                                       }
+                                       exif_data_unref(ed);
+                                       ed = NULL;
+                               } else {
+                                       _mmcam_dbg_warn("failed to get exif data");
+                               }
+                       } else {
+                               _mmcam_dbg_warn("failed to create exif loader");
+                       }
+               }
 
-       mmf_return_if_fail(hcamcorder);
+               if (thumb.data == NULL) {
+                       if (pixtype_main == MM_PIXEL_FORMAT_ENCODED &&
+                           scrnail.data && scrnail.length != 0) {
+                               /* make thumbnail image with screennail data */
+                               memcpy(&encode_src, &scrnail, sizeof(MMCamcorderCaptureDataType));
+                       } else if (sc->internal_encode) {
+                               /* make thumbnail image with main data, this is raw data */
+                               memcpy(&encode_src, &dest, sizeof(MMCamcorderCaptureDataType));
+                       }
+               }
 
-       sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
-       mmf_return_if_fail(sc && sc->info);
+               /* encode thumbnail */
+               if (encode_src.data) {
+                       unsigned int thumb_width = 0;
+                       unsigned int thumb_height = 0;
+                       unsigned int thumb_length = 0;
+                       unsigned char *thumb_raw_data = NULL;
+
+                       /* encode image */
+                       _mmcam_dbg_log("Encode Thumbnail");
+
+                       if (encode_src.width > THUMBNAIL_WIDTH) {
+                               /* calculate thumbnail size */
+                               thumb_width = THUMBNAIL_WIDTH;
+                               thumb_height = (thumb_width * encode_src.height) / encode_src.width;
+                               if (thumb_height % 2 != 0)
+                                       thumb_height += 1;
+
+                               _mmcam_dbg_log("need to resize : thumbnail size %dx%d, format %d",
+                                       thumb_width, thumb_height, encode_src.format);
+
+                               if ((encode_src.format == MM_PIXEL_FORMAT_UYVY ||
+                                    encode_src.format == MM_PIXEL_FORMAT_YUYV) &&
+                                    encode_src.width % thumb_width == 0 &&
+                                    encode_src.height % thumb_height == 0) {
+                                       if (!_mmcamcorder_downscale_UYVYorYUYV(encode_src.data, encode_src.width, encode_src.height,
+                                               &thumb_raw_data, thumb_width, thumb_height)) {
+                                               thumb_raw_data = NULL;
+                                               _mmcam_dbg_warn("_mmcamcorder_downscale_UYVYorYUYV failed. skip thumbnail making...");
+                                       }
+                               } else {
+                                       if (!_mmcamcorder_resize_frame(encode_src.data, encode_src.width, encode_src.height,
+                                               encode_src.length, encode_src.format,
+                                               &thumb_raw_data, &thumb_width, &thumb_height, &thumb_length)) {
+                                               thumb_raw_data = NULL;
+                                               _mmcam_dbg_warn("_mmcamcorder_resize_frame failed. skip thumbnail making...");
+                                       }
+                               }
+                       } else {
+                               thumb_width = encode_src.width;
+                               thumb_height = encode_src.height;
 
-       info = sc->info;
-       type = info->type;
+                               _mmcam_dbg_log("NO need to resize : thumbnail size %dx%d", thumb_width, thumb_height);
 
-       _mmcam_dbg_log("capture type[%d], capture send count[%d]", type, info->capture_send_count);
+                               thumb_raw_data = encode_src.data;
+                               thumb_length = encode_src.length;
+                       }
 
-       if (type ==_MMCamcorder_SINGLE_SHOT || info->capture_send_count == info->count) {
-               info->capture_cur_count = 0;
-               info->capture_send_count = 0;
-               info->multi_shot_stop = TRUE;
-               info->next_shot_time = 0;
-               info->type = _MMCamcorder_SINGLE_SHOT;
+                       if (thumb_raw_data) {
+                               ret = _mmcamcorder_encode_jpeg(thumb_raw_data, thumb_width, thumb_height,
+                                       encode_src.format, thumb_length, THUMBNAIL_JPEG_QUALITY,
+                                       (void **)&internal_thumb_data, &internal_thumb_length);
+                               if (ret) {
+                                       _mmcam_dbg_log("encode THUMBNAIL done - data %p, length %d", internal_thumb_data, internal_thumb_length);
+
+                                       thumb.data = internal_thumb_data;
+                                       thumb.length = internal_thumb_length;
+                                       thumb.width = thumb_width;
+                                       thumb.height = thumb_height;
+                                       thumb.format = MM_PIXEL_FORMAT_ENCODED;
+                               } else {
+                                       _mmcam_dbg_warn("failed to encode THUMBNAIL");
+                               }
 
-               /* capturing flag set to FALSE here */
-               info->capturing = FALSE;
-               MMTA_ACUM_ITEM_END("Real First Capture Start", FALSE);
+                               /* release allocated raw data memory */
+                               if (thumb_raw_data != encode_src.data) {
+                                       free(thumb_raw_data);
+                                       thumb_raw_data = NULL;
+                                       _mmcam_dbg_log("release thumb_raw_data");
+                               }
+                       } else {
+                               _mmcam_dbg_warn("thumb_raw_data is NULL");
+                       }
+               } else {
+                       /* no raw data src for thumbnail */
+                       _mmcam_dbg_log("no need to encode thumbnail");
+               }
        }
 
-       return;
-}
-
+       /* Encode JPEG */
+       if (sc->internal_encode && pixtype_main != MM_PIXEL_FORMAT_ENCODED) {
+               mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL,
+                       MMCAM_IMAGE_ENCODER_QUALITY, &capture_quality,
+                       NULL);
+               _mmcam_dbg_log("Start Internal Encode - capture_quality %d", capture_quality);
 
-gboolean __mmcamcorder_capture_save_exifinfo(MMHandleType handle, MMCamcorderCaptureDataType *original, MMCamcorderCaptureDataType *thumbnail)
-{
-       int ret = MM_ERROR_NONE;
-       unsigned char *data = NULL;
-       unsigned int datalen = 0;
+               ret = _mmcamcorder_encode_jpeg(mapinfo1.data, dest.width, dest.height,
+                       pixtype_main, dest.length, capture_quality,
+                       (void **)&internal_main_data, &internal_main_length);
+               if (!ret) {
+                       _mmcam_dbg_err("_mmcamcorder_encode_jpeg failed");
 
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
+                       MMCAM_SEND_MESSAGE(hcamcorder, MM_MESSAGE_CAMCORDER_ERROR, MM_ERROR_CAMCORDER_INTERNAL);
 
-       mmf_return_val_if_fail(hcamcorder, FALSE);
+                       goto error;
+               }
 
-       _mmcam_dbg_log("");
+               /* set format */
+               dest.data = internal_main_data;
+               dest.length = internal_main_length;
+               dest.format = MM_PIXEL_FORMAT_ENCODED;
 
-       if (!original || original->data == NULL || original->length == 0) {
-               _mmcam_dbg_err("original=%p, data=%p, length=%d", original, original->data, original->length);
-               return FALSE;
-       } else {
-               /* original is input/output param. save original values to local var. */
-               data = original->data;
-               datalen = original->length;
+               _mmcam_dbg_log("Done Internal Encode - data %p, length %d", dest.data, dest.length);
        }
 
-       /* exif 090227 */
-       ret = mm_exif_create_exif_info(&(hcamcorder->exif_info));
-       if (hcamcorder->exif_info == NULL || ret != MM_ERROR_NONE) {
-               _MMCamcorderMsgItem msg;
-
-               msg.id = MM_MESSAGE_CAMCORDER_ERROR;
-               msg.param.code = ret;
-               _mmcamcroder_send_message(handle, &msg);
-
-               _mmcam_dbg_err("Failed to create exif_info [%x]", ret);
-               return FALSE;
+       /* create EXIF info */
+       if (!provide_exif) {    /* make new exif */
+               ret = mm_exif_create_exif_info(&(hcamcorder->exif_info));
+       } else {        /* load from jpeg buffer dest.data */
+               ret = mm_exif_load_exif_info(&(hcamcorder->exif_info), dest.data, dest.length);
+               if (ret != MM_ERROR_NONE) {
+                       _mmcam_dbg_err("Failed to load exif_info [%x], try to create EXIF", ret);
+                       provide_exif = FALSE;
+                       ret = mm_exif_create_exif_info(&(hcamcorder->exif_info));
+               }
        }
-
-       /* add basic exif info */
-       _mmcam_dbg_log("add basic exif info");
-       __ta__("                __mmcamcorder_set_exif_basic_info",
-       ret = __mmcamcorder_set_exif_basic_info(handle);
-       );
        if (ret != MM_ERROR_NONE) {
-               _MMCamcorderMsgItem msg;
-
-               msg.id = MM_MESSAGE_CAMCORDER_ERROR;
-               msg.param.code = ret;
-               _mmcamcroder_send_message(handle, &msg);
+               _mmcam_dbg_err("Failed to create exif_info [%x], but keep going...", ret);
+       } else {
+               /* add basic exif info */
+               if (!provide_exif) {
+                       _mmcam_dbg_log("add basic exif info");
+                       ret = __mmcamcorder_set_exif_basic_info((MMHandleType)hcamcorder, dest.width, dest.height);
+               } else {
+                       _mmcam_dbg_log("update exif info");
+                       ret = __mmcamcorder_update_exif_info((MMHandleType)hcamcorder, dest.data, dest.length);
+               }
 
-               _mmcam_dbg_err("Failed to set_exif_basic_info [%x]", ret);
+               if (ret != MM_ERROR_NONE) {
+                       _mmcam_dbg_warn("Failed set_exif_basic_info [%x], but keep going...", ret);
+                       ret = MM_ERROR_NONE;
+               }
        }
 
-       if (thumbnail != NULL) {
-               int bthumbnail = TRUE;
-
-               /* check whether thumbnail should be included */
-               mm_camcorder_get_attributes(handle, NULL, "capture-thumbnail", &bthumbnail, NULL);
-
-               if (thumbnail->data && thumbnail->length >0 && bthumbnail) {
-                       _mmcam_dbg_log("thumbnail is added!thumbnail->data=%p thumbnail->width=%d ,thumbnail->height=%d",
-                                      thumbnail->data, thumbnail->width, thumbnail->height);
+       /* get attribute item for EXIF data */
+       mm_attrs_get_index((MMHandleType)attrs, MMCAM_CAPTURED_EXIF_RAW_DATA, &attr_index);
+       item_exif_raw_data = &attrs->items[attr_index];
 
-                       /* add thumbnail exif info */
-                       __ta__("            mm_exif_add_thumbnail_info",
-                       ret = mm_exif_add_thumbnail_info(hcamcorder->exif_info, thumbnail->data,thumbnail->width, thumbnail->height, thumbnail->length);
-                       );
-                       if (ret != MM_ERROR_NONE) {
-                               _MMCamcorderMsgItem msg;
-
-                               msg.id = MM_MESSAGE_CAMCORDER_ERROR;
-                               msg.param.code = ret;
-                               _mmcamcroder_send_message(handle, &msg);
-
-                               _mmcam_dbg_err("Failed to set_exif_thumbnail [%x]",ret);
-                       }
+       /* set EXIF data to attribute */
+       if (hcamcorder->exif_info && hcamcorder->exif_info->data) {
+               exif_raw_data = (unsigned char *)malloc(hcamcorder->exif_info->size);
+               if (exif_raw_data) {
+                       memcpy(exif_raw_data, hcamcorder->exif_info->data, hcamcorder->exif_info->size);
+                       mmf_attribute_set_data(item_exif_raw_data, exif_raw_data, hcamcorder->exif_info->size);
+                       _mmcam_dbg_log("set EXIF raw data %p, size %d", exif_raw_data, hcamcorder->exif_info->size);
                } else {
-                       _mmcam_dbg_err("Skip adding thumbnail (data=%p, length=%d, capture-thumbnail=%d)",
-                                      thumbnail->data, thumbnail->length , bthumbnail);
+                       _mmcam_dbg_warn("failed to alloc for EXIF, size %d", hcamcorder->exif_info->size);
                }
+       } else {
+               _mmcam_dbg_warn("failed to create EXIF. set EXIF as NULL");
+               mmf_attribute_set_data(item_exif_raw_data, NULL, 0);
        }
 
-       /* write jpeg with exif */
-       ret = mm_exif_write_exif_jpeg_to_memory(&original->data, &original->length ,hcamcorder->exif_info,  data, datalen);
+       /* commit EXIF data */
+       mmf_attribute_commit(item_exif_raw_data);
 
-       if (ret != MM_ERROR_NONE) {
-               _MMCamcorderMsgItem msg;
-       
-               msg.id = MM_MESSAGE_CAMCORDER_ERROR;
-               msg.param.code = ret;
-               _mmcamcroder_send_message(handle, &msg);
+       /* get tag-enable */
+       mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL, MMCAM_TAG_ENABLE, &tag_enable, NULL);
 
-               _mmcam_dbg_err("mm_exif_write_exif_jpeg_to_memory error! [%x]",ret);
+       /* Set extra data for JPEG if tag enabled and doesn't provide EXIF */
+       if (dest.format == MM_PIXEL_FORMAT_ENCODED) {
+               if (tag_enable) {
+                       mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL,
+                               MMCAM_IMAGE_ENCODER, &codectype,
+                               NULL);
+                       _mmcam_dbg_log("codectype %d", codectype);
+
+                       switch (codectype) {
+                       case MM_IMAGE_CODEC_JPEG:
+                       case MM_IMAGE_CODEC_SRW:
+                       case MM_IMAGE_CODEC_JPEG_SRW:
+                               ret = __mmcamcorder_set_jpeg_data((MMHandleType)hcamcorder, &dest, &thumb, provide_exif);
+                               if (ret != MM_ERROR_NONE) {
+                                       _mmcam_dbg_err("Error on setting extra data to jpeg");
+                                       MMCAM_SEND_MESSAGE(hcamcorder, MM_MESSAGE_CAMCORDER_ERROR, ret);
+                                       goto error;
+                               }
+                               break;
+                       default:
+                               _mmcam_dbg_err("The codectype is not supported. (%d)", codectype);
+                               MMCAM_SEND_MESSAGE(hcamcorder, MM_MESSAGE_CAMCORDER_ERROR, MM_ERROR_CAMCORDER_INTERNAL);
+                               goto error;
+                       }
+               }
        }
 
-       /* destroy exif info */
-       mm_exif_destory_exif_info(hcamcorder->exif_info);
-       hcamcorder->exif_info = NULL;
+       /* Handle Capture Callback */
+       _MMCAMCORDER_LOCK_VCAPTURE_CALLBACK(hcamcorder);
 
-       _mmcam_dbg_log("END");
+       if (hcamcorder->vcapture_cb) {
+               _mmcam_dbg_log("APPLICATION CALLBACK START");
+               if (thumb.data)
+                       ret = hcamcorder->vcapture_cb(&dest, &thumb, hcamcorder->vcapture_cb_param);
+               else
+                       ret = hcamcorder->vcapture_cb(&dest, NULL, hcamcorder->vcapture_cb_param);
 
-       if (ret != MM_ERROR_NONE) {
-               return FALSE;
+               _mmcam_dbg_log("APPLICATION CALLBACK END");
        } else {
-               return TRUE;
-       }
-}
-
+               _mmcam_dbg_err("Capture callback is NULL.");
 
-gboolean __mmcamcorder_capture_send_msg(MMHandleType handle, int type, int count)
-{
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-       _MMCamcorderImageInfo *info = NULL;
-       _MMCamcorderSubContext *sc = NULL;
-       _MMCamcorderMsgItem msg;
+               MMCAM_SEND_MESSAGE(hcamcorder, MM_MESSAGE_CAMCORDER_ERROR, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
 
-       mmf_return_val_if_fail(hcamcorder, FALSE);
+               goto err_release_exif;
+       }
 
-       sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
-       mmf_return_val_if_fail(sc && sc->info, FALSE);
+       /* Set capture count */
+       count = ++(info->capture_send_count);
+       send_captured_message = TRUE;
 
-       info = sc->info;
+err_release_exif:
+       _MMCAMCORDER_UNLOCK_VCAPTURE_CALLBACK(hcamcorder);
 
-       _mmcam_dbg_log("type [%d], capture count [%d]", type, count);
+       /* init screennail and EXIF raw data */
+       mmf_attribute_set_data(item_screennail, NULL, 0);
+       mmf_attribute_commit(item_screennail);
+       if (exif_raw_data) {
+               free(exif_raw_data);
+               exif_raw_data = NULL;
 
-       msg.id = MM_MESSAGE_CAMCORDER_CAPTURED;
-       msg.param.code = count;
+               mmf_attribute_set_data(item_exif_raw_data, NULL, 0);
+               mmf_attribute_commit(item_exif_raw_data);
+       }
 
-       _mmcamcroder_send_message((MMHandleType)hcamcorder, &msg);
+       /* Release jpeg data */
+       if (pixtype_main == MM_PIXEL_FORMAT_ENCODED)
+               __mmcamcorder_release_jpeg_data((MMHandleType)hcamcorder, &dest, tag_enable, provide_exif);
 
-       _mmcam_dbg_log("END");
-       return TRUE;
-}
+error:
+       /* Check end condition and set proper value */
+       if (info->hdr_capture_mode != MM_CAMCORDER_HDR_ON_AND_ORIGINAL ||
+           (info->hdr_capture_mode == MM_CAMCORDER_HDR_ON_AND_ORIGINAL && count == 2)) {
+               __mmcamcorder_init_stillshot_info((MMHandleType)hcamcorder);
+       }
 
+       /* release internal allocated data */
+       if (sc->internal_encode)
+               compare_data = internal_main_data;
+       else
+               compare_data = mapinfo1.data;
 
-void __mmcamcorder_get_capture_data_from_buffer(MMCamcorderCaptureDataType *capture_data, int pixtype, GstBuffer *buffer)
-{
-       GstCaps *caps = NULL;
-       const GstStructure *structure;
+       if (dest.data && compare_data &&
+           dest.data != compare_data) {
+               _mmcam_dbg_log("release internal allocated data %p", dest.data);
+               free(dest.data);
+               dest.data = NULL;
+               dest.length = 0;
+       }
+       if (internal_main_data) {
+               _mmcam_dbg_log("release internal main data %p", internal_main_data);
+               free(internal_main_data);
+               internal_main_data = NULL;
+       }
+       if (internal_thumb_data) {
+               _mmcam_dbg_log("release internal thumb data %p", internal_thumb_data);
+               free(internal_thumb_data);
+               internal_thumb_data = NULL;
+       }
 
-       mmf_return_if_fail(capture_data && buffer);
+       /* reset compare_data */
+       compare_data = NULL;
 
-       caps = gst_buffer_get_caps(buffer);
-       if (caps == NULL) {
-               _mmcam_dbg_err("failed to get caps");
-               goto GET_FAILED;
+       /*free GstBuffer*/
+       if (sample1) {
+               gst_buffer_unmap(gst_sample_get_buffer(sample1), &mapinfo1);
+               gst_sample_unref(sample1);
+       }
+       if (sample2) {
+               gst_buffer_unmap(gst_sample_get_buffer(sample2), &mapinfo2);
+               gst_sample_unref(sample2);
+       }
+       if (sample3) {
+               gst_buffer_unmap(gst_sample_get_buffer(sample3), &mapinfo3);
+               gst_sample_unref(sample3);
        }
 
-       structure = gst_caps_get_structure(caps, 0);
-       if (caps == NULL) {
-               _mmcam_dbg_err("failed to get structure");
-               goto GET_FAILED;
+       /* destroy exif info */
+       mm_exif_destory_exif_info(hcamcorder->exif_info);
+       hcamcorder->exif_info = NULL;
+
+       /* send captured message */
+       if (send_captured_message) {
+               if (info->hdr_capture_mode != MM_CAMCORDER_HDR_ON_AND_ORIGINAL) {
+                       /* Send CAPTURED message and count - capture success */
+                       if (current_state >= MM_CAMCORDER_STATE_RECORDING) {
+                               MMCAM_SEND_MESSAGE(hcamcorder, MM_MESSAGE_CAMCORDER_VIDEO_SNAPSHOT_CAPTURED, count);
+                       } else {
+                               MMCAM_SEND_MESSAGE(hcamcorder, MM_MESSAGE_CAMCORDER_CAPTURED, count);
+                       }
+               } else if (info->hdr_capture_mode == MM_CAMCORDER_HDR_ON_AND_ORIGINAL && count == 2) {
+                       /* send captured message only once in HDR and Original Capture mode */
+                       MMCAM_SEND_MESSAGE(hcamcorder, MM_MESSAGE_CAMCORDER_CAPTURED, 1);
+               }
        }
 
-       capture_data->data = GST_BUFFER_DATA(buffer);
-       capture_data->format = pixtype;
-       gst_structure_get_int(structure, "width", &capture_data->width);
-       gst_structure_get_int(structure, "height", &capture_data->height);
-       capture_data->length = GST_BUFFER_SIZE(buffer);
+       if (current_state >= MM_CAMCORDER_STATE_RECORDING) {
+               /* Handle capture in recording case */
+               hcamcorder->capture_in_recording = FALSE;
 
-        _mmcam_dbg_err("buffer data[%p],size[%dx%d],length[%d],format[%d]",
-                       capture_data->data, capture_data->width, capture_data->height,
-                       capture_data->length, capture_data->format);
-       gst_caps_unref(caps);
-       caps = NULL;
+               g_mutex_lock(&hcamcorder->task_thread_lock);
 
-       return;
+               if (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);
+               } else {
+                       _mmcam_dbg_warn("unexpected task thread state : %d", hcamcorder->task_thread_state);
+               }
 
-GET_FAILED:
-       capture_data->data = NULL;
-       capture_data->format = MM_PIXEL_FORMAT_INVALID;
-       capture_data->length = 0;
+               g_mutex_unlock(&hcamcorder->task_thread_lock);
+
+               _MMCAMCORDER_CMD_SIGNAL(hcamcorder);
+       }
+
+       _mmcam_dbg_err("END");
 
        return;
 }
 
 
-gboolean __mmcamcorder_set_jpeg_data(MMHandleType handle, MMCamcorderCaptureDataType *dest, MMCamcorderCaptureDataType *thumbnail)
+gboolean __mmcamcorder_handoff_callback(GstElement *fakesink, GstBuffer *buffer, GstPad *pad, gpointer u_data)
 {
-       int tag_enable = 0;
-       int provide_exif = FALSE;
-
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(u_data);
        _MMCamcorderSubContext *sc = NULL;
 
        mmf_return_val_if_fail(hcamcorder, FALSE);
-       mmf_return_val_if_fail(dest, FALSE);
 
        sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
-       mmf_return_val_if_fail(sc, FALSE);
+       mmf_return_val_if_fail(sc && sc->element, FALSE);
 
        _mmcam_dbg_log("");
 
-       mm_camcorder_get_attributes(handle, NULL, MMCAM_TAG_ENABLE, &tag_enable, NULL);
-       MMCAMCORDER_G_OBJECT_GET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "provide-exif", &provide_exif);
-
-       _mmcam_dbg_log("tag enable[%d], provide exif[%d]", tag_enable, provide_exif);
+       /* FIXME. How could you get a thumbnail? */
+       __mmcamcorder_image_capture_cb(fakesink, gst_sample_new(buffer, gst_pad_get_current_caps(pad), NULL, NULL), NULL, NULL, u_data);
 
-       /* if tag enable and doesn't provide exif, we make it */
-       if (tag_enable && !provide_exif) {
-               _mmcam_dbg_log("Add exif information if existed(thumbnail[%p])", thumbnail);
-               if (thumbnail && thumbnail->data) {
-                       if (!__mmcamcorder_capture_save_exifinfo(handle, dest, thumbnail)) {
-                               return FALSE;
-                       }
-               } else {
-                       if (!__mmcamcorder_capture_save_exifinfo(handle, dest, NULL)) {
-                               return FALSE;
-                       }
-               }
+       if (sc->encode_element[_MMCAMCORDER_ENCSINK_ENCBIN].gst) {
+               MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_ENCSINK_SINK].gst, "signal-handoffs", FALSE);
+               MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "block", TRUE);
+               sc->info_video->push_encoding_buffer = PUSH_ENCODING_BUFFER_STOP;
        }
 
        return TRUE;
 }
 
 
-void __mmcamcorder_release_jpeg_data(MMHandleType handle, MMCamcorderCaptureDataType *dest)
+static ExifData *__mmcamcorder_update_exif_orientation(MMHandleType handle, ExifData *ed)
 {
-       int tag_enable = 0;
-       int provide_exif = FALSE;
+       int value = 0;
+       ExifShort eshort = 0;
+       int ret = MM_ERROR_NONE;
 
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-       _MMCamcorderSubContext *sc = NULL;
+       mm_camcorder_get_attributes(handle, NULL, MMCAM_TAG_ORIENTATION, &value, NULL);
+       _mmcam_dbg_log("get orientation [%d]", value);
+       if (value == 0)
+               value = MM_EXIF_ORIENTATION;
 
-       mmf_return_if_fail(hcamcorder);
-       mmf_return_if_fail(dest);
+       exif_set_short((unsigned char *)&eshort, exif_data_get_byte_order(ed), value);
+       ret = mm_exif_set_add_entry(ed, EXIF_IFD_0, EXIF_TAG_ORIENTATION,
+               EXIF_FORMAT_SHORT, 1, (const char *)&eshort);
+       if (ret != MM_ERROR_NONE)
+               EXIF_SET_ERR(ret, EXIF_TAG_MAKER_NOTE);
 
-       sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
-       mmf_return_if_fail(sc);
+exit:
+       return ed;
+}
 
-       _mmcam_dbg_log("");
 
-       mm_camcorder_get_attributes(handle, NULL, MMCAM_TAG_ENABLE, &tag_enable, NULL);
-       MMCAMCORDER_G_OBJECT_GET (sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "provide-exif", &provide_exif);
+static ExifData *__mmcamcorder_update_exif_make(MMHandleType handle, ExifData *ed)
+{
+       int ret = MM_ERROR_NONE;
+       char *make = strdup(MM_MAKER_NAME);
 
-       /* if dest->data is allocated in MSL, release it */
-       if (tag_enable && !provide_exif) {
-               if (dest->data) {
-                       free(dest->data);
-                       dest->length = 0;
-                       dest->data = NULL;
-                       _mmcam_dbg_log("Jpeg is released!");
-               }
+       if (make) {
+               _mmcam_dbg_log("maker [%s]", make);
+               ret = mm_exif_set_add_entry(ed, EXIF_IFD_0, EXIF_TAG_MAKE,
+                       EXIF_FORMAT_ASCII, strlen(make)+1, (const char *)make);
+               free(make);
+               if (ret != MM_ERROR_NONE)
+                       EXIF_SET_ERR(ret, EXIF_TAG_MAKE);
        } else {
-               _mmcam_dbg_log("No need to release");
+               ret = MM_ERROR_CAMCORDER_LOW_MEMORY;
+               EXIF_SET_ERR(ret, EXIF_TAG_MAKE);
        }
 
-       return;
+exit:
+       return ed;
 }
 
 
-static void __mmcamcorder_image_capture_cb(GstElement *element, GstBuffer *buffer1, GstBuffer *buffer2, GstBuffer *buffer3, gpointer u_data)
+static ExifData *__mmcamcorder_update_exif_software(MMHandleType handle, ExifData *ed)
 {
        int ret = MM_ERROR_NONE;
-       int pixtype = MM_PIXEL_FORMAT_INVALID;
-       int pixtype_sub = MM_PIXEL_FORMAT_INVALID;
-       int codectype = MM_IMAGE_CODEC_JPEG;
-       int type = _MMCamcorder_SINGLE_SHOT;
-       int attr_index = 0;
-       int count = 0;
-       int stop_cont_shot = 0;
-       gboolean send_msg = FALSE;
-
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(u_data);
-       _MMCamcorderImageInfo *info = NULL;
-       _MMCamcorderSubContext *sc = NULL;
-       MMCamcorderCaptureDataType dest = {0,};
-       MMCamcorderCaptureDataType thumb = {0,};
-       MMCamcorderCaptureDataType scrnail = {0,};
-
-       mmf_attrs_t *attrs = NULL;
-       mmf_attribute_t *item = NULL;
+       mmf_camcorder_t *hcamcorder = (mmf_camcorder_t *)handle;
 
-       void *encoded_data = NULL;
-       char *err_attr_name = NULL;
+       if (hcamcorder == NULL || ed == NULL) {
+               _mmcam_dbg_err("NULL parameter %p,%p", hcamcorder, ed);
+               return NULL;
+       }
 
-       mmf_return_if_fail(hcamcorder);
+       if (hcamcorder->software_version) {
+               ret = mm_exif_set_add_entry(ed, EXIF_IFD_0, EXIF_TAG_SOFTWARE, EXIF_FORMAT_ASCII,
+                       strlen(hcamcorder->software_version)+1, (const char *)hcamcorder->software_version);
+               if (ret != MM_ERROR_NONE) {
+                       _mmcam_dbg_err("set software_version[%s] failed", hcamcorder->software_version);
+               } else {
+                       _mmcam_dbg_log("set software_version[%s] done", hcamcorder->software_version);
+               }
+       } else {
+               _mmcam_dbg_err("model_name is NULL");
+       }
 
-       sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
-       mmf_return_if_fail(sc && sc->info);
+       return ed;
+}
 
-       info = sc->info;
 
-       _mmcam_dbg_err("START");
+static ExifData *__mmcamcorder_update_exif_model(MMHandleType handle, ExifData *ed)
+{
+       int ret = MM_ERROR_NONE;
+       mmf_camcorder_t *hcamcorder = (mmf_camcorder_t *)handle;
 
-       MMTA_ACUM_ITEM_BEGIN("            MSL capture callback", FALSE);
+       if (hcamcorder == NULL || ed == NULL) {
+               _mmcam_dbg_err("NULL parameter %p,%p", hcamcorder, ed);
+               return NULL;
+       }
 
-       /* check capture state */
-       if (info->type == _MMCamcorder_MULTI_SHOT && info->capture_send_count > 0) {
-               mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL, "capture-break-cont-shot", &stop_cont_shot, NULL);
-               if (stop_cont_shot == TRUE) {
-                       _mmcam_dbg_warn("capture stop command already come. skip this...");
-                       MMTA_ACUM_ITEM_END( "            MSL capture callback", FALSE );
-                       goto error;
+       if (hcamcorder->model_name) {
+               ret = mm_exif_set_add_entry(ed, EXIF_IFD_0, EXIF_TAG_MODEL, EXIF_FORMAT_ASCII,
+                       strlen(hcamcorder->model_name)+1, (const char *)hcamcorder->model_name);
+               if (ret != MM_ERROR_NONE) {
+                       _mmcam_dbg_err("set model name[%s] failed", hcamcorder->model_name);
+               } else {
+                       _mmcam_dbg_log("set model name[%s] done", hcamcorder->model_name);
                }
+       } else {
+               _mmcam_dbg_err("model_name is NULL");
        }
 
-       if (!info->capturing) {
-               _mmcam_dbg_err("It's Not capturing now.");
-               goto error;
-       }
+       return ed;
+}
 
-       /* play capture sound here if multi capture */
-       if (info->type == _MMCamcorder_MULTI_SHOT) {
-               _mmcamcorder_sound_play((MMHandleType)hcamcorder);
-       }
+static ExifData *__mmcamcorder_update_exif_gps(MMHandleType handle, ExifData *ed)
+{
+       int ret = MM_ERROR_NONE;
+       int gps_enable = TRUE;
+       char *err_name = NULL;
+       double latitude = INVALID_GPS_VALUE;
+       double longitude = INVALID_GPS_VALUE;
+       double altitude = INVALID_GPS_VALUE;
 
-       /* Prepare main, thumbnail buffer */
-       pixtype = _mmcamcorder_get_pixel_format(buffer1);
-       if (pixtype == MM_PIXEL_FORMAT_INVALID) {
-               _mmcam_dbg_err("Unsupported pixel type");
-               goto error;
-       }
+       ret = mm_camcorder_get_attributes(handle, NULL, MMCAM_TAG_GPS_ENABLE, &gps_enable, NULL);
+       if (ret == MM_ERROR_NONE && gps_enable) {
+               ExifByte GpsVersion[4] = {2, 2, 0, 0};
 
-       /* Main image buffer */
-       if (buffer1 && GST_BUFFER_DATA(buffer1) && (GST_BUFFER_SIZE(buffer1) !=0)) {
-               __mmcamcorder_get_capture_data_from_buffer(&dest, pixtype, buffer1);
-       } else {
-               _mmcam_dbg_err("buffer1 has wrong pointer. (buffer1=%p)",buffer1);
-               goto error;
-       }
+               _mmcam_dbg_log("Tag for GPS is ENABLED.");
 
-       /* Encode JPEG */
-       if (sc->internal_encode) {
-               int capture_quality = 0;
-               ret = mm_camcorder_get_attributes((MMHandleType)hcamcorder, &err_attr_name,
-                                                 MMCAM_IMAGE_ENCODER_QUALITY, &capture_quality,
-                                                 NULL);
-               if (ret != MM_ERROR_NONE) {
-                       _mmcam_dbg_err("Get attribute failed[%s][%x]", err_attr_name, ret);
-                       SAFE_FREE(err_attr_name);
-                       goto error;
-               }
+               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_VERSION_ID,
+                       EXIF_FORMAT_BYTE, 4, (const char *)&GpsVersion);
+               if (ret != MM_ERROR_NONE)
+                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_VERSION_ID);
 
-               __ta__("                _mmcamcorder_encode_jpeg",
-               ret = _mmcamcorder_encode_jpeg(GST_BUFFER_DATA(buffer1), dest.width, dest.height,
-                                              pixtype, dest.length, capture_quality, &(dest.data), &(dest.length));
-               );
-               if (ret == FALSE) {
-                       goto error;
+               ret = mm_camcorder_get_attributes(handle, &err_name,
+                       MMCAM_TAG_LATITUDE, &latitude,
+                       MMCAM_TAG_LONGITUDE, &longitude,
+                       MMCAM_TAG_ALTITUDE, &altitude, NULL);
+               if (ret != MM_ERROR_NONE) {
+                       _mmcam_dbg_err("failed to get gps info [%x][%s]", ret, err_name);
+                       SAFE_FREE(err_name);
+                       goto exit;
                }
 
-               encoded_data = dest.data;
-               dest.format = MM_PIXEL_FORMAT_ENCODED;
-       }
-
-       /* Thumbnail image buffer */
-       if (buffer2 && GST_BUFFER_DATA(buffer2) && (GST_BUFFER_SIZE(buffer2) !=0)) {
-               pixtype_sub = _mmcamcorder_get_pixel_format(buffer2);
-               _mmcam_dbg_log("Thumnail (buffer2=%p)",buffer2);
-
-               __mmcamcorder_get_capture_data_from_buffer(&thumb, pixtype_sub, buffer2);
-       } else {
-               _mmcam_dbg_log("buffer2 has wrong pointer. Not Error. (buffer2=%p)",buffer2);
-       }
+               _mmcam_dbg_log("latitude [%f]", latitude);
+               if (latitude != INVALID_GPS_VALUE) {
+                       unsigned char *b = NULL;
+                       unsigned int deg;
+                       unsigned int min;
+                       unsigned int sec;
+                       ExifRational rData;
 
-       /* Screennail image buffer */
-       attrs = (mmf_attrs_t*)MMF_CAMCORDER_ATTRS(hcamcorder);
-       mm_attrs_get_index((MMHandleType)attrs, "captured-screennail", &attr_index);
-       item = &attrs->items[attr_index];
+                       if (latitude < 0) {
+                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_LATITUDE_REF,
+                                       EXIF_FORMAT_ASCII, 2, "S");
+                               if (ret != MM_ERROR_NONE) {
+                                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_LATITUDE_REF);
+                               }
 
-       if (buffer3 && GST_BUFFER_DATA(buffer3) && GST_BUFFER_SIZE(buffer3) != 0) {
-               _mmcam_dbg_log("Screennail (buffer3=%p,size=%d)", buffer3, GST_BUFFER_SIZE(buffer3));
+                               latitude = -latitude;
+                       } else if (latitude > 0) {
+                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_LATITUDE_REF,
+                                       EXIF_FORMAT_ASCII, 2, "N");
+                               if (ret != MM_ERROR_NONE) {
+                                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_LATITUDE_REF);
+                               }
+                       }
 
-               pixtype_sub = _mmcamcorder_get_pixel_format(buffer3);
-               __mmcamcorder_get_capture_data_from_buffer(&scrnail, pixtype_sub, buffer3);
+                       deg = (unsigned int)(latitude);
+                       min = (unsigned int)((latitude-deg) * 60);
+                       sec = (unsigned int)(((latitude-deg) * 3600) - min * 60);
 
-               /* Set screennail attribute for application */
-               mmf_attribute_set_data(item, &scrnail, sizeof(scrnail));
-       } else {
-               mmf_attribute_set_data(item, NULL, 0);
+                       _mmcam_dbg_log("f_latitude deg[%d], min[%d], sec[%d]", deg, min, sec);
+                       b = malloc(3 * sizeof(ExifRational));
+                       if (b) {
+                               rData.numerator = deg;
+                               rData.denominator = 1;
+                               exif_set_rational(b, exif_data_get_byte_order(ed), rData);
+                               rData.numerator = min;
+                               exif_set_rational(b + 8, exif_data_get_byte_order(ed), rData);
+                               rData.numerator = sec;
+                               exif_set_rational(b + 16, exif_data_get_byte_order(ed), rData);
 
-               _mmcam_dbg_log("buffer3 has wrong pointer. Not Error. (buffer3=%p)",buffer3);
-       }
+                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_LATITUDE,
+                                       EXIF_FORMAT_RATIONAL, 3, (const char *)b);
+                               free(b);
+                               if (ret != MM_ERROR_NONE)
+                                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_LATITUDE);
+                       } else {
+                               _mmcam_dbg_warn("malloc failed");
+                       }
+               }
 
-       mmf_attrs_commit_err((MMHandleType)attrs, &err_attr_name);
+               _mmcam_dbg_log("longitude [%f]", longitude);
+               if (longitude != INVALID_GPS_VALUE) {
+                       unsigned char *b = NULL;
+                       unsigned int deg;
+                       unsigned int min;
+                       unsigned int sec;
+                       ExifRational rData;
 
-       /* Set extra data for jpeg */
-       if (dest.format == MM_PIXEL_FORMAT_ENCODED) {
-               int err = 0;
-               char *err_attr_name = NULL;
-
-               err = mm_camcorder_get_attributes((MMHandleType)hcamcorder, &err_attr_name,
-                                                 MMCAM_IMAGE_ENCODER, &codectype,
-                                                 NULL);
-               if (err != MM_ERROR_NONE) {
-                       _mmcam_dbg_warn("Getting codectype failed. (%s:%x)", err_attr_name, err);
-                       SAFE_FREE (err_attr_name);
-                       goto error;
-               }
+                       if (longitude < 0) {
+                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_LONGITUDE_REF,
+                                       EXIF_FORMAT_ASCII, 2, "W");
+                               if (ret != MM_ERROR_NONE) {
+                                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_LONGITUDE_REF);
+                               }
 
-               switch (codectype) {
-               case MM_IMAGE_CODEC_JPEG:
-               case MM_IMAGE_CODEC_SRW:
-               case MM_IMAGE_CODEC_JPEG_SRW:
-                       __ta__( "                __mmcamcorder_set_jpeg_data",
-                       ret = __mmcamcorder_set_jpeg_data((MMHandleType)hcamcorder, &dest, &thumb);
-                       );
-                       if (!ret) {
-                               _mmcam_dbg_err("Error on setting extra data to jpeg");
-                               goto error;
+                               longitude = -longitude;
+                       } else if (longitude > 0) {
+                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_LONGITUDE_REF,
+                                       EXIF_FORMAT_ASCII, 2, "E");
+                               if (ret != MM_ERROR_NONE) {
+                                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_LONGITUDE_REF);
+                               }
                        }
-                       break;
-               default:
-                       _mmcam_dbg_err("The codectype is not supported. (%d)", codectype);
-                       goto error;
-               }
-       }
 
-       /* Handle Capture Callback */
-       _MMCAMCORDER_LOCK_VCAPTURE_CALLBACK(hcamcorder);
+                       deg = (unsigned int)(longitude);
+                       min = (unsigned int)((longitude-deg) * 60);
+                       sec = (unsigned int)(((longitude-deg) * 3600) - min * 60);
 
-       if (hcamcorder->vcapture_cb) {
-               _mmcam_dbg_log("APPLICATION CALLBACK START");
-               MMTA_ACUM_ITEM_BEGIN("                Application capture callback", 0);
-               if (thumb.data) {
-                       ret = hcamcorder->vcapture_cb(&dest, &thumb, hcamcorder->vcapture_cb_param);
-               } else {
-                       ret = hcamcorder->vcapture_cb(&dest, NULL, hcamcorder->vcapture_cb_param);
+                       _mmcam_dbg_log("longitude deg[%d], min[%d], sec[%d]", deg, min, sec);
+                       b = malloc(3 * sizeof(ExifRational));
+                       if (b) {
+                               rData.numerator = deg;
+                               rData.denominator = 1;
+                               exif_set_rational(b, exif_data_get_byte_order(ed), rData);
+                               rData.numerator = min;
+                               exif_set_rational(b+8, exif_data_get_byte_order(ed), rData);
+                               rData.numerator = sec;
+                               exif_set_rational(b+16, exif_data_get_byte_order(ed), rData);
+                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_LONGITUDE,
+                                       EXIF_FORMAT_RATIONAL, 3, (const char *)b);
+                               free(b);
+                               if (ret != MM_ERROR_NONE)
+                                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_LONGITUDE);
+                       } else {
+                               _mmcam_dbg_warn("malloc failed");
+                       }
                }
-               MMTA_ACUM_ITEM_END("                Application capture callback", 0);
-               _mmcam_dbg_log("APPLICATION CALLBACK END");
-       } else {
-               _mmcam_dbg_err("Capture callback is NULL.");
-               goto err_release_exif;
-       }
-
-       /* Set send msg flag and capture count */
-       send_msg = TRUE;
-       type = info->type;
-       count = ++(info->capture_send_count);
 
-err_release_exif:
-       _MMCAMCORDER_UNLOCK_VCAPTURE_CALLBACK(hcamcorder);
+               _mmcam_dbg_log("f_altitude [%f]", altitude);
+               if (altitude != INVALID_GPS_VALUE) {
+                       ExifByte alt_ref = 0;
+                       unsigned char *b = NULL;
+                       ExifRational rData;
+                       b = malloc(sizeof(ExifRational));
+                       if (b) {
+                               if (altitude < 0) {
+                                       alt_ref = 1;
+                                       altitude = -altitude;
+                               }
 
-       /* Release jpeg data */
-       if (pixtype == MM_PIXEL_FORMAT_ENCODED) {
-               __ta__( "                __mmcamcorder_release_jpeg_data",
-               __mmcamcorder_release_jpeg_data((MMHandleType)hcamcorder, &dest);
-               );
-       }
+                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_ALTITUDE_REF,
+                                       EXIF_FORMAT_BYTE, 1, (const char *)&alt_ref);
+                               if (ret != MM_ERROR_NONE) {
+                                       _mmcam_dbg_err("error [%x], tag [%x]", ret, EXIF_TAG_GPS_ALTITUDE_REF);
+                                       if (ret == (int)MM_ERROR_CAMCORDER_LOW_MEMORY) {
+                                               free(b);
+                                               b = NULL;
+                                               goto exit;
+                                       }
+                               }
 
-error:
-       /* Check end condition and set proper value */
-       __mmcamcorder_init_stillshot_info((MMHandleType)hcamcorder);
+                               rData.numerator = (unsigned int)(altitude + 0.5)*100;
+                               rData.denominator = 100;
+                               exif_set_rational(b, exif_data_get_byte_order(ed), rData);
+                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_ALTITUDE,
+                                       EXIF_FORMAT_RATIONAL, 1, (const char *)b);
+                               free(b);
+                               if (ret != MM_ERROR_NONE)
+                                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_ALTITUDE);
+                       } else {
+                               _mmcam_dbg_warn("malloc failed");
+                       }
+               }
 
-       /* send captured message if no problem */
-       if (send_msg) {
-               __mmcamcorder_capture_send_msg((MMHandleType)hcamcorder, type, count);
-       }
+               {
+                       double gps_timestamp = INVALID_GPS_VALUE;
+                       mm_camcorder_get_attributes(handle, NULL, "tag-gps-time-stamp", &gps_timestamp, NULL);
+                       _mmcam_dbg_log("Gps timestamp [%f]", gps_timestamp);
+                       if (gps_timestamp > 0.0) {
+                               unsigned char *b = NULL;
+                               unsigned int hour;
+                               unsigned int min;
+                               unsigned int microsec;
+                               ExifRational rData;
 
-       /* release internal allocated data */
-       if (encoded_data) {
-               if (dest.data == encoded_data) {
-                       dest.data = NULL;
-               }
+                               hour = (unsigned int)(gps_timestamp / 3600);
+                               min = (unsigned int)((gps_timestamp - 3600 * hour) / 60);
+                               microsec = (unsigned int)(((double)((double)gps_timestamp -(double)(3600 * hour)) -(double)(60 * min)) * 1000000);
 
-               free(encoded_data);
-               encoded_data = NULL;
-       }
+                               _mmcam_dbg_log("Gps timestamp hour[%d], min[%d], microsec[%d]", hour, min, microsec);
+                               b = malloc(3 * sizeof(ExifRational));
+                               if (b) {
+                                       rData.numerator = hour;
+                                       rData.denominator = 1;
+                                       exif_set_rational(b, exif_data_get_byte_order(ed), rData);
 
-       /*free GstBuffer*/
-       if (buffer1) {
-               gst_buffer_unref(buffer1);
-       }
-       if (buffer2) {
-               gst_buffer_unref(buffer2);
-       }
-       if (buffer3) {
-               gst_buffer_unref(buffer3);
-       }
+                                       rData.numerator = min;
+                                       rData.denominator = 1;
+                                       exif_set_rational(b + 8, exif_data_get_byte_order(ed), rData);
 
-       MMTA_ACUM_ITEM_END( "            MSL capture callback", FALSE );
+                                       rData.numerator = microsec;
+                                       rData.denominator = 1000000;
+                                       exif_set_rational(b + 16, exif_data_get_byte_order(ed), rData);
 
-       _mmcam_dbg_err("END");
+                                       ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_TIME_STAMP,
+                                               EXIF_FORMAT_RATIONAL, 3, (const char *)b);
+                                       free(b);
+                                       if (ret != MM_ERROR_NONE)
+                                               EXIF_SET_ERR(ret, EXIF_TAG_GPS_TIME_STAMP);
+                               } else {
+                                       _mmcam_dbg_warn("malloc failed.");
+                               }
+                       }
+               }
 
-       return;
-}
+               {
+                       unsigned char *date_stamp = NULL;
+                       int date_stamp_len = 0;
 
+                       mm_camcorder_get_attributes(handle, NULL, "tag-gps-date-stamp", &date_stamp, &date_stamp_len, NULL);
 
-static gboolean __mmcamcorder_encodesink_handoff_callback(GstElement *fakesink, GstBuffer *buffer, GstPad *pad, gpointer u_data)
-{
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(u_data);
-       _MMCamcorderSubContext *sc = NULL;
+                       if (date_stamp) {
+                               _mmcam_dbg_log("Date stamp [%s]", date_stamp);
 
-       mmf_return_val_if_fail(hcamcorder, FALSE);
+                               /* cause it should include NULL char */
+                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_DATE_STAMP,
+                                       EXIF_FORMAT_ASCII, date_stamp_len + 1, (const char *)date_stamp);
+                               if (ret != MM_ERROR_NONE)
+                                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_DATE_STAMP);
+                       }
+               }
 
-       sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
-       mmf_return_val_if_fail(sc && sc->element, FALSE);
+               {
+                       unsigned char *processing_method = NULL;
+                       int processing_method_len = 0;
 
-       _mmcam_dbg_log("");
+                       mm_camcorder_get_attributes(handle, NULL, "tag-gps-processing-method", &processing_method, &processing_method_len, NULL);
 
-       /* FIXME. How could you get a thumbnail? */
-       __mmcamcorder_image_capture_cb(fakesink, buffer, NULL, NULL, u_data);
+                       if (processing_method) {
+                               _mmcam_dbg_log("Processing method [%s]", processing_method);
 
-       if (sc->element[_MMCAMCORDER_ENCSINK_ENCBIN].gst) {
-               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_ENCSINK_SINK].gst, "signal-handoffs", FALSE);
-               MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "block", TRUE);
+                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_PROCESSING_METHOD,
+                                       EXIF_FORMAT_UNDEFINED, processing_method_len, (const char *)processing_method);
+                               if (ret != MM_ERROR_NONE) {
+                                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_PROCESSING_METHOD);
+                               }
+                       }
+               }
+       } else {
+               _mmcam_dbg_log("Tag for GPS is DISABLED.");
        }
 
-       return TRUE;
+exit:
+       return ed;
 }
 
 
-/* Take a picture with capture mode */
-int _mmcamcorder_set_resize_property(MMHandleType handle, int capture_width, int capture_height)
+int __mmcamcorder_update_exif_info(MMHandleType handle, void* imagedata, int imgln)
 {
-       int ELEMENT_CROP = 0;
-       int ELEMENT_FILTER = 0;
-
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-       _MMCamcorderSubContext *sc = NULL;
+       int ret = MM_ERROR_NONE;
+       mmf_camcorder_t *hcamcorder = NULL;
+       ExifData *ed = NULL;
 
-       _mmcam_dbg_log("");
+       hcamcorder = MMF_CAMCORDER(handle);
 
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
-       sc = MMF_CAMCORDER_SUBCONTEXT(handle);
-       mmf_return_val_if_fail(sc && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
+       ed = exif_data_new_from_data(imagedata, imgln);
+       /*ed = mm_exif_get_exif_from_info(hcamcorder->exif_info);*/
+
+       if (ed == NULL) {
+               _mmcam_dbg_err("get exif data error!!");
+               return MM_ERROR_INVALID_HANDLE;
+       }
 
-       ELEMENT_CROP = _MMCAMCORDER_ENCSINK_ICROP;
-       ELEMENT_FILTER = _MMCAMCORDER_ENCSINK_IFILT;
+       /* update necessary */
 
-       /*TODO: this is not needed now. */
+       __mmcamcorder_update_exif_make(handle, ed);
+       __mmcamcorder_update_exif_software(handle, ed);
+       __mmcamcorder_update_exif_model(handle, ed);
+       __mmcamcorder_update_exif_orientation(handle, ed);
+       __mmcamcorder_update_exif_gps(handle, ed);
+       ret = mm_exif_set_exif_to_info(hcamcorder->exif_info, ed);
+       if (ret != MM_ERROR_NONE) {
+               _mmcam_dbg_err("mm_exif_set_exif_to_info err!! [%x]", ret);
+       }
 
-       return MM_ERROR_NONE;
+       exif_data_unref(ed);
+       ed = NULL;
+       return ret;
 }
 
-
-int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
+int __mmcamcorder_set_exif_basic_info(MMHandleType handle, int image_width, int image_height)
 {
        int ret = MM_ERROR_NONE;
        int value;
        int str_val_len = 0;
-       int gps_enable = TRUE;
        int cntl = 0;
        int cnts = 0;
-       double f_latitude = INVALID_GPS_VALUE;
-       double f_longitude = INVALID_GPS_VALUE;
-       double f_altitude = INVALID_GPS_VALUE;
        char *str_value = NULL;
-       char *maker = NULL;
        char *user_comment = NULL;
-       char *err_name = NULL;
        ExifData *ed = NULL;
        ExifLong config;
        ExifLong ExifVersion;
@@ -1752,7 +2118,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
        static ExifLong elong[10];
 
        GstCameraControl *control = NULL;
-       GstCameraControlExifInfo avsys_exif_info = {0,};
+       GstCameraControlExifInfo avsys_exif_info;
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        _MMCamcorderSubContext *sc = NULL;
@@ -1764,19 +2130,20 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
        sc = MMF_CAMCORDER_SUBCONTEXT(handle);
        mmf_return_val_if_fail(sc && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
+       CLEAR(avsys_exif_info);
+
        if (!GST_IS_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst)) {
-               _mmcam_dbg_err("Can't cast Video source into camera control. Just return true.");
-               return MM_ERROR_NONE;
+               _mmcam_dbg_err("Can't cast Video source into camera control. Skip camera control values...");
+       } else {
+               control = GST_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst);
+               /* get device information */
+               gst_camera_control_get_exif_info(control, &avsys_exif_info);
        }
 
-       control = GST_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst);
-       /* get device information */
-       gst_camera_control_get_exif_info(control, &avsys_exif_info);
-
        /* get ExifData from exif info */
        ed = mm_exif_get_exif_from_info(hcamcorder->exif_info);
-       if (ed == NULL || ed->ifd == NULL) {
-               _mmcam_dbg_err("get exif data error!!(%p, %p)", ed, (ed ? ed->ifd : NULL));
+       if (ed == NULL) {
+               _mmcam_dbg_err("get exif data error!!");
                return MM_ERROR_INVALID_HANDLE;
        }
 
@@ -1787,43 +2154,42 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
        /*0. EXIF_TAG_EXIF_VERSION */
        ExifVersion = MM_EXIF_VERSION;
        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_EXIF_VERSION,
-                                   EXIF_FORMAT_UNDEFINED, 4, (unsigned char *)&ExifVersion);
-       if (ret != MM_ERROR_NONE) {
+               EXIF_FORMAT_UNDEFINED, 4, (const char *)&ExifVersion);
+       if (ret != MM_ERROR_NONE)
                EXIF_SET_ERR(ret, EXIF_TAG_EXIF_VERSION);
-       }
 
        /*1. EXIF_TAG_IMAGE_WIDTH */ /*EXIF_TAG_PIXEL_X_DIMENSION*/
-       mm_camcorder_get_attributes(handle, NULL, MMCAM_CAPTURE_WIDTH, &value, NULL);
+       value = image_width;
 
        exif_set_long((unsigned char *)&elong[cntl], exif_data_get_byte_order(ed), value);
        ret = mm_exif_set_add_entry(ed, EXIF_IFD_0, EXIF_TAG_IMAGE_WIDTH,
-                                   EXIF_FORMAT_LONG, 1, (unsigned char *)&elong[cntl]);
-       if (ret != MM_ERROR_NONE) {
+               EXIF_FORMAT_LONG, 1, (const char *)&elong[cntl]);
+       if (ret != MM_ERROR_NONE)
                EXIF_SET_ERR(ret, EXIF_TAG_IMAGE_WIDTH);
-       }
 
        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_PIXEL_X_DIMENSION,
-                                   EXIF_FORMAT_LONG, 1, (unsigned char *)&elong[cntl++]);
-       if (ret != MM_ERROR_NONE) {
+               EXIF_FORMAT_LONG, 1, (const char *)&elong[cntl++]);
+       if (ret != MM_ERROR_NONE)
                EXIF_SET_ERR(ret, EXIF_TAG_PIXEL_X_DIMENSION);
-       }
+
        _mmcam_dbg_log("width[%d]", value);
 
        /*2. EXIF_TAG_IMAGE_LENGTH*/ /*EXIF_TAG_PIXEL_Y_DIMENSION*/
-       mm_camcorder_get_attributes(handle, NULL, MMCAM_CAPTURE_HEIGHT, &value, NULL);
+       value = image_height;
 
-       exif_set_long((unsigned char *)&elong[cntl], exif_data_get_byte_order (ed), value);
+       exif_set_long((unsigned char *)&elong[cntl], exif_data_get_byte_order(ed), value);
        ret = mm_exif_set_add_entry(ed, EXIF_IFD_0, EXIF_TAG_IMAGE_LENGTH,
-                                   EXIF_FORMAT_LONG, 1, (unsigned char *)&elong[cntl]);
+               EXIF_FORMAT_LONG, 1, (const char *)&elong[cntl]);
        if (ret != MM_ERROR_NONE) {
                EXIF_SET_ERR(ret, EXIF_TAG_IMAGE_LENGTH);
        }
 
        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_PIXEL_Y_DIMENSION,
-                                   EXIF_FORMAT_LONG, 1, (unsigned char *)&elong[cntl++]);
+               EXIF_FORMAT_LONG, 1, (const char *)&elong[cntl++]);
        if (ret != MM_ERROR_NONE) {
                EXIF_SET_ERR(ret, EXIF_TAG_PIXEL_Y_DIMENSION);
        }
+
        _mmcam_dbg_log("height[%d]", value);
 
        /*4. EXIF_TAG_DATE_TIME */
@@ -1850,30 +2216,30 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
                localtime_r(&t, &tm);
 
                snprintf((char *)b, 20, "%04i:%02i:%02i %02i:%02i:%02i",
-                        tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
-                        tm.tm_hour, tm.tm_min, tm.tm_sec);
+                       tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
+                       tm.tm_hour, tm.tm_min, tm.tm_sec);
 
-               ret = mm_exif_set_add_entry(ed, EXIF_IFD_0, EXIF_TAG_DATE_TIME, EXIF_FORMAT_ASCII, 20, b);
+               ret = mm_exif_set_add_entry(ed, EXIF_IFD_0, EXIF_TAG_DATE_TIME, EXIF_FORMAT_ASCII, 20, (const char *)b);
                if (ret != MM_ERROR_NONE) {
-                       if (ret == MM_ERROR_CAMCORDER_LOW_MEMORY) {
+                       if (ret == (int)MM_ERROR_CAMCORDER_LOW_MEMORY)
                                free(b);
-                       }
+
                        EXIF_SET_ERR(ret, EXIF_TAG_DATE_TIME);
                }
 
-               ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_DATE_TIME_ORIGINAL, EXIF_FORMAT_ASCII, 20, b);
+               ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_DATE_TIME_ORIGINAL, EXIF_FORMAT_ASCII, 20, (const char *)b);
                if (ret != MM_ERROR_NONE) {
-                       if (ret == MM_ERROR_CAMCORDER_LOW_MEMORY) {
+                       if (ret == (int)MM_ERROR_CAMCORDER_LOW_MEMORY)
                                free(b);
-                       }
+
                        EXIF_SET_ERR(ret, EXIF_TAG_DATE_TIME_ORIGINAL);
                }
 
-               ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_DATE_TIME_DIGITIZED, EXIF_FORMAT_ASCII, 20, b);
+               ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_DATE_TIME_DIGITIZED, EXIF_FORMAT_ASCII, 20, (const char *)b);
                if (ret != MM_ERROR_NONE) {
-                       if (ret == MM_ERROR_CAMCORDER_LOW_MEMORY) {
+                       if (ret == (int)MM_ERROR_CAMCORDER_LOW_MEMORY)
                                free(b);
-                       }
+
                        EXIF_SET_ERR(ret, EXIF_TAG_DATE_TIME_DIGITIZED);
                }
 
@@ -1881,85 +2247,55 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
        }
 
        /*5. EXIF_TAG_MAKE */
-       maker = strdup(MM_MAKER_NAME);
-       if (maker) {
-               _mmcam_dbg_log("maker [%s]", maker);
-               ret = mm_exif_set_add_entry(ed, EXIF_IFD_0, EXIF_TAG_MAKE,
-                                           EXIF_FORMAT_ASCII, strlen(maker), (unsigned char *)maker);
-               free(maker);
-               if (ret != MM_ERROR_NONE) {
-                       EXIF_SET_ERR(ret, EXIF_TAG_MAKE);
-               }
-       } else {
-               ret = MM_ERROR_CAMCORDER_LOW_MEMORY;
-               EXIF_SET_ERR(ret, EXIF_TAG_MAKE);
-       }
+       __mmcamcorder_update_exif_make(handle, ed);
+
+#ifdef WRITE_EXIF_MAKER_INFO /* FIXME */
 
        /*6. EXIF_TAG_MODEL */
-       _mmcamcorder_conf_get_value_string(hcamcorder->conf_main,
-                                          CONFIGURE_CATEGORY_MAIN_GENERAL,
-                                          "ModelName",
-                                          &str_value);
-       _mmcam_dbg_log("model_name [%s]", str_value);
-       if (str_value) {
-               char *model = strdup(str_value);
-               mm_exif_set_add_entry(ed,EXIF_IFD_0,EXIF_TAG_MODEL,EXIF_FORMAT_ASCII,strlen(model)+1, (unsigned char*)model);
-               free(model);
-               str_value = NULL;
-               if (ret != MM_ERROR_NONE) {
-                       EXIF_SET_ERR(ret, EXIF_TAG_MODEL);
-               }
-       } else {
-               _mmcam_dbg_warn("failed to get model name");
-       }
+       __mmcamcorder_update_exif_model(handle, ed);
 
+#endif
        /*6. EXIF_TAG_IMAGE_DESCRIPTION */
        mm_camcorder_get_attributes(handle, NULL, MMCAM_TAG_IMAGE_DESCRIPTION, &str_value, &str_val_len, NULL);
-       _mmcam_dbg_log("desctiption [%s]", str_value);
        if (str_value && str_val_len > 0) {
                char *description = strdup(str_value);
-               ret = mm_exif_set_add_entry(ed, EXIF_IFD_0, EXIF_TAG_IMAGE_DESCRIPTION,
-                                           EXIF_FORMAT_ASCII, strlen(description), (unsigned char *)description);
-               free(description);
-               str_value = NULL;
-               str_val_len = 0;
-               if (ret != MM_ERROR_NONE) {
-                       EXIF_SET_ERR(ret, EXIF_TAG_IMAGE_DESCRIPTION);
+
+               _mmcam_dbg_log("desctiption [%s]", str_value);
+
+               if (description) {
+                       ret = mm_exif_set_add_entry(ed, EXIF_IFD_0, EXIF_TAG_IMAGE_DESCRIPTION,
+                               EXIF_FORMAT_ASCII, strlen(description), (const char *)description);
+                       free(description);
+                       str_value = NULL;
+                       str_val_len = 0;
+                       if (ret != MM_ERROR_NONE)
+                               EXIF_SET_ERR(ret, EXIF_TAG_IMAGE_DESCRIPTION);
+               } else {
+                       _mmcam_dbg_err("strdup failed for [%s]", str_value);
                }
        } else {
                _mmcam_dbg_warn("failed to get description");
        }
 
        /*7. EXIF_TAG_SOFTWARE*/
+       __mmcamcorder_update_exif_software(handle, ed);
+
 /*
-       {
+       if (control != NULL) {
                char software[50] = {0,};
                unsigned int len = 0;
 
-               len = snprintf(software, sizeof(software), "%x.%x ", avsys_exif_info.software_used>>8,(avsys_exif_info.software_used & 0xff));
+               len = snprintf(software, sizeof(software), "%x.%x ", avsys_exif_info.software_used>>8, (avsys_exif_info.software_used & 0xff));
                _mmcam_dbg_log("software [%s], len [%d]", software, len);
                ret = mm_exif_set_add_entry(ed, EXIF_IFD_0, EXIF_TAG_SOFTWARE,
-                                           EXIF_FORMAT_ASCII, len, software);
+                       EXIF_FORMAT_ASCII, len, (const char *)software);
                if (ret != MM_ERROR_NONE) {
                        EXIF_SET_ERR(ret, EXIF_TAG_SOFTWARE);
                }
        }
 */
 
-       /*8. EXIF_TAG_ORIENTATION */ 
-       mm_camcorder_get_attributes(handle, NULL, MMCAM_TAG_ORIENTATION, &value, NULL);
-
-       _mmcam_dbg_log("orientation [%d]",value);
-       if (value == 0) {
-               value = MM_EXIF_ORIENTATION;
-       }
-
-       exif_set_short((unsigned char *)&eshort[cnts], exif_data_get_byte_order(ed), value);
-       ret = mm_exif_set_add_entry(ed, EXIF_IFD_0, EXIF_TAG_ORIENTATION,
-                                   EXIF_FORMAT_SHORT, 1, (unsigned char*)&eshort[cnts++]);
-       if (ret != MM_ERROR_NONE) {
-               EXIF_SET_ERR(ret, EXIF_TAG_ORIENTATION);
-       }
+       __mmcamcorder_update_exif_orientation(handle, ed);
 
        /* START INSERT EXIF_IFD */
 
@@ -1967,33 +2303,36 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
        /*FIXME : get user comment from real user */
        user_comment = strdup(MM_USER_COMMENT);
        if (user_comment) {
-               _mmcam_dbg_log("user_comment=%s",user_comment);
+               _mmcam_dbg_log("user_comment=%s", user_comment);
                ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_USER_COMMENT,
-                                           EXIF_FORMAT_ASCII, strlen(user_comment), (unsigned char *)user_comment);
+                       EXIF_FORMAT_ASCII, strlen(user_comment), (const char *)user_comment);
                free(user_comment);
-               if (ret != MM_ERROR_NONE) {
+               if (ret != MM_ERROR_NONE)
                        EXIF_SET_ERR(ret, EXIF_TAG_USER_COMMENT);
-               }
        } else {
                ret = MM_ERROR_CAMCORDER_LOW_MEMORY;
                EXIF_SET_ERR(ret, EXIF_TAG_USER_COMMENT);
        }
 
        /*9. EXIF_TAG_COLOR_SPACE */
-       exif_set_short((unsigned char *)&eshort[cnts], exif_data_get_byte_order(ed), avsys_exif_info.colorspace);
-       ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_COLOR_SPACE,
-                                   EXIF_FORMAT_SHORT, 1, (unsigned char *)&eshort[cnts++]);
-       if (ret != MM_ERROR_NONE) {
-               EXIF_SET_ERR(ret, EXIF_TAG_COLOR_SPACE);
+       if (control != NULL) {
+               exif_set_short((unsigned char *)&eshort[cnts], exif_data_get_byte_order(ed), avsys_exif_info.colorspace);
+               ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_COLOR_SPACE,
+                       EXIF_FORMAT_SHORT, 1, (const char *)&eshort[cnts++]);
+               if (ret != MM_ERROR_NONE) {
+                       EXIF_SET_ERR(ret, EXIF_TAG_COLOR_SPACE);
+               }
        }
 
        /*10. EXIF_TAG_COMPONENTS_CONFIGURATION */
-       config = avsys_exif_info.component_configuration;
-       _mmcam_dbg_log("EXIF_TAG_COMPONENTS_CONFIGURATION [%4x] ",config);
-       ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_COMPONENTS_CONFIGURATION,
-                                   EXIF_FORMAT_UNDEFINED, 4, (unsigned char *)&config);
-       if (ret != MM_ERROR_NONE) {
-               EXIF_SET_ERR(ret, EXIF_TAG_COMPONENTS_CONFIGURATION);
+       if (control != NULL) {
+               config = avsys_exif_info.component_configuration;
+               _mmcam_dbg_log("EXIF_TAG_COMPONENTS_CONFIGURATION [%4x] ", config);
+               ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_COMPONENTS_CONFIGURATION,
+                       EXIF_FORMAT_UNDEFINED, 4, (const char *)&config);
+               if (ret != MM_ERROR_NONE) {
+                       EXIF_SET_ERR(ret, EXIF_TAG_COMPONENTS_CONFIGURATION);
+               }
        }
 
        /*11. EXIF_TAG_COMPRESSED_BITS_PER_PIXEL */
@@ -2001,13 +2340,14 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
 
        /*12. EXIF_TAG_DATE_TIME_ORIGINAL */
        /*13. EXIF_TAG_DATE_TIME_DIGITIZED*/
+
        /*14. EXIF_TAG_EXPOSURE_TIME*/
        if (avsys_exif_info.exposure_time_numerator && avsys_exif_info.exposure_time_denominator) {
                unsigned char *b = NULL;
                ExifRational rData;
 
                _mmcam_dbg_log("EXIF_TAG_EXPOSURE_TIME numerator [%d], denominator [%d]",
-                              avsys_exif_info.exposure_time_numerator, avsys_exif_info.exposure_time_denominator)
+                       avsys_exif_info.exposure_time_numerator, avsys_exif_info.exposure_time_denominator);
 
                b = malloc(sizeof(ExifRational));
                if (b) {
@@ -2016,7 +2356,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
 
                        exif_set_rational(b, exif_data_get_byte_order(ed), rData);
                        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_EXPOSURE_TIME,
-                                                   EXIF_FORMAT_RATIONAL, 1, b);
+                               EXIF_FORMAT_RATIONAL, 1, (const char *)b);
                        free(b);
                        if (ret != MM_ERROR_NONE) {
                                EXIF_SET_ERR(ret, EXIF_TAG_EXPOSURE_TIME);
@@ -2026,7 +2366,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
                }
        } else {
                _mmcam_dbg_log("Skip set EXIF_TAG_EXPOSURE_TIME numerator [%d], denominator [%d]",
-                              avsys_exif_info.exposure_time_numerator, avsys_exif_info.exposure_time_denominator);
+                       avsys_exif_info.exposure_time_numerator, avsys_exif_info.exposure_time_denominator);
        }
 
        /*15. EXIF_TAG_FNUMBER */
@@ -2035,7 +2375,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
                ExifRational rData;
 
                _mmcam_dbg_log("EXIF_TAG_FNUMBER numerator [%d], denominator [%d]",
-                              avsys_exif_info.aperture_f_num_numerator, avsys_exif_info.aperture_f_num_denominator);
+                       avsys_exif_info.aperture_f_num_numerator, avsys_exif_info.aperture_f_num_denominator);
 
                b = malloc(sizeof(ExifRational));
                if (b) {
@@ -2043,17 +2383,17 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
                        rData.denominator = avsys_exif_info.aperture_f_num_denominator;
                        exif_set_rational(b, exif_data_get_byte_order(ed), rData);
                        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_FNUMBER,
-                                                   EXIF_FORMAT_RATIONAL, 1, b);
+                               EXIF_FORMAT_RATIONAL, 1, (const char *)b);
                        free(b);
-                       if(ret != MM_ERROR_NONE) {
+                       if (ret != MM_ERROR_NONE) {
                                EXIF_SET_ERR(ret, EXIF_TAG_FNUMBER);
                        }
                } else {
-                       _mmcam_dbg_warn( "malloc failed." );
+                       _mmcam_dbg_warn("malloc failed.");
                }
        } else {
                _mmcam_dbg_log("Skip set EXIF_TAG_FNUMBER numerator [%d], denominator [%d]",
-                              avsys_exif_info.aperture_f_num_numerator, avsys_exif_info.aperture_f_num_denominator);
+                       avsys_exif_info.aperture_f_num_numerator, avsys_exif_info.aperture_f_num_denominator);
        }
 
        /*16. EXIF_TAG_EXPOSURE_PROGRAM*/
@@ -2061,17 +2401,16 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
        value = MM_EXPOSURE_PROGRAM;
        exif_set_short((unsigned char *)&eshort[cnts], exif_data_get_byte_order(ed), value);
        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_EXPOSURE_PROGRAM,
-                                   EXIF_FORMAT_SHORT, 1, (unsigned char *)&eshort[cnts++]);
-       if (ret != MM_ERROR_NONE) {
+               EXIF_FORMAT_SHORT, 1, (const char *)&eshort[cnts++]);
+       if (ret != MM_ERROR_NONE)
                EXIF_SET_ERR(ret, EXIF_TAG_EXPOSURE_PROGRAM);
-       }
 
        /*17. EXIF_TAG_ISO_SPEED_RATINGS*/
        if (avsys_exif_info.iso) {
                _mmcam_dbg_log("EXIF_TAG_ISO_SPEED_RATINGS [%d]", avsys_exif_info.iso);
                exif_set_short((unsigned char *)&eshort[cnts], exif_data_get_byte_order(ed), avsys_exif_info.iso);
                ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_ISO_SPEED_RATINGS,
-                                           EXIF_FORMAT_SHORT, 1, (unsigned char *)&eshort[cnts++]);
+                       EXIF_FORMAT_SHORT, 1, (const char *)&eshort[cnts++]);
                if (ret != MM_ERROR_NONE) {
                        EXIF_SET_ERR(ret, EXIF_TAG_ISO_SPEED_RATINGS);
                }
@@ -2083,7 +2422,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
                ExifSRational rsData;
 
                _mmcam_dbg_log("EXIF_TAG_SHUTTER_SPEED_VALUE numerator [%d], denominator [%d]",
-                              avsys_exif_info.shutter_speed_numerator, avsys_exif_info.shutter_speed_denominator);
+                       avsys_exif_info.shutter_speed_numerator, avsys_exif_info.shutter_speed_denominator);
 
                b = malloc(sizeof(ExifSRational));
                if (b) {
@@ -2091,7 +2430,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
                        rsData.denominator = avsys_exif_info.shutter_speed_denominator;
                        exif_set_srational(b, exif_data_get_byte_order(ed), rsData);
                        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_SHUTTER_SPEED_VALUE,
-                                                   EXIF_FORMAT_SRATIONAL, 1, b);
+                               EXIF_FORMAT_SRATIONAL, 1, (const char *)b);
                        free(b);
                        if (ret != MM_ERROR_NONE) {
                                EXIF_SET_ERR(ret, EXIF_TAG_SHUTTER_SPEED_VALUE);
@@ -2101,7 +2440,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
                }
        } else {
                _mmcam_dbg_log("Skip set EXIF_TAG_SHUTTER_SPEED_VALUE numerator [%d], denominator [%d]",
-                              avsys_exif_info.shutter_speed_numerator, avsys_exif_info.shutter_speed_denominator);
+                       avsys_exif_info.shutter_speed_numerator, avsys_exif_info.shutter_speed_denominator);
        }
 
        /*19. EXIF_TAG_APERTURE_VALUE*/
@@ -2117,9 +2456,9 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
                        rData.denominator = 1;
                        exif_set_rational(b, exif_data_get_byte_order(ed), rData);
                        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_APERTURE_VALUE,
-                                                   EXIF_FORMAT_RATIONAL, 1, b);
+                               EXIF_FORMAT_RATIONAL, 1, (const char *)b);
                        free(b);
-                       if(ret != MM_ERROR_NONE) {
+                       if (ret != MM_ERROR_NONE) {
                                EXIF_SET_ERR(ret, EXIF_TAG_APERTURE_VALUE);
                        }
                } else {
@@ -2135,7 +2474,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
                ExifSRational rsData;
 
                _mmcam_dbg_log("EXIF_TAG_BRIGHTNESS_VALUE numerator [%d], denominator [%d]",
-                              avsys_exif_info.brigtness_numerator, avsys_exif_info.brightness_denominator);
+                       avsys_exif_info.brigtness_numerator, avsys_exif_info.brightness_denominator);
 
                b = malloc(sizeof(ExifSRational));
                if (b) {
@@ -2143,17 +2482,17 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
                        rsData.denominator = avsys_exif_info.brightness_denominator;
                        exif_set_srational(b, exif_data_get_byte_order(ed), rsData);
                        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_BRIGHTNESS_VALUE,
-                                                   EXIF_FORMAT_SRATIONAL, 1, b);
+                               EXIF_FORMAT_SRATIONAL, 1, (const char *)b);
                        free(b);
                        if (ret != MM_ERROR_NONE) {
                                EXIF_SET_ERR(ret, EXIF_TAG_BRIGHTNESS_VALUE);
                        }
                } else {
-                       _mmcam_dbg_warn( "malloc failed." );
+                       _mmcam_dbg_warn("malloc failed.");
                }
        } else {
                _mmcam_dbg_log("Skip set EXIF_TAG_BRIGHTNESS_VALUE numerator [%d], denominatorr [%d]",
-                              avsys_exif_info.brigtness_numerator, avsys_exif_info.brightness_denominator);
+                       avsys_exif_info.brigtness_numerator, avsys_exif_info.brightness_denominator);
        }
 
        /*21. EXIF_TAG_EXPOSURE_BIAS_VALUE*/
@@ -2163,15 +2502,21 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
                unsigned char *b = NULL;
                ExifSRational rsData;
 
-               _mmcam_dbg_log("EXIF_TAG_BRIGHTNESS_VALUE %d",value);
+               _mmcam_dbg_log("EXIF_TAG_BRIGHTNESS_VALUE %d, default %d, step denominator %d",
+                       value, hcamcorder->brightness_default, hcamcorder->brightness_step_denominator);
 
                b = malloc(sizeof(ExifSRational));
                if (b) {
-                       rsData.numerator = value - 5;
-                       rsData.denominator = 10;
+                       rsData.numerator = value - hcamcorder->brightness_default;
+                       if (hcamcorder->brightness_step_denominator != 0) {
+                               rsData.denominator = hcamcorder->brightness_step_denominator;
+                       } else {
+                               _mmcam_dbg_warn("brightness_step_denominator is ZERO, so set 1");
+                               rsData.denominator = 1;
+                       }
                        exif_set_srational(b, exif_data_get_byte_order(ed), rsData);
                        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_EXPOSURE_BIAS_VALUE,
-                                                   EXIF_FORMAT_SRATIONAL, 1, b);
+                               EXIF_FORMAT_SRATIONAL, 1, (const char *)b);
                        free(b);
                        if (ret != MM_ERROR_NONE) {
                                EXIF_SET_ERR(ret, EXIF_TAG_EXPOSURE_BIAS_VALUE);
@@ -2197,7 +2542,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
                        rData.denominator = 1;
                        exif_set_rational(b, exif_data_get_byte_order(ed), rData);
                        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_MAX_APERTURE_VALUE,
-                                                   EXIF_FORMAT_RATIONAL, 1, b);
+                               EXIF_FORMAT_RATIONAL, 1, b);
                        free(b);
                        if (ret != MM_ERROR_NONE) {
                                EXIF_SET_ERR(ret, EXIF_TAG_MAX_APERTURE_VALUE);
@@ -2212,23 +2557,27 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
        /* defualt : none */
 
        /*24. EXIF_TAG_METERING_MODE */
-       exif_set_short((unsigned char *)&eshort[cnts], exif_data_get_byte_order(ed),avsys_exif_info.metering_mode);
-       _mmcam_dbg_log("EXIF_TAG_METERING_MODE [%d]", avsys_exif_info.metering_mode);
-       ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_METERING_MODE,
-                                   EXIF_FORMAT_SHORT, 1, (unsigned char *)&eshort[cnts++]);
-       if (ret != MM_ERROR_NONE) {
-               EXIF_SET_ERR(ret, EXIF_TAG_METERING_MODE);
+       if (control != NULL) {
+               exif_set_short((unsigned char *)&eshort[cnts], exif_data_get_byte_order(ed), avsys_exif_info.metering_mode);
+               _mmcam_dbg_log("EXIF_TAG_METERING_MODE [%d]", avsys_exif_info.metering_mode);
+               ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_METERING_MODE,
+                       EXIF_FORMAT_SHORT, 1, (const char *)&eshort[cnts++]);
+               if (ret != MM_ERROR_NONE) {
+                       EXIF_SET_ERR(ret, EXIF_TAG_METERING_MODE);
+               }
        }
 
        /*25. EXIF_TAG_LIGHT_SOURCE*/
 
        /*26. EXIF_TAG_FLASH*/
-       exif_set_short((unsigned char *)&eshort[cnts], exif_data_get_byte_order (ed),avsys_exif_info.flash);
-       _mmcam_dbg_log("EXIF_TAG_FLASH [%d]", avsys_exif_info.flash);
-       ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_FLASH,
-                                   EXIF_FORMAT_SHORT, 1, (unsigned char *)&eshort[cnts++]);
-       if (ret != MM_ERROR_NONE) {
-               EXIF_SET_ERR(ret, EXIF_TAG_FLASH);
+       if (control != NULL) {
+               exif_set_short((unsigned char *)&eshort[cnts], exif_data_get_byte_order(ed), avsys_exif_info.flash);
+               _mmcam_dbg_log("EXIF_TAG_FLASH [%d]", avsys_exif_info.flash);
+               ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_FLASH,
+                       EXIF_FORMAT_SHORT, 1, (const char *)&eshort[cnts++]);
+               if (ret != MM_ERROR_NONE) {
+                       EXIF_SET_ERR(ret, EXIF_TAG_FLASH);
+               }
        }
 
        /*27. EXIF_TAG_FOCAL_LENGTH*/
@@ -2237,7 +2586,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
                ExifRational rData;
 
                _mmcam_dbg_log("EXIF_TAG_FOCAL_LENGTH numerator [%d], denominator [%d]",
-                              avsys_exif_info.focal_len_numerator, avsys_exif_info.focal_len_denominator);
+                       avsys_exif_info.focal_len_numerator, avsys_exif_info.focal_len_denominator);
 
                b = malloc(sizeof(ExifRational));
                if (b) {
@@ -2245,7 +2594,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
                        rData.denominator = avsys_exif_info.focal_len_denominator;
                        exif_set_rational(b, exif_data_get_byte_order(ed), rData);
                        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_FOCAL_LENGTH,
-                                                   EXIF_FORMAT_RATIONAL, 1, b);
+                               EXIF_FORMAT_RATIONAL, 1, (const char *)b);
                        free(b);
                        if (ret != MM_ERROR_NONE) {
                                EXIF_SET_ERR(ret, EXIF_TAG_FOCAL_LENGTH);
@@ -2255,15 +2604,15 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
                }
        } else {
                _mmcam_dbg_log("Skip set EXIF_TAG_FOCAL_LENGTH numerator [%d], denominator [%d]",
-                              avsys_exif_info.focal_len_numerator, avsys_exif_info.focal_len_denominator);
+                       avsys_exif_info.focal_len_numerator, avsys_exif_info.focal_len_denominator);
        }
 
        /*28. EXIF_TAG_SENSING_METHOD*/
        /*FIXME*/
        value = MM_SENSING_MODE;
-       exif_set_short((unsigned char *)&eshort[cnts], exif_data_get_byte_order (ed),value);
+       exif_set_short((unsigned char *)&eshort[cnts], exif_data_get_byte_order(ed), value);
        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_SENSING_METHOD,
-                                   EXIF_FORMAT_SHORT, 1, (unsigned char *)&eshort[cnts++]);
+               EXIF_FORMAT_SHORT, 1, (const char *)&eshort[cnts++]);
        if (ret != MM_ERROR_NONE) {
                EXIF_SET_ERR(ret, EXIF_TAG_SENSING_METHOD);
        }
@@ -2273,7 +2622,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
        value = MM_FILE_SOURCE;
        exif_set_long(&elong[cntl], exif_data_get_byte_order(ed),value);
        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_FILE_SOURCE,
-                                   EXIF_FORMAT_UNDEFINED, 4, (unsigned char *)&elong[cntl++]);
+               EXIF_FORMAT_UNDEFINED, 4, (const char *)&elong[cntl++]);
        if (ret != MM_ERROR_NONE) {
                EXIF_SET_ERR(ret, EXIF_TAG_FILE_SOURCE);
        }
@@ -2284,7 +2633,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
        value = MM_SCENE_TYPE;
        exif_set_long(&elong[cntl], exif_data_get_byte_order(ed),value);
        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_SCENE_TYPE,
-                                   EXIF_FORMAT_UNDEFINED, 4, (unsigned char *)&elong[cntl++]);
+               EXIF_FORMAT_UNDEFINED, 4, (const char *)&elong[cntl++]);
        if (ret != MM_ERROR_NONE) {
                EXIF_SET_ERR(ret, EXIF_TAG_SCENE_TYPE);
        }
@@ -2293,29 +2642,26 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
        /*31. EXIF_TAG_EXPOSURE_MODE*/
        /*FIXME*/
        value = MM_EXPOSURE_MODE;
-       exif_set_short((unsigned char *)&eshort[cnts], exif_data_get_byte_order(ed),value);
+       exif_set_short((unsigned char *)&eshort[cnts], exif_data_get_byte_order(ed), value);
        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_EXPOSURE_MODE,
-                                   EXIF_FORMAT_SHORT, 1, (unsigned char *)&eshort[cnts++]);
-       if (ret != MM_ERROR_NONE) {
+               EXIF_FORMAT_SHORT, 1, (const char *)&eshort[cnts++]);
+       if (ret != MM_ERROR_NONE)
                EXIF_SET_ERR(ret, EXIF_TAG_EXPOSURE_MODE);
-       }
-
 
        /*32. EXIF_TAG_WHITE_BALANCE*/
        ret = mm_camcorder_get_attributes(handle, NULL, MMCAM_FILTER_WB, &value, NULL);
        if (ret == MM_ERROR_NONE) {
                int set_value = 0;
                _mmcam_dbg_log("WHITE BALANCE [%d]", value);
-       
-               if (value == MM_CAMCORDER_WHITE_BALANCE_AUTOMATIC) {
+
+               if (value == MM_CAMCORDER_WHITE_BALANCE_AUTOMATIC)
                        set_value = 0;
-               } else {
+               else
                        set_value = 1;
-               }
 
                exif_set_short((unsigned char *)&eshort[cnts], exif_data_get_byte_order(ed), set_value);
                ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_WHITE_BALANCE,
-                                           EXIF_FORMAT_SHORT, 1, (unsigned char *)&eshort[cnts++]);
+                       EXIF_FORMAT_SHORT, 1, (const char *)&eshort[cnts++]);
                if (ret != MM_ERROR_NONE) {
                        EXIF_SET_ERR(ret, EXIF_TAG_WHITE_BALANCE);
                }
@@ -2331,7 +2677,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
 
                exif_set_long(&elong[cntl], exif_data_get_byte_order(ed), value);
                ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_DIGITAL_ZOOM_RATIO,
-                                           EXIF_FORMAT_LONG, 1, (unsigned char *)&elong[cntl++]);
+                       EXIF_FORMAT_LONG, 1, (const char *)&elong[cntl++]);
                if (ret != MM_ERROR_NONE) {
                        EXIF_SET_ERR(ret, EXIF_TAG_DIGITAL_ZOOM_RATIO);
                }
@@ -2346,7 +2692,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
        value = MM_FOCAL_LENGTH_35MMFILM;
        exif_set_short(&eshort[cnts], exif_data_get_byte_order(ed),value);
        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_FOCAL_LENGTH_IN_35MM_FILM,
-                                   EXIF_FORMAT_SHORT, 1, (unsigned char *)&eshort[cnts++]);
+               EXIF_FORMAT_SHORT, 1, (const char *)&eshort[cnts++]);
        if (ret != MM_ERROR_NONE) {
                EXIF_SET_ERR(ret, EXIF_TAG_FOCAL_LENGTH_IN_35MM_FILM);
        }
@@ -2374,7 +2720,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
 
                        exif_set_short((unsigned char *)&eshort[cnts], exif_data_get_byte_order(ed), scene_capture_type);
                        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_SCENE_CAPTURE_TYPE,
-                                                   EXIF_FORMAT_SHORT, 1, (unsigned char *)&eshort[cnts++]);
+                               EXIF_FORMAT_SHORT, 1, (const char *)&eshort[cnts++]);
                        if (ret != MM_ERROR_NONE) {
                                EXIF_SET_ERR(ret, EXIF_TAG_SCENE_CAPTURE_TYPE);
                        }
@@ -2389,7 +2735,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
        value = MM_GAIN_CONTROL;
        exif_set_long(&elong[cntl], exif_data_get_byte_order(ed), value);
        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_GAIN_CONTROL,
-                                   EXIF_FORMAT_LONG, 1, (unsigned char *)&elong[cntl++]);
+               EXIF_FORMAT_LONG, 1, (const char *)&elong[cntl++]);
        if (ret != MM_ERROR_NONE) {
                EXIF_SET_ERR(ret, EXIF_TAG_GAIN_CONTROL);
        }
@@ -2402,9 +2748,9 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
                int level = 0;
 
                _mmcamcorder_conf_get_value_int_range(hcamcorder->conf_ctrl,
-                                                     CONFIGURE_CATEGORY_CTRL_EFFECT,
-                                                     "Contrast",
-                                                     &irange);
+                       CONFIGURE_CATEGORY_CTRL_EFFECT,
+                       "Contrast",
+                       &irange);
                if (irange != NULL) {
                        mm_camcorder_get_attributes(handle, NULL, MMCAM_FILTER_CONTRAST, &value, NULL);
 
@@ -2420,7 +2766,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
 
                        exif_set_short((unsigned char *)&eshort[cnts], exif_data_get_byte_order(ed), level);
                        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_CONTRAST,
-                                                   EXIF_FORMAT_SHORT, 1, (unsigned char *)&eshort[cnts++]);
+                               EXIF_FORMAT_SHORT, 1, (const char *)&eshort[cnts++]);
                        if (ret != MM_ERROR_NONE) {
                                EXIF_SET_ERR(ret, EXIF_TAG_CONTRAST);
                        }
@@ -2435,9 +2781,9 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
                int level = 0;
 
                _mmcamcorder_conf_get_value_int_range(hcamcorder->conf_ctrl,
-                                                     CONFIGURE_CATEGORY_CTRL_EFFECT,
-                                                     "Saturation",
-                                                     &irange);
+                       CONFIGURE_CATEGORY_CTRL_EFFECT,
+                       "Saturation",
+                       &irange);
                if (irange != NULL) {
                        mm_camcorder_get_attributes(handle, NULL, MMCAM_FILTER_SATURATION, &value, NULL);
 
@@ -2448,12 +2794,12 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
                        } else if (value < irange->default_value) {
                                level = MM_VALUE_LOW;
                        } else {
-                               level=MM_VALUE_HARD;
+                               level = MM_VALUE_HARD;
                        }
 
                        exif_set_short((unsigned char *)&eshort[cnts], exif_data_get_byte_order(ed), level);
                        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_SATURATION,
-                                                   EXIF_FORMAT_SHORT, 1, (unsigned char *)&eshort[cnts++]);
+                               EXIF_FORMAT_SHORT, 1, (const char *)&eshort[cnts++]);
                        if (ret != MM_ERROR_NONE) {
                                EXIF_SET_ERR(ret, EXIF_TAG_SATURATION);
                        }
@@ -2468,9 +2814,9 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
                int level = 0;
 
                _mmcamcorder_conf_get_value_int_range(hcamcorder->conf_ctrl,
-                                                     CONFIGURE_CATEGORY_CTRL_EFFECT,
-                                                     "Sharpness",
-                                                     &irange);
+                       CONFIGURE_CATEGORY_CTRL_EFFECT,
+                       "Sharpness",
+                       &irange);
                if (irange != NULL) {
                        mm_camcorder_get_attributes(handle, NULL, MMCAM_FILTER_SHARPNESS, &value, NULL);
 
@@ -2486,7 +2832,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
 
                        exif_set_short((unsigned char *)&eshort[cnts], exif_data_get_byte_order(ed), level);
                        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_SHARPNESS,
-                                                   EXIF_FORMAT_SHORT, 1, (unsigned char *)&eshort[cnts++]);
+                               EXIF_FORMAT_SHORT, 1, (const char *)&eshort[cnts++]);
                        if (ret != MM_ERROR_NONE) {
                                EXIF_SET_ERR(ret, EXIF_TAG_SHARPNESS);
                        }
@@ -2501,315 +2847,44 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle)
        _mmcam_dbg_log("DISTANCE_RANGE [%d]", value);
        exif_set_short((unsigned char *)&eshort[cnts], exif_data_get_byte_order(ed), value);
        ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_SUBJECT_DISTANCE_RANGE,
-                                   EXIF_FORMAT_SHORT, 1, (unsigned char *)&eshort[cnts++]);
+               EXIF_FORMAT_SHORT, 1, (const char *)&eshort[cnts++]);
        if (ret != MM_ERROR_NONE) {
                EXIF_SET_ERR(ret, EXIF_TAG_SUBJECT_DISTANCE_RANGE);
        }
 
        /* GPS information */
-       ret = mm_camcorder_get_attributes(handle, NULL, MMCAM_TAG_GPS_ENABLE, &gps_enable, NULL);
-       if (ret == MM_ERROR_NONE && gps_enable) {
-               ExifByte GpsVersion[4]={2,2,0,0};
-
-               _mmcam_dbg_log("Tag for GPS is ENABLED.");
-
-               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_VERSION_ID,
-                                           EXIF_FORMAT_BYTE, 4, (unsigned char *)&GpsVersion);
-               if (ret != MM_ERROR_NONE) {
-                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_VERSION_ID);
-               }
-
-               /*41. Latitude*/
-               ret = mm_camcorder_get_attributes(handle, &err_name,
-                                                 MMCAM_TAG_LATITUDE, &f_latitude,
-                                                 MMCAM_TAG_LONGITUDE, &f_longitude,
-                                                 MMCAM_TAG_ALTITUDE, &f_altitude, NULL);
-               if (ret != MM_ERROR_NONE) {
-                       _mmcam_dbg_err("failed to get gps info [%x][%s]", ret, err_name);
-                       SAFE_FREE(err_name);
-                       goto exit;
-               }
-
-               _mmcam_dbg_log("f_latitude [%f]", f_latitude);
-               if (f_latitude != INVALID_GPS_VALUE) {
-                       unsigned char *b = NULL;
-                       unsigned int deg;
-                       unsigned int min;
-                       unsigned int sec;
-                       ExifRational rData;
-
-                       if (f_latitude < 0) {
-                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_LATITUDE_REF,
-                                                           EXIF_FORMAT_ASCII, 2, (unsigned char *)"S");
-                               if (ret != MM_ERROR_NONE) {
-                                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_LATITUDE_REF);
-                               }
-                               f_latitude = -f_latitude;
-                       } else if (f_latitude > 0) {
-                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_LATITUDE_REF,
-                                                           EXIF_FORMAT_ASCII, 2, (unsigned char *)"N");
-                               if (ret != MM_ERROR_NONE) {
-                                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_LATITUDE_REF);
-                               }
-                       }
-
-                       deg = (unsigned int)(f_latitude);
-                       min = (unsigned int)((f_latitude-deg)*60);
-                       sec = (unsigned int)(((f_latitude-deg)*3600)-min*60);
-
-                       _mmcam_dbg_log("f_latitude deg[%d], min[%d], sec[%d]", deg, min, sec);
-                       b = malloc(3 * sizeof(ExifRational));
-                       if (b) {
-                               rData.numerator = deg;
-                               rData.denominator = 1;
-                               exif_set_rational(b, exif_data_get_byte_order(ed), rData);
-                               rData.numerator = min;
-                               exif_set_rational(b+8, exif_data_get_byte_order(ed), rData);
-                               rData.numerator = sec;
-                               exif_set_rational(b+16, exif_data_get_byte_order(ed), rData);
-
-                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_LATITUDE,
-                                                           EXIF_FORMAT_RATIONAL, 3, (unsigned char *)b);
-                               free(b);
-                               if (ret != MM_ERROR_NONE) {
-                                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_LATITUDE);
-                               }
-                       } else {
-                               _mmcam_dbg_warn("malloc failed");
-                       }
-               }
-
-               /*42. Longitude*/
-               _mmcam_dbg_log("f_longitude [%f]", f_longitude);
-               if (f_longitude != INVALID_GPS_VALUE) {
-                       unsigned char *b = NULL;
-                       unsigned int deg;
-                       unsigned int min;
-                       unsigned int sec;
-                       ExifRational rData;
-
-                       if (f_longitude < 0) {
-                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_LONGITUDE_REF,
-                                                           EXIF_FORMAT_ASCII, 2, (unsigned char *)"W");
-                               if (ret != MM_ERROR_NONE) {
-                                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_LONGITUDE_REF);
-                               }
-                               f_longitude = -f_longitude;
-                       } else if (f_longitude > 0) {
-                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_LONGITUDE_REF,
-                                                           EXIF_FORMAT_ASCII, 2, (unsigned char *)"E");
-                               if (ret != MM_ERROR_NONE) {
-                                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_LONGITUDE_REF);
-                               }
-                       }
-
-                       deg = (unsigned int)(f_longitude);
-                       min = (unsigned int)((f_longitude-deg)*60);
-                       sec = (unsigned int)(((f_longitude-deg)*3600)-min*60);
-
-                       _mmcam_dbg_log("f_longitude deg[%d], min[%d], sec[%d]", deg, min, sec);
-                       b = malloc(3 * sizeof(ExifRational));
-                       if (b) {
-                               rData.numerator = deg;
-                               rData.denominator = 1;
-                               exif_set_rational(b, exif_data_get_byte_order(ed), rData);
-                               rData.numerator = min;
-                               exif_set_rational(b+8, exif_data_get_byte_order(ed), rData);
-                               rData.numerator = sec;
-                               exif_set_rational(b+16, exif_data_get_byte_order(ed), rData);
-                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_LONGITUDE,
-                                                           EXIF_FORMAT_RATIONAL, 3, (unsigned char *)b);
-                               free(b);
-                               if (ret != MM_ERROR_NONE) {
-                                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_LONGITUDE);
-                               }
-                       } else {
-                               _mmcam_dbg_warn("malloc failed");
-                       }
-               }
-
-               /*43. Altitude*/
-               _mmcam_dbg_log("f_altitude [%f]", f_altitude);
-               if (f_altitude != INVALID_GPS_VALUE) {
-                       ExifByte alt_ref = 0;
-                       unsigned char *b = NULL;
-                       ExifRational rData;
-                       b = malloc(sizeof(ExifRational));
-                       if (b) {
-                               if (f_altitude < 0) {
-                                       alt_ref = 1;
-                                       f_altitude = -f_altitude;
-                               }
-
-                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_ALTITUDE_REF,
-                                                           EXIF_FORMAT_BYTE, 1, (unsigned char *)&alt_ref);
-                               if (ret != MM_ERROR_NONE) {
-                                       _mmcam_dbg_err("error [%x], tag [%x]", ret, EXIF_TAG_GPS_ALTITUDE_REF);
-                                       if (ret == MM_ERROR_CAMCORDER_LOW_MEMORY) {
-                                               free(b);
-                                               b = NULL;
-                                               goto exit;
-                                       }
-                               }
-
-                               rData.numerator = (unsigned int)(f_altitude + 0.5)*100;
-                               rData.denominator = 100;
-                               exif_set_rational(b, exif_data_get_byte_order(ed), rData);
-                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_ALTITUDE,
-                                                           EXIF_FORMAT_RATIONAL, 1, (unsigned char *)b);
-                               free(b);
-                               if (ret != MM_ERROR_NONE) {
-                                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_ALTITUDE);
-                               }
-                       } else {
-                               _mmcam_dbg_warn("malloc failed");
-                       }
-               }
-
-               /*44. EXIF_TAG_GPS_TIME_STAMP*/
-               {
-                       double gps_timestamp = INVALID_GPS_VALUE;
-                       mm_camcorder_get_attributes(handle, NULL, "tag-gps-time-stamp", &gps_timestamp, NULL);
-                       _mmcam_dbg_log("Gps timestamp [%f]", gps_timestamp);
-                       if (gps_timestamp > 0.0) {
-                               unsigned char *b = NULL;
-                               unsigned int hour;
-                               unsigned int min;
-                               unsigned int microsec;
-                               ExifRational rData;
-
-                               hour = (unsigned int)(gps_timestamp / 3600);
-                               min = (unsigned int)((gps_timestamp - 3600 * hour) / 60);
-                               microsec = (unsigned int)(((double)((double)gps_timestamp -(double)(3600 * hour)) -(double)(60 * min)) * 1000000);
-
-                               _mmcam_dbg_log("Gps timestamp hour[%d], min[%d], microsec[%d]", hour, min, microsec);
-                               b = malloc(3 * sizeof(ExifRational));
-                               if (b) {
-                                       rData.numerator = hour;
-                                       rData.denominator = 1;
-                                       exif_set_rational(b, exif_data_get_byte_order(ed), rData);
-
-                                       rData.numerator = min;
-                                       rData.denominator = 1;
-                                       exif_set_rational(b + 8, exif_data_get_byte_order(ed), rData);
-
-                                       rData.numerator = microsec;
-                                       rData.denominator = 1000000;
-                                       exif_set_rational(b + 16, exif_data_get_byte_order(ed), rData);
-
-                                       ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_TIME_STAMP,
-                                                                   EXIF_FORMAT_RATIONAL, 3, b);
-                                       free(b);
-                                       if (ret != MM_ERROR_NONE) {
-                                               EXIF_SET_ERR(ret, EXIF_TAG_GPS_TIME_STAMP);
-                                       }
-                               } else {
-                                       _mmcam_dbg_warn( "malloc failed." );
-                               }
-                       }
-               }
-
-               /*45. EXIF_TAG_GPS_DATE_STAMP*/
-               {
-                       unsigned char *date_stamp = NULL;
-                       int date_stamp_len = 0;
-
-                       mm_camcorder_get_attributes(handle, NULL, "tag-gps-date-stamp", &date_stamp, &date_stamp_len, NULL);
+       __mmcamcorder_update_exif_gps(handle, ed);
 
-                       if (date_stamp) {
-                               _mmcam_dbg_log("Date stamp [%s]", date_stamp);
-
-                               /* cause it should include NULL char */
-                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_DATE_STAMP,
-                                                           EXIF_FORMAT_ASCII, date_stamp_len + 1, date_stamp);
-                               if (ret != MM_ERROR_NONE) {
-                                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_DATE_STAMP);
-                               }
-                       }
-               }
-
-               /*46. EXIF_TAG_GPS_PROCESSING_METHOD */
-               {
-                       unsigned char *processing_method = NULL;
-                       int processing_method_len = 0;
-
-                       mm_camcorder_get_attributes(handle, NULL, "tag-gps-processing-method", &processing_method, &processing_method_len, NULL);
-
-                       if (processing_method) {
-                               _mmcam_dbg_log("Processing method [%s]", processing_method);
+       _mmcam_dbg_log("");
 
-                               ret = mm_exif_set_add_entry(ed, EXIF_IFD_GPS, EXIF_TAG_GPS_PROCESSING_METHOD,
-                                                           EXIF_FORMAT_UNDEFINED, processing_method_len, processing_method);
-                               if (ret != MM_ERROR_NONE) {
-                                       EXIF_SET_ERR(ret, EXIF_TAG_GPS_PROCESSING_METHOD);
-                               }
-                       }
-               }
-       } else {
-               _mmcam_dbg_log( "Tag for GPS is DISABLED." );
-       }
+       ret = mm_exif_set_exif_to_info(hcamcorder->exif_info, ed);
+       if (ret != MM_ERROR_NONE)
+               _mmcam_dbg_err("mm_exif_set_exif_to_info err!! [%x]", ret);
 
+exit:
+       _mmcam_dbg_log("finished!! [%x]", ret);
 
-       /*47. EXIF_TAG_MAKER_NOTE*/
-       ret = mm_exif_set_add_entry(ed, EXIF_IFD_EXIF, EXIF_TAG_MAKER_NOTE,
-                                   EXIF_FORMAT_UNDEFINED, 8, (unsigned char *)"SAMSUNG");
-       if (ret != MM_ERROR_NONE) {
-               EXIF_SET_ERR(ret, EXIF_TAG_MAKER_NOTE);
-       }
+       if (ed)
+               exif_data_unref(ed);
 
-       /* create and link samsung maker note */
-       ret = mm_exif_mnote_create(ed);
-       if (ret != MM_ERROR_NONE){
-               EXIF_SET_ERR(ret, EXIF_TAG_MAKER_NOTE);
-       } else {
-               _mmcam_dbg_log("Samsung makernote created");
+       return ret;
+}
 
-               /* add samsung maker note entries (param : data, tag, index, subtag index1, subtag index2) */
-               ret = mm_exif_mnote_set_add_entry(ed, MNOTE_SAMSUNG_TAG_MNOTE_VERSION, 0, _MNOTE_VALUE_NONE, _MNOTE_VALUE_NONE);
-               if (ret != MM_ERROR_NONE) {
-                       _mmcam_dbg_err("mm_exif_mnote_set_add_entry error! [%x]", ret);
-               }
-       /*
-               ret = mm_exif_mnote_set_add_entry(ed, MNOTE_SAMSUNG_TAG_DEVICE_ID, 2, _MNOTE_VALUE_NONE, _MNOTE_VALUE_NONE);
-               if (ret != MM_ERROR_NONE) {
-                       _mmcam_dbg_err("mm_exif_mnote_set_add_entry error! [%x]", ret);
-               }
 
-               ret = mm_exif_mnote_set_add_entry(ed, MNOTE_SAMSUNG_TAG_SERIAL_NUM, _MNOTE_VALUE_NONE, _MNOTE_VALUE_NONE, _MNOTE_VALUE_NONE);
-               if (ret != MM_ERROR_NONE) {
-                       _mmcam_dbg_err("mm_exif_mnote_set_add_entry error! [%x]", ret);
-               }
+static void __sound_status_changed_cb(keynode_t* node, void *data)
+{
+       mmf_camcorder_t *hcamcorder = (mmf_camcorder_t *)data;
+       _MMCamcorderImageInfo *info = NULL;
 
-               ret = mm_exif_mnote_set_add_entry(ed, MNOTE_SAMSUNG_TAG_COLOR_SPACE, 1, _MNOTE_VALUE_NONE, _MNOTE_VALUE_NONE);
-               if (ret != MM_ERROR_NONE) {
-                       _mmcam_dbg_err("mm_exif_mnote_set_add_entry error! [%x]", ret);
-               }
-       */
-               ret = mm_exif_mnote_set_add_entry(ed, MNOTE_SAMSUNG_TAG_FACE_DETECTION, 0, _MNOTE_VALUE_NONE, _MNOTE_VALUE_NONE);
-               if (ret != MM_ERROR_NONE) {
-                       _mmcam_dbg_err("mm_exif_mnote_set_add_entry error! ret=%x", ret);
-               }
-       /*
-               ret = mm_exif_mnote_set_add_entry(ed, MNOTE_SAMSUNG_TAG_MODEL_ID, _MNOTE_VALUE_NONE, 3, 2);
-               if (ret != MM_ERROR_NONE) {
-                       _mmcam_dbg_err("mm_exif_mnote_set_add_entry error! [%x]", ret);
-               }
-       */
-       }
+       mmf_return_if_fail(hcamcorder && hcamcorder->sub_context && hcamcorder->sub_context->info_image);
 
-       _mmcam_dbg_log("");
+       _mmcam_dbg_log("START");
 
-       ret = mm_exif_set_exif_to_info(hcamcorder->exif_info, ed);
-       if (ret != MM_ERROR_NONE) {
-               _mmcam_dbg_err("mm_exif_set_exif_to_info err!! [%x]", ret);
-       }
+       info = hcamcorder->sub_context->info_image;
 
-exit:
-       _mmcam_dbg_log("finished!! [%x]", ret);
+       vconf_get_bool(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL, &(info->sound_status));
 
-       if (ed) {
-               exif_data_unref (ed);
-       }
+       _mmcam_dbg_log("DONE : sound status %d", info->sound_status);
 
-       return ret;
+       return;
 }