Add new field to frame meta for lux index
[platform/core/multimedia/libmm-camcorder.git] / src / mm_camcorder_gstcommon.c
index f4a15de..ffb67a0 100644 (file)
@@ -129,6 +129,22 @@ static gboolean videocodec_fileformat_compatibility_table[MM_VIDEO_CODEC_NUM][MM
 #define _MMCAMCORDER_CONVERT_OUTPUT_BUFFER_NUM    6
 #define _MMCAMCORDER_NANOSEC_PER_1SEC             1000000000
 #define _MMCAMCORDER_NANOSEC_PER_1MILISEC         1000
+#define _MMCAMCORDER_SIGNAL_REQUEST_CODEC_CONFIG  "request-codec-config"
+#define _MMCAMCORDER_CROP_ARRAY_LENGTH            4
+
+#define FRAME_META_TS_SOE       "ts_soe"
+#define FRAME_META_TS_EOE       "ts_eoe"
+#define FRAME_META_TS_SOF       "ts_sof"
+#define FRAME_META_TS_EOF       "ts_eof"
+#define FRAME_META_TS_HAL       "ts_hal"
+#define FRAME_META_TS_QMF       "ts_qmf"
+#define FRAME_META_TS_GST       "ts_gst"
+#define FRAME_META_TD_EXP       "td_exp"
+#define FRAME_META_TS_AUX       "ts_aux"
+#define FRAME_META_TD_AUX       "td_aux"
+#define FRAME_META_SEQNUM       "seqnum"
+#define FRAME_META_FLAGS        "flags"
+#define FRAME_META_LUX_INDEX    "lux_index"
 
 
 /*-----------------------------------------------------------------------
@@ -147,43 +163,37 @@ static gboolean videocodec_fileformat_compatibility_table[MM_VIDEO_CODEC_NUM][MM
  * @remarks
  * @see        __mmcamcorder_create_preview_pipeline()
  */
+
 static GstPadProbeReturn __mmcamcorder_video_dataprobe_preview(GstPad *pad, GstPadProbeInfo *info, gpointer u_data);
+static GstPadProbeReturn __mmcamcorder_video_dataprobe_preview2(GstPad *pad, GstPadProbeInfo *info, gpointer u_data);
 static GstPadProbeReturn __mmcamcorder_video_dataprobe_record(GstPad *pad, GstPadProbeInfo *info, gpointer u_data);
 
 static int __mmcamcorder_get_amrnb_bitrate_mode(int bitrate);
-static guint32 _mmcamcorder_convert_fourcc_string_to_value(const gchar* format_name);
-#ifdef _MMCAMCORDER_PRODUCT_TV
-static bool __mmcamcorder_find_max_resolution(MMHandleType handle, gint *max_width, gint *max_height);
-#endif /* _MMCAMCORDER_PRODUCT_TV */
+static guint32 _mmcamcorder_get_structure_fourcc(const GstStructure *structure);
 
-static gboolean __mmcamcorder_set_stream_data(MMCamcorderVideoStreamDataType *stream, GstBuffer *buffer, GstMemory *memory);
+static gboolean __mmcamcorder_set_stream_data(MMCamcorderVideoStreamDataType *stream, GstBuffer *buffer, GstMapInfo *map_info);
 static gboolean __mmcamcorder_set_stream_data_zero_copy(MMCamcorderVideoStreamDataType *stream, GstBuffer *buffer, GstMemory *memory);
+static const char *__mmcamcorder_get_parser_name(MMPixelFormatType format);
+static gboolean __mmcamcorder_frame_meta_foreach_func(GQuark field_id, const GValue *value, gpointer user_data);
 
 /*=======================================================================================
 |  FUNCTION DEFINITIONS                                                                 |
 =======================================================================================*/
-static gboolean __mmcamcorder_set_stream_data(MMCamcorderVideoStreamDataType *stream, GstBuffer *buffer, GstMemory *memory)
+static gboolean __mmcamcorder_set_stream_data(MMCamcorderVideoStreamDataType *stream, GstBuffer *buffer, GstMapInfo *map_info)
 {
        gboolean ret = TRUE;
-       GstMapInfo map_info;
 
        mmf_return_val_if_fail(buffer, FALSE);
        mmf_return_val_if_fail(stream, FALSE);
+       mmf_return_val_if_fail(map_info, FALSE);
 
-       memset(&map_info, 0x0, sizeof(GstMapInfo));
-
-       if (!gst_memory_map(memory, &map_info, GST_MAP_READWRITE)) {
-               MMCAM_LOG_ERROR("map failed for memory[%p]", memory);
-               return FALSE;
-       }
-
-       stream->length_total = gst_memory_get_sizes(memory, NULL, NULL);
+       stream->length_total = (unsigned int)map_info->size;
 
        switch (stream->format) {
        case MM_PIXEL_FORMAT_NV12: /* fall through */
        case MM_PIXEL_FORMAT_NV21:
                stream->data_type = MM_CAM_STREAM_DATA_YUV420SP;
-               stream->data.yuv420sp.y = map_info.data;
+               stream->data.yuv420sp.y = map_info->data;
                stream->data.yuv420sp.length_y = stream->width * stream->height;
                stream->data.yuv420sp.uv = stream->data.yuv420sp.y + stream->data.yuv420sp.length_y;
                stream->data.yuv420sp.length_uv = stream->data.yuv420sp.length_y >> 1;
@@ -196,7 +206,7 @@ static gboolean __mmcamcorder_set_stream_data(MMCamcorderVideoStreamDataType *st
 
        case MM_PIXEL_FORMAT_I420:
                stream->data_type = MM_CAM_STREAM_DATA_YUV420P;
-               stream->data.yuv420p.y = map_info.data;
+               stream->data.yuv420p.y = map_info->data;
                stream->data.yuv420p.length_y = stream->width * stream->height;
                stream->data.yuv420p.u = stream->data.yuv420p.y + stream->data.yuv420p.length_y;
                stream->data.yuv420p.length_u = stream->data.yuv420p.length_y >> 2;
@@ -211,7 +221,7 @@ static gboolean __mmcamcorder_set_stream_data(MMCamcorderVideoStreamDataType *st
 
        case MM_PIXEL_FORMAT_422P:
                stream->data_type = MM_CAM_STREAM_DATA_YUV422P;
-               stream->data.yuv422p.y = map_info.data;
+               stream->data.yuv422p.y = map_info->data;
                stream->data.yuv422p.length_y = stream->width * stream->height;
                stream->data.yuv422p.u = stream->data.yuv422p.y + stream->data.yuv422p.length_y;
                stream->data.yuv422p.length_u = stream->data.yuv422p.length_y >> 1;
@@ -228,7 +238,7 @@ static gboolean __mmcamcorder_set_stream_data(MMCamcorderVideoStreamDataType *st
        case MM_PIXEL_FORMAT_UYVY: /* fall through */
        case MM_PIXEL_FORMAT_ITLV_JPEG_UYVY:
                stream->data_type = MM_CAM_STREAM_DATA_YUV422;
-               stream->data.yuv422.yuv = map_info.data;
+               stream->data.yuv422.yuv = map_info->data;
                stream->data.yuv422.length_yuv = stream->length_total;
                stream->stride[0] = stream->width << 1;
                stream->elevation[0] = stream->height;
@@ -240,15 +250,16 @@ static gboolean __mmcamcorder_set_stream_data(MMCamcorderVideoStreamDataType *st
        case MM_PIXEL_FORMAT_ENCODED_VP8:   /* fall through */
        case MM_PIXEL_FORMAT_ENCODED_VP9:   /* fall through */
                stream->data_type = MM_CAM_STREAM_DATA_ENCODED;
-               stream->data.encoded.data = map_info.data;
+               stream->data.encoded.data = map_info->data;
                stream->data.encoded.length_data = stream->length_total;
                stream->data.encoded.is_delta_frame = GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT);
+               stream->data.encoded.is_header_included = GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_HEADER);
                stream->num_planes = 1;
                break;
 
        case MM_PIXEL_FORMAT_INVZ:
                stream->data_type = MM_CAM_STREAM_DATA_DEPTH;
-               stream->data.depth.data = map_info.data;
+               stream->data.depth.data = map_info->data;
                stream->data.depth.length_data = stream->length_total;
                stream->stride[0] = stream->width << 1;
                stream->elevation[0] = stream->height;
@@ -258,7 +269,7 @@ static gboolean __mmcamcorder_set_stream_data(MMCamcorderVideoStreamDataType *st
        case MM_PIXEL_FORMAT_RGBA: /* fall through */
        case MM_PIXEL_FORMAT_ARGB:
                stream->data_type = MM_CAM_STREAM_DATA_RGB;
-               stream->data.rgb.data = map_info.data;
+               stream->data.rgb.data = map_info->data;
                stream->data.rgb.length_data = stream->length_total;
                stream->stride[0] = stream->width << 2;
                stream->elevation[0] = stream->height;
@@ -271,8 +282,6 @@ static gboolean __mmcamcorder_set_stream_data(MMCamcorderVideoStreamDataType *st
                break;
        }
 
-       gst_memory_unmap(memory, &map_info);
-
        return ret;
 }
 
@@ -303,12 +312,15 @@ static gboolean __mmcamcorder_set_stream_data_zero_copy(MMCamcorderVideoStreamDa
                stream->stride[0] = stream->width;
                stream->elevation[0] = stream->height;
                stream->data.encoded.data = bo_handle.ptr;
-               stream->length_total = gst_memory_get_sizes(memory, NULL, NULL);
+               stream->length_total = (unsigned int)gst_memory_get_sizes(memory, NULL, NULL);
                stream->data.encoded.length_data = stream->length_total;
                stream->data.encoded.is_delta_frame = GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT);
+               stream->data.encoded.is_header_included = GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_HEADER);
 
-               MMCAM_LOG_VERBOSE("[ENCODED] length[%u], is_delta[%d]",
-                       stream->data.encoded.length_data, stream->data.encoded.is_delta_frame);
+               MMCAM_LOG_VERBOSE("[ENCODED] length[%u], is_delta[%d], is_header_included[%d]",
+                       stream->data.encoded.length_data,
+                       stream->data.encoded.is_delta_frame,
+                       stream->data.encoded.is_header_included);
 
                return TRUE;
        }
@@ -383,6 +395,100 @@ static gboolean __mmcamcorder_set_stream_data_zero_copy(MMCamcorderVideoStreamDa
 }
 
 
+static const char *__mmcamcorder_get_parser_name(MMPixelFormatType format)
+{
+       switch (format) {
+       case MM_PIXEL_FORMAT_ENCODED_H264:
+               return "h264parse";
+       case MM_PIXEL_FORMAT_ENCODED_VP9:
+               return "vp9parse";
+       default:
+               MMCAM_LOG_WARNING("unsupported format[%d]", format);
+               return NULL;
+       }
+}
+
+
+static gboolean __mmcamcorder_frame_meta_foreach_func(GQuark field_id, const GValue *value, gpointer user_data)
+{
+       MMCamcorderVideoStreamDataType *stream = (MMCamcorderVideoStreamDataType *)user_data;
+       MMCamcorderFrameMeta *frame_meta = NULL;
+       const char *field_name = g_quark_to_string(field_id);
+       guint64 field_value = g_value_get_uint64(value);
+
+       if (!stream || !field_name) {
+               MMCAM_LOG_WARNING("invalid ptr[%p, %p]", stream, field_name);
+               return TRUE;
+       }
+
+       frame_meta = &stream->frame_meta;
+
+       if (!strncmp(FRAME_META_TS_SOE, field_name, strlen(FRAME_META_TS_SOE) + 1)) {
+               frame_meta->ts_soe = field_value;
+               MMCAM_LOG_VERBOSE("[TS] SOE -> %llu", frame_meta->ts_soe);
+       } else if (!strncmp(FRAME_META_TS_EOE, field_name, strlen(FRAME_META_TS_EOE) + 1)) {
+               frame_meta->ts_eoe = field_value;
+               MMCAM_LOG_VERBOSE("[TS] EOE -> %llu", frame_meta->ts_eoe);
+       } else if (!strncmp(FRAME_META_TS_SOF, field_name, strlen(FRAME_META_TS_SOF) + 1)) {
+               frame_meta->ts_sof = field_value;
+               MMCAM_LOG_VERBOSE("[TS] SOF -> %llu", frame_meta->ts_sof);
+       } else if (!strncmp(FRAME_META_TS_EOF, field_name, strlen(FRAME_META_TS_EOF) + 1)) {
+               frame_meta->ts_eof = field_value;
+               MMCAM_LOG_VERBOSE("[TS] EOF -> %llu", frame_meta->ts_eof);
+       } else if (!strncmp(FRAME_META_TS_HAL, field_name, strlen(FRAME_META_TS_HAL) + 1)) {
+               frame_meta->ts_hal = field_value;
+               MMCAM_LOG_VERBOSE("[TS] HAL -> %llu", frame_meta->ts_hal);
+       } else if (!strncmp(FRAME_META_TS_QMF, field_name, strlen(FRAME_META_TS_QMF) + 1)) {
+               frame_meta->ts_qmf = field_value;
+               MMCAM_LOG_VERBOSE("[TS] QMF -> %llu", frame_meta->ts_qmf);
+       } else if (!strncmp(FRAME_META_TS_GST, field_name, strlen(FRAME_META_TS_GST) + 1)) {
+               frame_meta->ts_gst = field_value;
+               MMCAM_LOG_VERBOSE("[TS] GST -> %llu", frame_meta->ts_gst);
+       } else if (!strncmp(FRAME_META_TD_EXP, field_name, strlen(FRAME_META_TD_EXP) + 1)) {
+               frame_meta->td_exp = field_value;
+               MMCAM_LOG_VERBOSE("[TD] EXP -> %llu", frame_meta->td_exp);
+       } else if (!strncmp(FRAME_META_TS_AUX, field_name, strlen(FRAME_META_TS_AUX) + 1)) {
+               frame_meta->ts_aux = field_value;
+               MMCAM_LOG_VERBOSE("[TS] AUX -> %llu", frame_meta->ts_aux);
+       } else if (!strncmp(FRAME_META_TD_AUX, field_name, strlen(FRAME_META_TD_AUX) + 1)) {
+               frame_meta->td_aux = field_value;
+               MMCAM_LOG_VERBOSE("[TD] AUX -> %llu", frame_meta->td_aux);
+       } else if (!strncmp(FRAME_META_SEQNUM, field_name, strlen(FRAME_META_SEQNUM) + 1)) {
+               frame_meta->seqnum = field_value;
+               MMCAM_LOG_VERBOSE("SEQNUM -> %llu", frame_meta->seqnum);
+       } else if (!strncmp(FRAME_META_FLAGS, field_name, strlen(FRAME_META_FLAGS) + 1)) {
+               frame_meta->flags = field_value;
+               MMCAM_LOG_VERBOSE("FLAGS -> %llu", frame_meta->flags);
+       } else if (!strncmp(FRAME_META_LUX_INDEX, field_name, strlen(FRAME_META_LUX_INDEX) + 1)) {
+               frame_meta->lux_index = field_value;
+               MMCAM_LOG_VERBOSE("LUX Index -> %llu", frame_meta->lux_index);
+       }
+
+       return TRUE;
+}
+
+
+int _mmcamcorder_request_codec_config(GstElement *videosrc_element)
+{
+       if (!videosrc_element || !G_TYPE_CHECK_INSTANCE(videosrc_element)) {
+               MMCAM_LOG_WARNING("invalid videosrc element[%p]", videosrc_element);
+               return MM_ERROR_CAMCORDER_INVALID_ARGUMENT;
+       }
+
+       if (!g_signal_parse_name(_MMCAMCORDER_SIGNAL_REQUEST_CODEC_CONFIG,
+                       G_TYPE_FROM_INSTANCE(videosrc_element), NULL, NULL, FALSE)) {
+               MMCAM_LOG_WARNING("no signal[%s]", _MMCAMCORDER_SIGNAL_REQUEST_CODEC_CONFIG);
+               return MM_ERROR_CAMCORDER_NOT_SUPPORTED;
+       }
+
+       MMCAM_LOG_INFO("emit signal[%s]", _MMCAMCORDER_SIGNAL_REQUEST_CODEC_CONFIG);
+
+       g_signal_emit_by_name(videosrc_element, _MMCAMCORDER_SIGNAL_REQUEST_CODEC_CONFIG);
+
+       return MM_ERROR_NONE;
+}
+
+
 gboolean _mmcamcorder_invoke_video_stream_cb(MMHandleType handle, GstSample *sample, gboolean is_preview, int stream_id)
 {
        int i = 0;
@@ -393,8 +499,10 @@ gboolean _mmcamcorder_invoke_video_stream_cb(MMHandleType handle, GstSample *sam
 
        GstBuffer *buffer = NULL;
        GstMemory *memory = NULL;
+       GstMapInfo map_info;
        GstCaps *caps = NULL;
        GstStructure *structure = NULL;
+       GstProtectionMeta *p_meta = NULL;
 
        mmf_return_val_if_fail(hcamcorder, FALSE);
 
@@ -426,29 +534,45 @@ gboolean _mmcamcorder_invoke_video_stream_cb(MMHandleType handle, GstSample *sam
        }
 
        structure = gst_mini_object_get_qdata(GST_MINI_OBJECT_CAST(buffer), hcamcorder->buffer_quark);
-       if (structure) {
+       if (structure && gst_structure_has_field(structure, "focus-state")) {
                gst_structure_get(structure,
                        "focus-state", G_TYPE_INT, &stream.focus_state,
                        "facing-direction", G_TYPE_INT, &stream.facing_direction,
                        "flip", G_TYPE_INT, &stream.flip,
                        "rotation", G_TYPE_INT, &stream.rotation,
+                       "status-ae", G_TYPE_INT, &stream.status_ae,
+                       "status-awb", G_TYPE_INT, &stream.status_awb,
                        NULL);
 
-               MMCAM_LOG_VERBOSE("structure[%p], [fs:%d,fd:%d,f:%d,r:%d]", structure,
-                       stream.focus_state, stream.facing_direction, stream.flip, stream.rotation);
+               MMCAM_LOG_VERBOSE("structure[%p], [fs:%d,fd:%d,f:%d,r:%d,ae:%d,awb:%d]", structure,
+                       stream.focus_state, stream.facing_direction,
+                       stream.flip, stream.rotation,
+                       stream.status_ae, stream.status_awb);
        }
 
        if (gst_is_tizen_memory(memory)) {
                if (!__mmcamcorder_set_stream_data_zero_copy(&stream, buffer, memory))
                        goto _INVOKE_VIDEO_STREAM_CB_DONE;
        } else {
-               if (!__mmcamcorder_set_stream_data(&stream, buffer, memory))
+               memset(&map_info, 0x0, sizeof(GstMapInfo));
+
+               if (!gst_memory_map(memory, &map_info, GST_MAP_READWRITE)) {
+                       MMCAM_LOG_ERROR("map failed for memory[%p]", memory);
+                       return FALSE;
+               }
+
+               if (!__mmcamcorder_set_stream_data(&stream, buffer, &map_info))
                        goto _INVOKE_VIDEO_STREAM_CB_DONE;
        }
 
+       p_meta = gst_buffer_get_protection_meta(buffer);
+       if (p_meta)
+               gst_structure_foreach(p_meta->info, __mmcamcorder_frame_meta_foreach_func, &stream);
+
        MMCAM_LOG_DEBUG("VideoStreamData : format[%d], resolution[%dx%d], stream_id[%d]",
                stream.format, stream.width, stream.height, stream_id);
 
+       stream.timestamp_nsec = GST_BUFFER_PTS(buffer);
        stream.timestamp = (unsigned int)(GST_BUFFER_PTS(buffer) / 1000000); /* nano sec -> milli sec */
        stream.extra_stream_id = stream_id;
        stream.internal_buffer = buffer;
@@ -467,6 +591,9 @@ gboolean _mmcamcorder_invoke_video_stream_cb(MMHandleType handle, GstSample *sam
        }
 
 _INVOKE_VIDEO_STREAM_CB_DONE:
+       if (!gst_is_tizen_memory(memory))
+               gst_memory_unmap(memory, &map_info);
+
        for (i = 0 ; i < TBM_SURF_PLANE_MAX && stream.bo[i] ; i++) {
                tbm_bo_map(stream.bo[i], TBM_DEVICE_CPU, TBM_OPTION_READ|TBM_OPTION_WRITE);
                tbm_bo_unmap(stream.bo[i]);
@@ -476,6 +603,74 @@ _INVOKE_VIDEO_STREAM_CB_DONE:
 }
 
 
+static gboolean __mmcamcorder_add_videofilter_element(mmf_camcorder_t *hcamcorder,
+       GList *element_list, const char *conf_prefix,
+       const char *filter_nick, _MMCAMCORDER_PREVIEW_PIPELINE_ELELMENT filter_index,
+       const char *queue_nick, _MMCAMCORDER_PREVIEW_PIPELINE_ELELMENT queue_index)
+{
+       int i = 0;
+       int err = MM_ERROR_NONE;
+       int videofilt_crop_rect[_MMCAMCORDER_CROP_ARRAY_LENGTH] = {0, };
+       char conf_name_element[CONFIGURE_FIELD_NAME_LENGTH] = {'\0',};
+       char conf_name_crop[_MMCAMCORDER_CROP_ARRAY_LENGTH][CONFIGURE_FIELD_NAME_LENGTH] = {{'\0',}, };
+       const char *conf_postfix_crop[_MMCAMCORDER_CROP_ARRAY_LENGTH] = {
+               "CropX",
+               "CropY",
+               "CropW",
+               "CropH"
+       };
+
+       _MMCamcorderSubContext *sc = NULL;
+       type_element *videofilt_element = NULL;
+       const char *videofilt_name = NULL;
+
+       mmf_return_val_if_fail(hcamcorder, FALSE);
+       mmf_return_val_if_fail(element_list, FALSE);
+       mmf_return_val_if_fail(filter_nick && filter_index > _MMCAMCORDER_NONE, FALSE);
+
+       sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
+       mmf_return_val_if_fail(sc, FALSE);
+
+       snprintf(conf_name_element, sizeof(conf_name_element), "%sElement", conf_prefix);
+
+       _mmcamcorder_conf_get_element_and_name((MMHandleType)hcamcorder,
+               hcamcorder->conf_ctrl, CONFIGURE_CATEGORY_CTRL_CAMERA, conf_name_element,
+               &videofilt_element, &videofilt_name);
+
+       if (!videofilt_element || !videofilt_name) {
+               MMCAM_LOG_INFO("No configure for %s", conf_name_element);
+               return TRUE;
+       }
+
+       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, filter_index, videofilt_name, filter_nick, element_list, err);
+       _mmcamcorder_conf_set_value_element_property(sc->element[filter_index].gst, videofilt_element);
+
+       for (i = 0 ; i < _MMCAMCORDER_CROP_ARRAY_LENGTH ; i++) {
+               snprintf(conf_name_crop[i], sizeof(conf_name_crop[i]), "%s%s", conf_prefix, conf_postfix_crop[i]);
+               _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl,
+                       CONFIGURE_CATEGORY_CTRL_CAMERA,
+                       conf_name_crop[i], &videofilt_crop_rect[i]);
+       }
+
+       if (videofilt_crop_rect[0] >= 0 && videofilt_crop_rect[1] >= 0 &&
+               videofilt_crop_rect[2] > 0 && videofilt_crop_rect[3] > 0) {
+               _mmcamcorder_set_property_array_int(sc->element[filter_index].gst,
+                       "crop", videofilt_crop_rect, _MMCAMCORDER_CROP_ARRAY_LENGTH);
+       }
+
+       MMCAM_LOG_INFO("queue_nick[%p], queue_index[%d]", queue_nick, queue_index);
+
+       if (queue_nick && queue_index > _MMCAMCORDER_NONE)
+               _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, queue_index, "queue", queue_nick, element_list, err);
+
+       return TRUE;
+
+pipeline_creation_error:
+       MMCAM_LOG_ERROR("failed[0x%x]", err);
+       return FALSE;
+}
+
+
 int _mmcamcorder_create_preview_elements(MMHandleType handle)
 {
        int err = MM_ERROR_NONE;
@@ -486,7 +681,7 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle)
        int codectype = 0;
        int capture_width = 0;
        int capture_height = 0;
-       int capture_jpg_quality = 100;
+       int capture_quality = 0;
        int video_stabilization = 0;
        int anti_shake = 0;
        int display_surface_type = MM_DISPLAY_SURFACE_NULL;
@@ -494,11 +689,10 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle)
        const char *videosink_name = NULL;
        const char *videoconvert_name = NULL;
        const char *videodecoder_name = NULL;
+       const char *videoparse_name = NULL;
        const char *decoder_conf_name = NULL;
        char videodecoder_name_final[32] = {'\0',};
        char *err_name = NULL;
-       char *socket_path = NULL;
-       int socket_path_len;
 #ifdef _MMCAMCORDER_RM_SUPPORT
        int decoder_index = 0;
 #endif /* _MMCAMCORDER_RM_SUPPORT */
@@ -513,7 +707,7 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle)
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        _MMCamcorderSubContext *sc = NULL;
-       type_element *VideosrcElement = NULL;
+       type_element *videosrc_element = NULL;
        type_int_array *input_index = NULL;
 
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
@@ -555,8 +749,7 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle)
                MMCAM_CAPTURE_HEIGHT, &capture_height,
                MMCAM_CAMERA_HDR_CAPTURE, &sc->info_image->hdr_capture_mode,
                MMCAM_IMAGE_ENCODER, &codectype,
-               MMCAM_IMAGE_ENCODER_QUALITY, &capture_jpg_quality,
-               MMCAM_DISPLAY_SOCKET_PATH, &socket_path, &socket_path_len,
+               MMCAM_IMAGE_ENCODER_QUALITY, &capture_quality,
                MMCAM_DISPLAY_SURFACE, &display_surface_type,
                MMCAM_EXTRA_PREVIEW_ENABLE, &extra_preview_enable,
                NULL);
@@ -584,19 +777,23 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle)
        /* Get fourcc from picture format */
        sc->fourcc = _mmcamcorder_get_fourcc(sc->info_image->preview_format, codectype, hcamcorder->use_zero_copy_format);
 
-       /* Get videosrc element and its name from configure */
-       _mmcamcorder_conf_get_element(handle, hcamcorder->conf_main,
-               CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
-               "VideosrcElement",
-               &VideosrcElement);
-       _mmcamcorder_conf_get_value_element_name(VideosrcElement, &videosrc_name);
+       _mmcamcorder_conf_get_element_and_name((MMHandleType)hcamcorder,
+               hcamcorder->conf_ctrl, CONFIGURE_CATEGORY_CTRL_CAMERA, "AltVideosrcElement",
+               &videosrc_element, &videosrc_name);
+
+       /* Skip getting "VideosrcElement" if alternative element exists. */
+       if (videosrc_name == NULL) {
+               _mmcamcorder_conf_get_element_and_name((MMHandleType)hcamcorder,
+                       hcamcorder->conf_main, CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, "VideosrcElement",
+                       &videosrc_element, &videosrc_name);
+       }
 
        /**
         * Create child element
         */
-       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_SRC, videosrc_name, "videosrc_src", element_list, err);
+       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_SRC, videosrc_name, "vsrc_s", element_list, err);
 
-       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_FILT, "capsfilter", "videosrc_filter", element_list, err);
+       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_CAPS, "capsfilter", "vsrc_c", element_list, err);
 
        /**
         * This is for "tizencamerasrc" element only.
@@ -609,13 +806,10 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle)
        MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "high-speed-fps", 0);
        MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "capture-width", capture_width);
        MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "capture-height", capture_height);
-       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "capture-jpg-quality", capture_jpg_quality);
+       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "capture-quality", capture_quality);
        MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "hdr-capture", sc->info_image->hdr_capture_mode);
-       MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "extra-preview", extra_preview_enable);
        MMCAMCORDER_G_OBJECT_GET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "buffer-quark", &hcamcorder->buffer_quark);
 
-       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_QUE, "queue", "videosrc_queue", element_list, err);
-
        /* set camera flip */
        _mmcamcorder_set_videosrc_flip(handle, camera_flip);
 
@@ -629,7 +823,7 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle)
                MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "high-speed-fps", fps);
 
        /* Set basic information of videosrc element */
-       _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, VideosrcElement);
+       _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, videosrc_element);
 
        /* Set video device index */
        if (hcamcorder->is_network) {
@@ -659,12 +853,27 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle)
                        &hcamcorder->recreate_decoder);
        }
 
+       if (!__mmcamcorder_add_videofilter_element(hcamcorder, element_list, "VideoFilter",
+               "vsrc_f", _MMCAMCORDER_VIDEOSRC_FILT, NULL, _MMCAMCORDER_NONE)) {
+               MMCAM_LOG_ERROR("add videofilter failed for VideoFilterElement");
+               goto pipeline_creation_error;
+       }
+
+       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_QUE, "queue", "vsrc_q", element_list, err);
+
+       if (!__mmcamcorder_add_videofilter_element(hcamcorder, element_list, "VideoFilter2",
+               "vsrc_f2", _MMCAMCORDER_VIDEOSRC_FILT2, "vsrc_q2", _MMCAMCORDER_VIDEOSRC_QUE2)) {
+               MMCAM_LOG_ERROR("add videofilter failed for VideoFilter2Element");
+               goto pipeline_creation_error;
+       }
+
        if (display_surface_type != MM_DISPLAY_SURFACE_NULL &&
                _mmcamcorder_is_encoded_preview_pixel_format(sc->info_image->preview_format)) {
                switch (sc->info_image->preview_format) {
                case MM_PIXEL_FORMAT_ENCODED_H264:
                        decoder_conf_name = "VideodecoderElementH264";
                        break;
+               case MM_PIXEL_FORMAT_ENCODED: /* fall through */
                case MM_PIXEL_FORMAT_ENCODED_MJPEG:
                        decoder_conf_name = "VideodecoderElementMJPEG";
                        break;
@@ -711,7 +920,11 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle)
                }
 #endif /* _MMCAMCORDER_RM_SUPPORT */
 
-               _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_DECODE, videodecoder_name_final, "videosrc_decode", element_list, err);
+               videoparse_name = __mmcamcorder_get_parser_name(sc->info_image->preview_format);
+               if (videoparse_name)
+                       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_PARSE, videoparse_name, "vsrc_p", element_list, err);
+
+               _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_DECODE, videodecoder_name_final, "vsrc_d", element_list, err);
 
                _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst, sc->VideodecoderElement);
        }
@@ -726,71 +939,54 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle)
                goto pipeline_creation_error;
        }
 
-       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSINK_QUE, "queue", "videosink_queue", element_list, err);
+       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSINK_QUE, "queue", "vsink_q", element_list, err);
 
        MMCAM_LOG_INFO("videosink_name: %s", videosink_name);
 
-       if (display_surface_type == MM_DISPLAY_SURFACE_REMOTE) {
-               _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSINK_SINK, videosink_name, "ipc_sink", element_list, err);
-
-               _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, sc->VideosinkElement);
-
-               err = mm_camcorder_get_attributes(handle, &err_name,
-                       MMCAM_DISPLAY_SOCKET_PATH, &socket_path, &socket_path_len,
-                       NULL);
-               if (err != MM_ERROR_NONE) {
-                       MMCAM_LOG_WARNING("Get socket path failed 0x%x", err);
-                       SAFE_FREE(err_name);
-                       goto pipeline_creation_error;
-               }
+       if (hcamcorder->use_videoconvert && (!strcmp(videosink_name, "tizenwlsink") || !strcmp(videosink_name, "directvideosink"))) {
+               /* get video convert name */
+               _mmcamcorder_conf_get_value_element_name(sc->VideoconvertElement, &videoconvert_name);
 
-               g_object_set(G_OBJECT(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst), "socket-path", socket_path, NULL);
-       } else {
-               if (hcamcorder->use_videoconvert && (!strcmp(videosink_name, "tizenwlsink") || !strcmp(videosink_name, "directvideosink"))) {
-                       /* get video convert name */
-                       _mmcamcorder_conf_get_value_element_name(sc->VideoconvertElement, &videoconvert_name);
-
-                       if (videoconvert_name) {
-                               MMCAM_LOG_INFO("videoconvert element name : %s", videoconvert_name);
-                               _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSINK_CLS, videoconvert_name, "videosink_cls", element_list, err);
-                       } else
-                               MMCAM_LOG_ERROR("failed to get videoconvert element name");
-               }
+               if (videoconvert_name) {
+                       MMCAM_LOG_INFO("videoconvert element name : %s", videoconvert_name);
+                       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSINK_CLS, videoconvert_name, "vsink_c", element_list, err);
+               } else
+                       MMCAM_LOG_ERROR("failed to get videoconvert element name");
+       }
 
-               /* check sink element in attribute */
-               mm_camcorder_get_attributes(handle, NULL,
-                       MMCAM_DISPLAY_REUSE_ELEMENT, &sink_element, &sink_element_size,
-                       NULL);
+       /* check sink element in attribute */
+       mm_camcorder_get_attributes(handle, NULL,
+               MMCAM_DISPLAY_REUSE_ELEMENT, &sink_element, &sink_element_size,
+               NULL);
 
-               if (sink_element) {
-                       int attr_index = 0;
-                       MMHandleType attrs = MMF_CAMCORDER_ATTRS(handle);
+       if (sink_element) {
+               int attr_index = 0;
+               MMHandleType attrs = MMF_CAMCORDER_ATTRS(handle);
 
-                       MMCAM_LOG_INFO("reuse sink element %p in attribute", sink_element);
+               MMCAM_LOG_INFO("reuse sink element %p in attribute", sink_element);
 
-                       _MMCAMCORDER_ELEMENT_ADD(sc, sc->element, _MMCAMCORDER_VIDEOSINK_SINK, sink_element, element_list, err);
+               _MMCAMCORDER_ELEMENT_ADD(sc, sc->element, _MMCAMCORDER_VIDEOSINK_SINK, sink_element, element_list, err);
 
-                       /* reset attribute */
-                       if (attrs) {
-                               mm_attrs_get_index((MMHandleType)attrs, MMCAM_DISPLAY_REUSE_ELEMENT, &attr_index);
-                               mm_attrs_set_data(attrs, attr_index, NULL, 0);
-                               mm_attrs_commit(attrs, attr_index);
-                       } else {
-                               MMCAM_LOG_WARNING("attribute is NULL");
-                               err = MM_ERROR_CAMCORDER_NOT_INITIALIZED;
-                               goto pipeline_creation_error;
-                       }
+               /* reset attribute */
+               if (attrs) {
+                       mm_attrs_get_index((MMHandleType)attrs, MMCAM_DISPLAY_REUSE_ELEMENT, &attr_index);
+                       mm_attrs_set_data(attrs, attr_index, NULL, 0);
+                       mm_attrs_commit(attrs, attr_index);
                } else {
-                       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSINK_SINK, videosink_name, "videosink_sink", element_list, err);
-
-                       _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, sc->VideosinkElement);
-               }
-
-               if (_mmcamcorder_videosink_window_set(handle, sc->VideosinkElement) != MM_ERROR_NONE) {
-                       MMCAM_LOG_ERROR("_mmcamcorder_videosink_window_set error");
-                       err = MM_ERROR_CAMCORDER_INVALID_ARGUMENT;
+                       MMCAM_LOG_WARNING("attribute is NULL");
+                       err = MM_ERROR_CAMCORDER_NOT_INITIALIZED;
                        goto pipeline_creation_error;
                }
+       } else {
+               _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSINK_SINK, videosink_name, "vsink_s", element_list, err);
+
+               _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, sc->VideosinkElement);
+       }
+
+       if (_mmcamcorder_videosink_window_set(handle, sc->VideosinkElement) != MM_ERROR_NONE) {
+               MMCAM_LOG_ERROR("_mmcamcorder_videosink_window_set error");
+               err = MM_ERROR_CAMCORDER_INVALID_ARGUMENT;
+               goto pipeline_creation_error;
        }
 
        /* Set caps by rotation */
@@ -810,28 +1006,30 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle)
                goto pipeline_creation_error;
        }
 
-       if (element_list) {
+       if (element_list)
                g_list_free(element_list);
-               element_list = NULL;
-       }
+
+       /* extra preview */
+       if (extra_preview_enable)
+               _mmcamcorder_initialize_extra_preview_mode(handle);
 
        return MM_ERROR_NONE;
 
 pipeline_creation_error:
        _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_SRC);
+       _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_CAPS);
        _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_FILT);
-       _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_CLS_QUE);
-       _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_CLS);
-       _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_CLS_FILT);
        _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_QUE);
+       _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_FILT2);
+       _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_QUE2);
+       _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_CAP_CAPS);
+       _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_CAP_SINK);
        _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_DECODE);
        _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSINK_QUE);
        _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSINK_SINK);
 
-       if (element_list) {
+       if (element_list)
                g_list_free(element_list);
-               element_list = NULL;
-       }
 
        return err;
 }
@@ -865,7 +1063,7 @@ int _mmcamcorder_create_audiosrc_bin(MMHandleType handle)
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        _MMCamcorderSubContext *sc = NULL;
        _MMCamcorderGstElement *last_element = NULL;
-       type_element *AudiosrcElement = NULL;
+       type_element *audiosrc_element = NULL;
 
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
@@ -922,24 +1120,21 @@ int _mmcamcorder_create_audiosrc_bin(MMHandleType handle)
                goto pipeline_creation_error;
        }
 
-       _mmcamcorder_conf_get_element(handle, hcamcorder->conf_main,
-               CONFIGURE_CATEGORY_MAIN_AUDIO_INPUT,
-               cat_name,
-               &AudiosrcElement);
-       _mmcamcorder_conf_get_value_element_name(AudiosrcElement, &audiosrc_name);
+       _mmcamcorder_conf_get_element_and_name((MMHandleType)hcamcorder,
+               hcamcorder->conf_main, CONFIGURE_CATEGORY_MAIN_AUDIO_INPUT, cat_name,
+               &audiosrc_element, &audiosrc_name);
 
        free(cat_name);
-       cat_name = NULL;
 
        MMCAM_LOG_INFO("Audio src name : %s", audiosrc_name);
 
-       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_SRC, audiosrc_name, "audiosrc_src", element_list, err);
+       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_SRC, audiosrc_name, "asrc_s", element_list, err);
 
        /* set sound stream info */
        _mmcamcorder_set_sound_stream_info(sc->encode_element[_MMCAMCORDER_AUDIOSRC_SRC].gst, stream_type, stream_index);
 
        /* set audiosrc properties in ini configuration */
-       _mmcamcorder_conf_set_value_element_property(sc->encode_element[_MMCAMCORDER_AUDIOSRC_SRC].gst, AudiosrcElement);
+       _mmcamcorder_conf_set_value_element_property(sc->encode_element[_MMCAMCORDER_AUDIOSRC_SRC].gst, audiosrc_element);
 
        /* set block size */
        _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main,
@@ -952,9 +1147,9 @@ int _mmcamcorder_create_audiosrc_bin(MMHandleType handle)
                MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_AUDIOSRC_SRC].gst, "blocksize", blocksize);
        }
 
-       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_FILT, "capsfilter", "audiosrc_capsfilter", element_list, err);
+       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_CAPS, "capsfilter", "asrc_c", element_list, err);
 
-       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_QUE, "queue", "audiosrc_queue", element_list, err);
+       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_QUE, "queue", "asrc_q", element_list, err);
        MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_AUDIOSRC_QUE].gst, "max-size-buffers", 0);
        MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_AUDIOSRC_QUE].gst, "max-size-bytes", 0);
        MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_AUDIOSRC_QUE].gst, "max-size-time", 0);
@@ -964,7 +1159,7 @@ int _mmcamcorder_create_audiosrc_bin(MMHandleType handle)
                int depth = 0;
                const gchar* format_name = NULL;
 
-               _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_VOL, "volume", "audiosrc_volume", element_list, err);
+               _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_VOL, "volume", "asrc_v", element_list, err);
 
                if (volume == 0.0) {
                        /* Because data probe of audio src do the same job, it doesn't need to set "mute" here. Already null raw data. */
@@ -1005,16 +1200,15 @@ int _mmcamcorder_create_audiosrc_bin(MMHandleType handle)
                replay_gain_enable, replay_gain_ref_level);
 
        if (replay_gain_enable) {
-               _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_RGA, "rganalysis", "audiosrc_rga", element_list, err);
+               _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_RGA, "rganalysis", "asrc_r", element_list, err);
                MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_AUDIOSRC_RGA].gst, "reference-level", replay_gain_ref_level);
                /* If num-tracks is not set, album gain and peak event is not come. */
                MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_AUDIOSRC_RGA].gst, "num-tracks", 1);
        }
 
        if (caps) {
-               MMCAMCORDER_G_OBJECT_SET_POINTER((sc->encode_element[_MMCAMCORDER_AUDIOSRC_FILT].gst), "caps", caps);
+               MMCAMCORDER_G_OBJECT_SET_POINTER((sc->encode_element[_MMCAMCORDER_AUDIOSRC_CAPS].gst), "caps", caps);
                gst_caps_unref(caps);
-               caps = NULL;
        } else {
                MMCAM_LOG_ERROR("create caps error");
                err = MM_ERROR_CAMCORDER_RESOURCE_CREATION;
@@ -1037,33 +1231,27 @@ int _mmcamcorder_create_audiosrc_bin(MMHandleType handle)
        pad = gst_element_get_static_pad(last_element->gst, "src");
        if (!gst_element_add_pad(sc->encode_element[_MMCAMCORDER_AUDIOSRC_BIN].gst, gst_ghost_pad_new("src", pad))) {
                gst_object_unref(pad);
-               pad = NULL;
                MMCAM_LOG_ERROR("failed to create ghost pad on _MMCAMCORDER_AUDIOSRC_BIN.");
                err = MM_ERROR_CAMCORDER_GST_LINK;
                goto pipeline_creation_error;
        }
 
        gst_object_unref(pad);
-       pad = NULL;
 
-       if (element_list) {
+       if (element_list)
                g_list_free(element_list);
-               element_list = NULL;
-       }
 
        return MM_ERROR_NONE;
 
 pipeline_creation_error:
        _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_AUDIOSRC_SRC);
-       _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_AUDIOSRC_FILT);
+       _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_AUDIOSRC_CAPS);
        _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_AUDIOSRC_QUE);
        _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_AUDIOSRC_VOL);
        _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_AUDIOSRC_BIN);
 
-       if (element_list) {
+       if (element_list)
                g_list_free(element_list);
-               element_list = NULL;
-       }
 
        return err;
 }
@@ -1179,9 +1367,9 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin
                char *caps_str = NULL;
 
                /* create appsrc and capsfilter */
-               _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_SRC, "appsrc", "encodesink_src", element_list, err);
+               _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_SRC, "appsrc", "esink_s", element_list, err);
 
-               _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_FILT, "capsfilter", "encodesink_filter", element_list, err);
+               _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_CAPS, "capsfilter", "esink_c", element_list, err);
 
                /* set appsrc as live source */
                MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_ENCSINK_SRC].gst, "is-live", TRUE);
@@ -1189,34 +1377,32 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin
                MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_ENCSINK_SRC].gst, "max-bytes", 0); /* unlimited */
 
                /* set capsfilter */
-               if (profile == MM_CAMCORDER_ENCBIN_PROFILE_VIDEO) {
-                       if (_mmcamcorder_is_encoded_preview_pixel_format(sc->info_image->preview_format)) {
-                               MMCAM_LOG_INFO("get pad from videosrc_filter");
-                               pad = gst_element_get_static_pad(sc->element[_MMCAMCORDER_VIDEOSRC_FILT].gst, "src");
-                       } else {
-                               MMCAM_LOG_INFO("get pad from videosrc_que");
-                               pad = gst_element_get_static_pad(sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst, "src");
-                       }
-                       if (!pad) {
-                               MMCAM_LOG_ERROR("get videosrc_que src pad failed");
-                               err = MM_ERROR_CAMCORDER_RESOURCE_CREATION;
-                               goto pipeline_creation_error;
-                       }
-
+               if (sc->element[_MMCAMCORDER_VIDEOSRC_FILT].gst) {
+                       MMCAM_LOG_INFO("get pad from vsrc_f");
+                       pad = gst_element_get_static_pad(sc->element[_MMCAMCORDER_VIDEOSRC_FILT].gst, "src");
+                       caps_from_pad = gst_pad_get_current_caps(pad);
+               } else if (_mmcamcorder_is_encoded_preview_pixel_format(sc->info_image->preview_format)) {
+                       MMCAM_LOG_INFO("get pad from vsrc_c");
+                       pad = gst_element_get_static_pad(sc->element[_MMCAMCORDER_VIDEOSRC_CAPS].gst, "src");
                        caps_from_pad = gst_pad_get_allowed_caps(pad);
-                       video_caps = gst_caps_copy(caps_from_pad);
-                       gst_caps_unref(caps_from_pad);
-                       caps_from_pad = NULL;
-                       gst_object_unref(pad);
-                       pad = NULL;
-
-                       /* fixate caps */
-                       video_caps = gst_caps_fixate(video_caps);
                } else {
-                       /* Image */
-                       MMCAMCORDER_G_OBJECT_GET(sc->element[_MMCAMCORDER_VIDEOSRC_FILT].gst, "caps", &video_caps);
+                       MMCAM_LOG_INFO("get pad from vsrc_q");
+                       pad = gst_element_get_static_pad(sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst, "src");
+                       caps_from_pad = gst_pad_get_allowed_caps(pad);
+               }
+
+               gst_object_unref(pad);
+
+               if (!caps_from_pad) {
+                       MMCAM_LOG_ERROR("get caps failed");
+                       err = MM_ERROR_CAMCORDER_RESOURCE_CREATION;
+                       goto pipeline_creation_error;
                }
 
+               video_caps = gst_caps_fixate(gst_caps_copy(caps_from_pad));
+
+               gst_caps_unref(caps_from_pad);
+
                if (!video_caps) {
                        MMCAM_LOG_ERROR("create recording pipeline caps failed");
                        err = MM_ERROR_CAMCORDER_RESOURCE_CREATION;
@@ -1243,12 +1429,10 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin
                MMCAM_LOG_INFO("encodebin caps [%s]", caps_str);
 
                g_free(caps_str);
-               caps_str = NULL;
 
-               MMCAMCORDER_G_OBJECT_SET_POINTER(sc->encode_element[_MMCAMCORDER_ENCSINK_FILT].gst, "caps", video_caps);
+               MMCAMCORDER_G_OBJECT_SET_POINTER(sc->encode_element[_MMCAMCORDER_ENCSINK_CAPS].gst, "caps", video_caps);
 
                gst_caps_unref(video_caps);
-               video_caps = NULL;
 
                /* video scale */
                if (profile == MM_CAMCORDER_ENCBIN_PROFILE_VIDEO &&
@@ -1280,12 +1464,11 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin
                        MMCAM_LOG_INFO("encodebin videocale [%s][%s]", gst_element_vscale_name, caps_str);
 
                        g_free(caps_str);
-                       caps_str = NULL;
 
-                       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_VSCALE, gst_element_vscale_name, "encodesink_vscale", element_list, err);
-                       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_VSCALE_FILT, "capsfilter", "encodesink_vscale_filter", element_list, err);
+                       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_VSCALE, gst_element_vscale_name, "esink_vs", element_list, err);
+                       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_VSCALE_CAPS, "capsfilter", "esink_vs_c", element_list, err);
 
-                       MMCAMCORDER_G_OBJECT_SET_POINTER((sc->encode_element[_MMCAMCORDER_ENCSINK_VSCALE_FILT].gst), "caps", videoscale_caps);
+                       MMCAMCORDER_G_OBJECT_SET_POINTER((sc->encode_element[_MMCAMCORDER_ENCSINK_VSCALE_CAPS].gst), "caps", videoscale_caps);
 
                        gst_caps_unref(videoscale_caps);
                        videoscale_caps = NULL;
@@ -1306,7 +1489,7 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin
        }
 
        _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_ENCBIN,
-               "tizenencodebin", "encodesink_encbin", element_list, err);
+               "tizenencodebin", "esink_e", element_list, err);
 
        /* check element availability */
        if (profile == MM_CAMCORDER_ENCBIN_PROFILE_IMAGE) {
@@ -1383,8 +1566,10 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin
                }
 
                if (_mmcamcorder_is_encoded_preview_pixel_format(sc->info_image->preview_format)) {
-                       /* set dummy element */
-                       gst_element_venc_name = "identity";
+                       /* set parse element */
+                       gst_element_venc_name = __mmcamcorder_get_parser_name(sc->info_image->preview_format);
+                       if (!gst_element_venc_name)
+                               gst_element_venc_name = "identity";
                } else {
                        _mmcamcorder_conf_get_value_element_name(VideoencElement, &gst_element_venc_name);
                }
@@ -1418,9 +1603,7 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin
                                        if (video_caps) {
                                                MMCAMCORDER_G_OBJECT_SET_POINTER(sc->encode_element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "vcaps", video_caps);
                                                MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_ENCSINK_VCONV].gst, "dst-buffer-num", _MMCAMCORDER_CONVERT_OUTPUT_BUFFER_NUM);
-
                                                gst_caps_unref(video_caps);
-                                               video_caps = NULL;
                                        } else {
                                                MMCAM_LOG_WARNING("failed to create caps");
                                        }
@@ -1461,7 +1644,6 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin
                        MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "auto-audio-convert", TRUE);
                        MMCAMCORDER_G_OBJECT_SET_POINTER(sc->encode_element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "acaps", audio_caps);
                        gst_caps_unref(audio_caps);
-                       audio_caps = NULL;
                }
 
                if (audio_enc == MM_AUDIO_CODEC_OGG) {
@@ -1469,7 +1651,6 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin
                        MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "auto-audio-convert", TRUE);
                        MMCAMCORDER_G_OBJECT_SET_POINTER(sc->encode_element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "acaps", audio_caps);
                        gst_caps_unref(audio_caps);
-                       audio_caps = NULL;
                        MMCAM_LOG_INFO("***** MM_AUDIO_CODEC_OGG : setting audio/x-raw-int ");
                }
 
@@ -1571,49 +1752,41 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin
                pad = gst_element_request_pad_simple(sc->encode_element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "video");
                if (!gst_element_add_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_BIN].gst, gst_ghost_pad_new("video_sink0", pad))) {
                        gst_object_unref(pad);
-                       pad = NULL;
                        MMCAM_LOG_ERROR("failed to create ghost video_sink0 on _MMCAMCORDER_ENCSINK_BIN.");
                        err = MM_ERROR_CAMCORDER_GST_LINK;
                        goto pipeline_creation_error;
                }
                gst_object_unref(pad);
-               pad = NULL;
 
                if (sc->audio_disable == FALSE) {
                        pad = gst_element_request_pad_simple(sc->encode_element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "audio");
                        if (!gst_element_add_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_BIN].gst, gst_ghost_pad_new("audio_sink0", pad))) {
                                gst_object_unref(pad);
-                               pad = NULL;
                                MMCAM_LOG_ERROR("failed to create ghost audio_sink0 on _MMCAMCORDER_ENCSINK_BIN.");
                                err = MM_ERROR_CAMCORDER_GST_LINK;
                                goto pipeline_creation_error;
                        }
                        gst_object_unref(pad);
-                       pad = NULL;
                }
        } else if (profile == MM_CAMCORDER_ENCBIN_PROFILE_AUDIO) {
                pad = gst_element_request_pad_simple(sc->encode_element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "audio");
                if (!gst_element_add_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_BIN].gst, gst_ghost_pad_new("audio_sink0", pad))) {
                        gst_object_unref(pad);
-                       pad = NULL;
                        MMCAM_LOG_ERROR("failed to create ghost audio_sink0 on _MMCAMCORDER_ENCSINK_BIN.");
                        err = MM_ERROR_CAMCORDER_GST_LINK;
                        goto pipeline_creation_error;
                }
                gst_object_unref(pad);
-               pad = NULL;
        } else {
                /* for stillshot */
                pad = gst_element_request_pad_simple(sc->encode_element[_MMCAMCORDER_ENCSINK_ENCBIN].gst, "image");
                if (!gst_element_add_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_BIN].gst, gst_ghost_pad_new("image_sink0", pad))) {
                        gst_object_unref(pad);
-                       pad = NULL;
                        MMCAM_LOG_ERROR("failed to create ghost image_sink0 on _MMCAMCORDER_ENCSINK_BIN.");
                        err = MM_ERROR_CAMCORDER_GST_LINK;
                        goto pipeline_creation_error;
                }
                gst_object_unref(pad);
-               pad = NULL;
        }
 
        MMCAM_LOG_INFO("Get pad complete");
@@ -1637,9 +1810,9 @@ pipeline_creation_error:
 
        _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_ENCBIN);
        _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_SRC);
-       _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_FILT);
+       _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_CAPS);
        _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_VSCALE);
-       _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_VSCALE_FILT);
+       _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_VSCALE_CAPS);
        _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_VENC);
        _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_AENC);
        _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_IENC);
@@ -1685,23 +1858,35 @@ int _mmcamcorder_create_preview_pipeline(MMHandleType handle)
                goto pipeline_creation_error;
 
        /* Set data probe function */
-       if (sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst) {
-               MMCAM_LOG_INFO("add video dataprobe to videosrc queue");
-               srcpad = gst_element_get_static_pad(sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst, "src");
-       } else {
+       if (!sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst) {
                MMCAM_LOG_ERROR("there is no queue plugin");
                goto pipeline_creation_error;
        }
 
-       if (srcpad) {
+       MMCAM_LOG_INFO("add video dataprobe to videosrc queue");
+       srcpad = gst_element_get_static_pad(sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst, "src");
+       if (!srcpad) {
+               MMCAM_LOG_ERROR("failed to get srcpad");
+               goto pipeline_creation_error;
+       }
+
+       MMCAMCORDER_ADD_BUFFER_PROBE(srcpad, _MMCAMCORDER_HANDLER_PREVIEW,
+               __mmcamcorder_video_dataprobe_preview, hcamcorder);
+
+       gst_object_unref(srcpad);
+
+       if (sc->element[_MMCAMCORDER_VIDEOSRC_QUE2].gst) {
+               MMCAM_LOG_INFO("add video dataprobe2 to videosrc queue2");
+               srcpad = gst_element_get_static_pad(sc->element[_MMCAMCORDER_VIDEOSRC_QUE2].gst, "src");
+               if (!srcpad) {
+                       MMCAM_LOG_ERROR("failed to get srcpad");
+                       goto pipeline_creation_error;
+               }
+
                MMCAMCORDER_ADD_BUFFER_PROBE(srcpad, _MMCAMCORDER_HANDLER_PREVIEW,
-                       __mmcamcorder_video_dataprobe_preview, hcamcorder);
+                       __mmcamcorder_video_dataprobe_preview2, hcamcorder);
 
                gst_object_unref(srcpad);
-               srcpad = NULL;
-       } else {
-               MMCAM_LOG_ERROR("failed to get srcpad");
-               goto pipeline_creation_error;
        }
 
        /* set dataprobe for video recording if it does not support dual stream. */
@@ -1714,7 +1899,6 @@ int _mmcamcorder_create_preview_pipeline(MMHandleType handle)
                MMCAMCORDER_ADD_BUFFER_PROBE(srcpad, _MMCAMCORDER_HANDLER_PREVIEW,
                        __mmcamcorder_video_dataprobe_record, hcamcorder);
                gst_object_unref(srcpad);
-               srcpad = NULL;
        }
 
        bus = gst_pipeline_get_bus(GST_PIPELINE(sc->element[_MMCAMCORDER_MAIN_PIPE].gst));
@@ -1723,7 +1907,13 @@ int _mmcamcorder_create_preview_pipeline(MMHandleType handle)
        gst_bus_set_sync_handler(bus, _mmcamcorder_pipeline_bus_sync_callback, (gpointer)hcamcorder, NULL);
 
        gst_object_unref(bus);
-       bus = NULL;
+
+       /* capture mode */
+       err = _mmcamcorder_initialize_capture_mode(handle);
+       if (err != MM_ERROR_NONE) {
+               MMCAM_LOG_ERROR("initialize capture mode[%d] failed", hcamcorder->capture_mode);
+               goto pipeline_creation_error;
+       }
 
        return MM_ERROR_NONE;
 
@@ -1735,6 +1925,7 @@ pipeline_creation_error:
 
 void _mmcamcorder_ready_to_encode_callback(GstElement *element, guint size, gpointer handle)
 {
+       int ret = MM_ERROR_NONE;
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        _MMCamcorderSubContext *sc = NULL;
 
@@ -1747,7 +1938,8 @@ void _mmcamcorder_ready_to_encode_callback(GstElement *element, guint size, gpoi
        /* set flag */
        if (sc->info_video->push_encoding_buffer == PUSH_ENCODING_BUFFER_INIT) {
                sc->info_video->push_encoding_buffer = PUSH_ENCODING_BUFFER_RUN;
-               MMCAM_LOG_WARNING("set push_encoding_buffer RUN");
+               ret = _mmcamcorder_request_codec_config(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst);
+               MMCAM_LOG_WARNING("Push buffer to encoding pipeline[request codec config:0x%x]", ret);
        }
 }
 
@@ -1771,7 +1963,6 @@ int _mmcamcorder_videosink_window_set(MMHandleType handle, type_element* Videosi
        int do_scaling = FALSE;
        int *dp_handle = NULL;
        MMCamWindowInfo *window_info = NULL;
-       gulong xid;
        char *err_name = NULL;
        const char *videosink_name = NULL;
 
@@ -1827,26 +2018,7 @@ int _mmcamcorder_videosink_window_set(MMHandleType handle, type_element* Videosi
        MMCAM_LOG_INFO("(dp_handle=%p, size=%d)", dp_handle, size);
 
        /* Set display handle */
-       if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "ximagesink")) {
-               if (dp_handle) {
-                       xid = *dp_handle;
-                       MMCAM_LOG_INFO("xid = %lu )", xid);
-                       gst_video_overlay_set_window_handle(GST_VIDEO_OVERLAY(vsink), xid);
-               } else {
-                       MMCAM_LOG_WARNING("Handle is NULL. Set xid as 0.. but, it's not recommended.");
-                       gst_video_overlay_set_window_handle(GST_VIDEO_OVERLAY(vsink), 0);
-               }
-       } else if (!strcmp(videosink_name, "evasimagesink") || !strcmp(videosink_name, "evaspixmapsink")) {
-               MMCAM_LOG_INFO("videosink : %s, handle : %p", videosink_name, dp_handle);
-
-               if (dp_handle) {
-                       MMCAMCORDER_G_OBJECT_SET_POINTER(vsink, "evas-object", dp_handle);
-                       MMCAMCORDER_G_OBJECT_SET(vsink, "origin-size", !do_scaling);
-               } else {
-                       MMCAM_LOG_ERROR("display handle(eavs object) is NULL");
-                       return MM_ERROR_CAMCORDER_INVALID_ARGUMENT;
-               }
-       } else if (!strcmp(videosink_name, "tizenwlsink")) {
+       if (!strcmp(videosink_name, "tizenwlsink")) {
                if (dp_handle) {
                        window_info = (MMCamWindowInfo *)dp_handle;
                        MMCAM_LOG_INFO("wayland global surface id : %d", window_info->surface_id);
@@ -1885,8 +2057,7 @@ int _mmcamcorder_videosink_window_set(MMHandleType handle, type_element* Videosi
                videosink_name, display_geometry_method, origin_size, visible, rotation, flip);
 
        /* Set attribute */
-       if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "tizenwlsink") ||
-           !strcmp(videosink_name, "evaspixmapsink") || !strcmp(videosink_name, "directvideosink")) {
+       if (!strcmp(videosink_name, "tizenwlsink") || !strcmp(videosink_name, "directvideosink")) {
                /* set rotation */
                MMCAMCORDER_G_OBJECT_SET(vsink, "rotate", rotation);
 
@@ -1945,6 +2116,12 @@ int _mmcamcorder_video_frame_stabilize(MMHandleType handle, int cmd)
 
        mmf_return_val_if_fail(sc, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
+       if (_mmcamcorder_is_encoded_preview_pixel_format(sc->info_image->preview_format)) {
+               MMCAM_LOG_INFO("Reset frame_stability_count for encoded format");
+               sc->frame_stability_count = 0;
+               return MM_ERROR_NONE;
+       }
+
        switch (cmd) {
        case _MMCamcorder_CMD_PREVIEW_START:
                category = CONFIGURE_CATEGORY_CTRL_CAMERA;
@@ -2015,23 +2192,103 @@ gboolean _mmcamcorder_get_device_info(MMHandleType handle)
        return TRUE;
 }
 
-static guint32 _mmcamcorder_convert_fourcc_string_to_value(const gchar* format_name)
+static guint32 _mmcamcorder_get_structure_fourcc(const GstStructure *structure)
 {
-       return format_name[0] | (format_name[1] << 8) | (format_name[2] << 16) | (format_name[3] << 24);
+       const gchar *format_string = NULL;
+
+       if (!structure) {
+               MMCAM_LOG_WARNING("NULL structure");
+               return GST_MAKE_FOURCC('N', 'U', 'L', 'L');
+       }
+
+       if (gst_structure_has_name(structure, "video/x-h264"))
+               return GST_MAKE_FOURCC('H', '2', '6', '4');
+
+       if (gst_structure_has_name(structure, "video/x-h265"))
+               return GST_MAKE_FOURCC('H', '2', '6', '5');
+
+       if (gst_structure_has_name(structure, "video/x-vp8"))
+               return GST_MAKE_FOURCC('V', 'P', '8', '0');
+
+       if (gst_structure_has_name(structure, "video/x-vp9"))
+               return GST_MAKE_FOURCC('V', 'P', '9', '0');
+
+       if (gst_structure_has_name(structure, "video/x-jpeg") ||
+               gst_structure_has_name(structure, "image/jpeg"))
+               return GST_MAKE_FOURCC('M', 'J', 'P', 'G');
+
+       format_string = gst_structure_get_string(structure, "format");
+
+       if (format_string)
+               return GST_STR_FOURCC(format_string);
+
+       return GST_MAKE_FOURCC('N', 'O', 'N', 'E');
+}
+
+
+static GstPadProbeReturn __mmcamcorder_video_dataprobe_preview_common(mmf_camcorder_t *hcamcorder,
+       GstPad *pad, GstBuffer *buffer, int stream_id, int flag_mask)
+{
+       int flag_current = 0;
+       int ret_attr = MM_ERROR_NONE;
+       _MMCamcorderSubContext *sc = NULL;
+       g_autoptr(GstSample) sample = NULL;
+       g_autoptr(GstCaps) caps = NULL;
+
+       mmf_return_val_if_fail(hcamcorder, GST_PAD_PROBE_DROP);
+       mmf_return_val_if_fail(gst_buffer_n_memory(buffer), GST_PAD_PROBE_DROP);
+
+       sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder);
+       mmf_return_val_if_fail(sc, GST_PAD_PROBE_DROP);
+
+       /* The first H.264 frame should not be skipped for vstream cb. */
+       if (hcamcorder->state < MM_CAMCORDER_STATE_PREPARE &&
+               !_mmcamcorder_is_encoded_preview_pixel_format(sc->info_image->preview_format)) {
+               MMCAM_LOG_WARNING("Not ready for stream callback[stream_id:%d]", stream_id);
+               return GST_PAD_PROBE_OK;
+       }
+
+       ret_attr = mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL,
+               MMCAM_VIDEO_STREAM_CALLBACK_FLAG, &flag_current,
+               NULL);
+       if (ret_attr != MM_ERROR_NONE) {
+               MMCAM_LOG_WARNING("get preview callback flag failed[0x%x]", ret_attr);
+               return GST_PAD_PROBE_OK;
+       }
+
+       MMCAM_LOG_DEBUG("flag [current:0x%08x,mask:0x%08x]", flag_current, flag_mask);
+
+       /* workaround: it will be removed after mmsvc-camera is updated. */
+       _MMCAMCORDER_LOCK_VSTREAM_CALLBACK(hcamcorder);
+       if (hcamcorder->vstream_cb && flag_current == 0) {
+               MMCAM_LOG_DEBUG("vstream_cb, but NULL flag, update it NORMAL");
+               flag_current = MM_CAMCORDER_VIDEO_STREAM_CALLBACK_FLAG_NORMAL;
+       }
+       _MMCAMCORDER_UNLOCK_VSTREAM_CALLBACK(hcamcorder);
+
+       if (!(flag_current & flag_mask))
+               return GST_PAD_PROBE_OK;
+
+       /* make sample with buffer and caps */
+       caps = gst_pad_get_current_caps(pad);
+       mmf_return_val_if_fail(caps, GST_PAD_PROBE_OK);
+
+       sample = gst_sample_new(buffer, caps, NULL, NULL);
+       mmf_return_val_if_fail(sample, GST_PAD_PROBE_OK);
+
+       return _mmcamcorder_invoke_video_stream_cb((MMHandleType)hcamcorder, sample, TRUE, stream_id) ? \
+               GST_PAD_PROBE_OK : GST_PAD_PROBE_DROP;
 }
 
+
 static GstPadProbeReturn __mmcamcorder_video_dataprobe_preview(GstPad *pad, GstPadProbeInfo *info, gpointer u_data)
 {
-       gboolean ret = TRUE;
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(u_data);
        _MMCamcorderSubContext *sc = NULL;
        GstBuffer *buffer = GST_PAD_PROBE_INFO_BUFFER(info);
-       GstSample *sample = NULL;
-       GstCaps *caps = NULL;
 
-       mmf_return_val_if_fail(buffer, GST_PAD_PROBE_DROP);
-       mmf_return_val_if_fail(gst_buffer_n_memory(buffer), GST_PAD_PROBE_DROP);
        mmf_return_val_if_fail(hcamcorder, GST_PAD_PROBE_DROP);
+       mmf_return_val_if_fail(gst_buffer_n_memory(buffer), GST_PAD_PROBE_DROP);
 
        sc = MMF_CAMCORDER_SUBCONTEXT(u_data);
        mmf_return_val_if_fail(sc, GST_PAD_PROBE_DROP);
@@ -2054,29 +2311,19 @@ static GstPadProbeReturn __mmcamcorder_video_dataprobe_preview(GstPad *pad, GstP
        if (hcamcorder->measure_preview_fps && hcamcorder->state >= MM_CAMCORDER_STATE_PREPARE)
                _mmcamcorder_measure_fps(&sc->kpi);
 
-       /* The first H.264 frame should not be skipped for vstream cb. */
-       if (hcamcorder->state < MM_CAMCORDER_STATE_PREPARE &&
-               !_mmcamcorder_is_encoded_preview_pixel_format(sc->info_image->preview_format)) {
-               MMCAM_LOG_WARNING("Not ready for stream callback");
-               return GST_PAD_PROBE_OK;
-       }
-
-       /* make sample with buffer and caps */
-       caps = gst_pad_get_allowed_caps(pad);
-       mmf_return_val_if_fail(caps, GST_PAD_PROBE_OK);
-
-       sample = gst_sample_new(buffer, caps, NULL, NULL);
-       gst_caps_unref(caps);
-       mmf_return_val_if_fail(sample, GST_PAD_PROBE_OK);
-
-       ret = _mmcamcorder_invoke_video_stream_cb((MMHandleType)hcamcorder, sample, TRUE, -1);
+       return __mmcamcorder_video_dataprobe_preview_common(hcamcorder,
+               pad, buffer,
+               MM_CAMCORDER_VIDEO_STREAM_ID_NORMAL,
+               MM_CAMCORDER_VIDEO_STREAM_CALLBACK_FLAG_NORMAL);
+}
 
-       gst_sample_unref(sample);
 
-       if (ret)
-               return GST_PAD_PROBE_OK;
-       else
-               return GST_PAD_PROBE_DROP;
+static GstPadProbeReturn __mmcamcorder_video_dataprobe_preview2(GstPad *pad, GstPadProbeInfo *info, gpointer u_data)
+{
+       return __mmcamcorder_video_dataprobe_preview_common(MMF_CAMCORDER(u_data),
+               pad, GST_PAD_PROBE_INFO_BUFFER(info),
+               MM_CAMCORDER_VIDEO_STREAM_ID_INTERNAL,
+               MM_CAMCORDER_VIDEO_STREAM_CALLBACK_FLAG_INTERNAL);
 }
 
 
@@ -2126,7 +2373,7 @@ GstPadProbeReturn __mmcamcorder_muxed_dataprobe(GstPad *pad, GstPadProbeInfo *in
 
        if (hcamcorder->mstream_cb) {
                stream.data = (void *)mapinfo.data;
-               stream.length = mapinfo.size;
+               stream.length = (unsigned int)mapinfo.size;
                stream.offset = sc->muxed_stream_offset;
                hcamcorder->mstream_cb(&stream, hcamcorder->mstream_cb_param);
        }
@@ -2244,7 +2491,6 @@ GstPadProbeReturn __mmcamcorder_eventprobe_monitor(GstPad *pad, GstPadProbeInfo
                }
 
                gst_object_unref(parent);
-               parent = NULL;
                break;
        case GST_EVENT_EOS:
                MMCAM_LOG_WARNING("[%s:%s] gots %s", GST_DEBUG_PAD_NAME(pad), GST_EVENT_TYPE_NAME(event));
@@ -2469,9 +2715,7 @@ bool _mmcamcorder_set_display_rotation(MMHandleType handle, int display_rotate,
                        return FALSE;
                }
 
-               if (!strcmp(videosink_name, "tizenwlsink") || !strcmp(videosink_name, "xvimagesink") ||
-                       !strcmp(videosink_name, "evasimagesink") || !strcmp(videosink_name, "evaspixmapsink") ||
-                       !strcmp(videosink_name, "directvideosink")) {
+               if (!strcmp(videosink_name, "tizenwlsink") || !strcmp(videosink_name, "directvideosink")) {
                        MMCAMCORDER_G_OBJECT_SET(sc->element[videosink_index].gst, "rotate", display_rotate);
                        MMCAM_LOG_INFO("Set display-rotate [%d] done.", display_rotate);
                } else {
@@ -2508,9 +2752,7 @@ bool _mmcamcorder_set_display_flip(MMHandleType handle, int display_flip, int vi
                        return FALSE;
                }
 
-               if (!strcmp(videosink_name, "tizenwlsink") || !strcmp(videosink_name, "xvimagesink") ||
-                       !strcmp(videosink_name, "evasimagesink") || !strcmp(videosink_name, "evaspixmapsink") ||
-                       !strcmp(videosink_name, "directvideosink")) {
+               if (!strcmp(videosink_name, "tizenwlsink") || !strcmp(videosink_name, "directvideosink")) {
                        MMCAMCORDER_G_OBJECT_SET(sc->element[videosink_index].gst, "flip", display_flip);
                        MMCAM_LOG_INFO("Set display flip [%d] done.", display_flip);
                } else {
@@ -2563,14 +2805,6 @@ bool _mmcamcorder_set_videosrc_caps(MMHandleType handle, unsigned int fourcc, in
        int fps_auto = 0;
        unsigned int caps_fourcc = 0;
        gboolean do_set_caps = FALSE;
-       char fourcc_string[sizeof(fourcc) + 1];
-       gchar *caps_str = NULL;
-#ifdef _MMCAMCORDER_PRODUCT_TV
-       gint maxwidth = 0;
-       gint maxheight = 0;
-       int display_surface_type = MM_DISPLAY_SURFACE_NULL;
-#endif /* _MMCAMCORDER_PRODUCT_TV */
-
        GstCaps *caps = NULL;
 
        mmf_camcorder_t *hcamcorder = NULL;
@@ -2591,8 +2825,8 @@ bool _mmcamcorder_set_videosrc_caps(MMHandleType handle, unsigned int fourcc, in
                return FALSE;
        }
 
-       if (!sc->element[_MMCAMCORDER_VIDEOSRC_FILT].gst) {
-               MMCAM_LOG_ERROR("Video filter is NULL!");
+       if (!sc->element[_MMCAMCORDER_VIDEOSRC_CAPS].gst) {
+               MMCAM_LOG_ERROR("Video capsfilter is NULL!");
                return FALSE;
        }
 
@@ -2624,84 +2858,68 @@ bool _mmcamcorder_set_videosrc_caps(MMHandleType handle, unsigned int fourcc, in
                sc->info_video->fps = fps;
        }
 
-       /* Interleaved format does not support rotation */
-       if (sc->info_image->preview_format != MM_PIXEL_FORMAT_ITLV_JPEG_UYVY) {
-               /* store videosrc rotation */
-               sc->videosrc_rotate = rotate;
+       sc->videosrc_rotate = rotate;
+       set_rotate = rotate * 90;
+       set_width = width;
+       set_height = height;
 
-               /* Define width, height and rotate in caps */
+       if (hcamcorder->update_caps_by_stream_rotation &&
+               (rotate == MM_VIDEO_INPUT_ROTATION_90 || rotate == MM_VIDEO_INPUT_ROTATION_270)) {
+               MMCAM_LOG_WARNING("update caps by stream rotation[%d]", set_rotate);
 
-               /* This will be applied when rotate is 0, 90, 180, 270 if rear camera.
-               This will be applied when rotate is 0, 180 if front camera. */
-               set_rotate = rotate * 90;
+               set_width = height;
+               set_height = width;
 
-               if (rotate == MM_VIDEO_INPUT_ROTATION_90 ||
-                   rotate == MM_VIDEO_INPUT_ROTATION_270) {
-                       set_width = height;
-                       set_height = width;
-                       if (hcamcorder->device_type == MM_VIDEO_DEVICE_CAMERA1) {
-                               if (rotate == MM_VIDEO_INPUT_ROTATION_90)
-                                       set_rotate = 270;
-                               else
-                                       set_rotate = 90;
-                       }
-               } else {
-                       set_width = width;
-                       set_height = height;
+               if (hcamcorder->device_type == MM_VIDEO_DEVICE_CAMERA1) {
+                       if (rotate == MM_VIDEO_INPUT_ROTATION_90)
+                               set_rotate = 270;
+                       else
+                               set_rotate = 90;
                }
-       } else {
-               sc->videosrc_rotate = MM_VIDEO_INPUT_ROTATION_NONE;
-               set_rotate = 0;
-               set_width = width;
-               set_height = height;
-
-               MMCAM_LOG_WARNING("ITLV format doe snot support INPUT ROTATE. Ignore ROTATE[%d]", rotate);
        }
 
-       MMCAMCORDER_G_OBJECT_GET(sc->element[_MMCAMCORDER_VIDEOSRC_FILT].gst, "caps", &caps);
+       MMCAMCORDER_G_OBJECT_GET(sc->element[_MMCAMCORDER_VIDEOSRC_CAPS].gst, "caps", &caps);
        if (caps && !gst_caps_is_any(caps)) {
                GstStructure *structure = NULL;
 
                structure = gst_caps_get_structure(caps, 0);
                if (structure) {
-                       const gchar *format_string = NULL;
                        int caps_width = 0;
                        int caps_height = 0;
-                       int caps_fps = 0;
+                       int caps_fps_n = 0;
+                       int caps_fps_d = 0;
                        int caps_rotate = 0;
 
-                       format_string = gst_structure_get_string(structure, "format");
-                       if (format_string)
-                               caps_fourcc = _mmcamcorder_convert_fourcc_string_to_value(format_string);
+                       caps_fourcc = _mmcamcorder_get_structure_fourcc(structure);
 
                        gst_structure_get(structure,
                                "width", G_TYPE_INT, &caps_width,
                                "height", G_TYPE_INT, &caps_height,
-                               "fps", G_TYPE_INT, &caps_fps,
+                               "framerate", GST_TYPE_FRACTION, &caps_fps_n, &caps_fps_d,
                                "rotate", G_TYPE_INT, &caps_rotate,
                                NULL);
 
 #ifdef _MMCAMCORDER_PRODUCT_TV
                        if (_mmcamcorder_is_encoded_preview_pixel_format(sc->info_image->preview_format)) {
                                if (set_width == caps_width && set_height == caps_height &&
-                                       set_rotate == caps_rotate && fps == caps_fps) {
+                                       set_rotate == caps_rotate && fps == caps_fps_n) {
                                        MMCAM_LOG_INFO("No need to replace caps.");
                                } else {
-                                       MMCAM_LOG_INFO("current [%c%c%c%c %dx%d, fps %d, rot %d], new [%c%c%c%c %dx%d, fps %d, rot %d]",
+                                       MMCAM_LOG_INFO("current [%c%c%c%c %dx%d, fps %d/%d, rot %d], new [%c%c%c%c %dx%d, fps %d, rot %d]",
                                                caps_fourcc, caps_fourcc>>8, caps_fourcc>>16, caps_fourcc>>24,
-                                               caps_width, caps_height, caps_fps, caps_rotate,
+                                               caps_width, caps_height, caps_fps_n, caps_fps_d, caps_rotate,
                                                fourcc, fourcc>>8, fourcc>>16, fourcc>>24,
                                                set_width, set_height, fps, set_rotate);
                                        do_set_caps = TRUE;
                                }
                        } else {
                                if (set_width == caps_width && set_height == caps_height &&
-                                   fourcc == caps_fourcc && set_rotate == caps_rotate && fps == caps_fps) {
+                                   fourcc == caps_fourcc && set_rotate == caps_rotate && fps == caps_fps_n) {
                                        MMCAM_LOG_INFO("No need to replace caps.");
                                } else {
-                                       MMCAM_LOG_INFO("current [%c%c%c%c %dx%d, fps %d, rot %d], new [%c%c%c%c %dx%d, fps %d, rot %d]",
+                                       MMCAM_LOG_INFO("current [%c%c%c%c %dx%d, fps %d/%d, rot %d], new [%c%c%c%c %dx%d, fps %d, rot %d]",
                                                caps_fourcc, caps_fourcc>>8, caps_fourcc>>16, caps_fourcc>>24,
-                                               caps_width, caps_height, caps_fps, caps_rotate,
+                                               caps_width, caps_height, caps_fps_n, caps_fps_d, caps_rotate,
                                                fourcc, fourcc>>8, fourcc>>16, fourcc>>24,
                                                set_width, set_height, fps, set_rotate);
                                        do_set_caps = TRUE;
@@ -2709,12 +2927,12 @@ bool _mmcamcorder_set_videosrc_caps(MMHandleType handle, unsigned int fourcc, in
                        }
 #else /*_MMCAMCORDER_PRODUCT_TV */
                        if (set_width == caps_width && set_height == caps_height &&
-                           fourcc == caps_fourcc && set_rotate == caps_rotate && fps == caps_fps) {
+                           fourcc == caps_fourcc && set_rotate == caps_rotate && fps == caps_fps_n) {
                                MMCAM_LOG_INFO("No need to replace caps.");
                        } else {
-                               MMCAM_LOG_INFO("current [%c%c%c%c %dx%d, fps %d, rot %d], new [%c%c%c%c %dx%d, fps %d, rot %d]",
+                               MMCAM_LOG_INFO("current [%c%c%c%c %dx%d, fps %d/%d, rot %d], new [%c%c%c%c %dx%d, fps %d, rot %d]",
                                        caps_fourcc, caps_fourcc>>8, caps_fourcc>>16, caps_fourcc>>24,
-                                       caps_width, caps_height, caps_fps, caps_rotate,
+                                       caps_width, caps_height, caps_fps_n, caps_fps_d, caps_rotate,
                                        fourcc, fourcc>>8, fourcc>>16, fourcc>>24,
                                        set_width, set_height, fps, set_rotate);
                                do_set_caps = TRUE;
@@ -2729,10 +2947,8 @@ bool _mmcamcorder_set_videosrc_caps(MMHandleType handle, unsigned int fourcc, in
                do_set_caps = TRUE;
        }
 
-       if (caps) {
+       if (caps)
                gst_caps_unref(caps);
-               caps = NULL;
-       }
 
        if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
                /* assume that it's camera capture mode */
@@ -2742,82 +2958,14 @@ bool _mmcamcorder_set_videosrc_caps(MMHandleType handle, unsigned int fourcc, in
        if (!do_set_caps)
                return TRUE;
 
-       switch (sc->info_image->preview_format) {
-       case MM_PIXEL_FORMAT_ENCODED_H264:
-#ifdef _MMCAMCORDER_PRODUCT_TV
-               mm_camcorder_get_attributes(handle, NULL,
-                       MMCAM_DISPLAY_SURFACE, &display_surface_type,
-                       NULL);
-               if (display_surface_type != MM_DISPLAY_SURFACE_NULL &&
-                       __mmcamcorder_find_max_resolution(handle, &maxwidth, &maxheight) == false) {
-                       MMCAM_LOG_ERROR("can not find max resolution limitation");
-                       return false;
-               } else if (display_surface_type == MM_DISPLAY_SURFACE_NULL) {
-                       maxwidth = set_width;
-                       maxheight = set_height;
-               }
-#endif /* _MMCAMCORDER_PRODUCT_TV */
-               caps = gst_caps_new_simple("video/x-h264",
-                       "width", G_TYPE_INT, set_width,
-                       "height", G_TYPE_INT, set_height,
-                       "framerate", GST_TYPE_FRACTION, fps, 1,
-                       "stream-format", G_TYPE_STRING, "byte-stream",
-#ifdef _MMCAMCORDER_PRODUCT_TV
-                       "maxwidth", G_TYPE_INT, maxwidth,
-                       "maxheight", G_TYPE_INT, maxheight,
-                       "alignment", G_TYPE_STRING, "au",
-#endif /* _MMCAMCORDER_PRODUCT_TV */
-                       NULL);
-               break;
-       case MM_PIXEL_FORMAT_ENCODED_MJPEG:
-#ifdef _MMCAMCORDER_PRODUCT_TV
-               caps = gst_caps_new_simple("video/x-jpeg",
-#else
-               caps = gst_caps_new_simple("image/jpeg",
-#endif
-                       "width", G_TYPE_INT, set_width,
-                       "height", G_TYPE_INT, set_height,
-                       "framerate", GST_TYPE_FRACTION, fps, 1,
-                       NULL);
-               break;
-       case MM_PIXEL_FORMAT_ENCODED_VP8:
-               caps = gst_caps_new_simple("video/x-vp8",
-                       "width", G_TYPE_INT, set_width,
-                       "height", G_TYPE_INT, set_height,
-                       "framerate", GST_TYPE_FRACTION, fps, 1,
-                       NULL);
-               break;
-       case MM_PIXEL_FORMAT_ENCODED_VP9:
-               caps = gst_caps_new_simple("video/x-vp9",
-                       "width", G_TYPE_INT, set_width,
-                       "height", G_TYPE_INT, set_height,
-                       "framerate", GST_TYPE_FRACTION, fps, 1,
-                       NULL);
-               break;
-               break;
-       default:
-               memcpy(fourcc_string, (char*)&fourcc, sizeof(fourcc));
-               fourcc_string[sizeof(fourcc)] = '\0';
-               caps = gst_caps_new_simple("video/x-raw",
-                       "format", G_TYPE_STRING, fourcc_string,
-                       "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);
-               break;
-       }
-
+       caps = _mmcamcorder_get_video_caps(handle,
+               sc->info_image->preview_format, set_width, set_height, fps, set_rotate);
        if (!caps) {
                MMCAM_LOG_ERROR("There are no caps");
                return FALSE;
        }
 
-       caps_str = gst_caps_to_string(caps);
-       MMCAM_LOG_INFO("vidoesrc new caps set [%s]", caps_str);
-       g_free(caps_str);
-
-       MMCAMCORDER_G_OBJECT_SET_POINTER(sc->element[_MMCAMCORDER_VIDEOSRC_FILT].gst, "caps", caps);
+       MMCAMCORDER_G_OBJECT_SET_POINTER(sc->element[_MMCAMCORDER_VIDEOSRC_CAPS].gst, "caps", caps);
        gst_caps_unref(caps);
 
        return TRUE;
@@ -3071,7 +3219,6 @@ bool _mmcamcorder_set_sound_stream_info(GstElement *element, char *stream_type,
        MMCAMCORDER_G_OBJECT_SET_POINTER(element, "stream-properties", props);
 
        gst_structure_free(props);
-       props = NULL;
 
        return TRUE;
 }
@@ -3173,7 +3320,7 @@ bool _mmcamcorder_recreate_decoder_for_encoded_preview(MMHandleType handle)
 #endif /* _MMCAMCORDER_RM_SUPPORT */
 
        /* create decoder */
-       sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst = gst_element_factory_make(videodecoder_name_final, "videosrc_decode");
+       sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst = gst_element_factory_make(videodecoder_name_final, "vsrc_dec");
        if (sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst == NULL) {
                MMCAM_LOG_ERROR("Decoder[%s] creation fail", videodecoder_name_final);
                return FALSE;
@@ -3196,17 +3343,17 @@ bool _mmcamcorder_recreate_decoder_for_encoded_preview(MMHandleType handle)
        /* link */
        if (_MM_GST_ELEMENT_LINK(GST_ELEMENT(sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst),
                GST_ELEMENT(sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst))) {
-               MMCAM_LOG_INFO("Link videosrc_queue to decoder OK");
+               MMCAM_LOG_INFO("Link vsrc_q to decoder OK");
        } else {
-               MMCAM_LOG_ERROR("Link videosrc_queue to decoder FAILED");
+               MMCAM_LOG_ERROR("Link vsrc_q to decoder FAILED");
                return FALSE;
        }
 
        if (_MM_GST_ELEMENT_LINK(GST_ELEMENT(sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst),
                GST_ELEMENT(sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst))) {
-               MMCAM_LOG_INFO("Link decoder to videosink_queue OK");
+               MMCAM_LOG_INFO("Link decoder to vsink_q OK");
        } else {
-               MMCAM_LOG_ERROR("Link decoder to videosink_queue FAILED");
+               MMCAM_LOG_ERROR("Link decoder to vsink_q FAILED");
                return FALSE;
        }
 
@@ -3222,8 +3369,51 @@ bool _mmcamcorder_recreate_decoder_for_encoded_preview(MMHandleType handle)
        return TRUE;
 }
 
+
+int _mmcamcorder_set_video_stream_callback_flag(MMHandleType handle, gboolean enable, int flag)
+{
+       int ret = MM_ERROR_NONE;
+       int flag_current = MM_CAMCORDER_VIDEO_STREAM_CALLBACK_FLAG_NONE;
+       int flag_new = MM_CAMCORDER_VIDEO_STREAM_CALLBACK_FLAG_NONE;
+
+       MMCAM_LOG_INFO("enable[%d], flag[0x%08x]", enable, flag);
+
+       _MMCAMCORDER_LOCK_VSTREAM_CALLBACK_FLAG(handle);
+
+       ret = mm_camcorder_get_attributes(handle, NULL,
+               MMCAM_VIDEO_STREAM_CALLBACK_FLAG, &flag_current,
+               NULL);
+       if (ret != MM_ERROR_NONE) {
+               MMCAM_LOG_ERROR("get vstream callback flag failed[0x%x]", ret);
+               goto _SET_VIDEO_STREAM_CALLBACK_FLAG_DONE;
+       }
+
+       MMCAM_LOG_INFO("current flag[0x%08x]", flag_current);
+
+       if (enable)
+               flag_new = flag_current | flag;
+       else
+               flag_new = flag_current & ~flag;
+
+       ret = mm_camcorder_set_attributes(handle, NULL,
+               MMCAM_VIDEO_STREAM_CALLBACK_FLAG, flag_new,
+               NULL);
+       if (ret != MM_ERROR_NONE) {
+               MMCAM_LOG_ERROR("set vstream callback flag[0x%x] failed[0x%x]", flag_new, ret);
+               goto _SET_VIDEO_STREAM_CALLBACK_FLAG_DONE;
+       }
+
+       MMCAM_LOG_INFO("new flag[0x%08x]", flag_new);
+
+_SET_VIDEO_STREAM_CALLBACK_FLAG_DONE:
+       _MMCAMCORDER_UNLOCK_VSTREAM_CALLBACK_FLAG(handle);
+
+       return ret;
+}
+
+
 #ifdef _MMCAMCORDER_PRODUCT_TV
-static bool __mmcamcorder_find_max_resolution(MMHandleType handle, gint *max_width, gint *max_height)
+bool __mmcamcorder_find_max_resolution(MMHandleType handle, gint *max_width, gint *max_height)
 {
        _MMCamcorderSubContext *sc = NULL;
        mmf_camcorder_t *hcamcorder = NULL;