Add new internal API to enable extra video convert element
[platform/core/api/mediacodec.git] / src / media_codec_port_gst.c
old mode 100755 (executable)
new mode 100644 (file)
index 71a3749..e2954ec
  * limitations under the License.
  *
  */
-#include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <dlog.h>
 #include <media_codec_queue.h>
 #include <media_codec_port_gst.h>
+#include <media_packet_internal.h>
 #include <media_codec_util.h>
 
 #include <gst/gst.h>
 #include <gst/gstelement.h>
 #include <gst/app/gstappsrc.h>
-
-#ifdef TIZEN_PROFILE_LITE
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <linux/ion.h>
-#endif
+#include <gst/pbutils/pbutils.h>
+#include <gst/tag/tag.h>
 
 /*
  * Internal Implementation
  */
 static gpointer feed_task(gpointer data);
+static void _mc_gst_feed_task_new(mc_gst_core_t *core);
+static void _mc_gst_feed_task_free(mc_gst_core_t *core);
 static void __mc_gst_stop_feed(GstElement *pipeline, gpointer data);
 static void __mc_gst_start_feed(GstElement *pipeline, guint size, gpointer data);
 static media_packet_h _mc_get_input_buffer(mc_gst_core_t *core);
 
 static gboolean __mc_gst_init_gstreamer();
 static int _mc_output_media_packet_new(mc_gst_core_t *core, bool video, bool encoder, media_format_mimetype_e out_mime);
-static mc_ret_e _mc_gst_create_pipeline(mc_gst_core_t *core, gchar *factory_name);
+static mc_ret_e _mc_gst_create_pipeline(mc_gst_core_t *core, const gchar *factory_name);
 static mc_ret_e _mc_gst_destroy_pipeline(mc_gst_core_t *core);
 static void __mc_gst_buffer_add(GstElement *element, GstBuffer *buffer, GstPad *pad, gpointer data);
 static int __mc_output_buffer_finalize_cb(media_packet_h packet, int error_code, void *user_data);
-static int _mc_gst_update_caps(mc_gst_core_t *core, GstMCBuffer *mcbuffer, bool codec_config);
-static gboolean _mc_update_packet_info(mc_gst_core_t *core, media_format_h fmt);
+static gboolean _mc_update_packet_info(mc_gst_core_t *core, media_format_h format);
 static GstMCBuffer *_mc_gst_media_packet_to_gstbuffer(mc_gst_core_t *core, media_packet_h packet, bool codec_config);
 static int _mc_gst_gstbuffer_to_appsrc(mc_gst_core_t *core, GstMCBuffer *mcbuffer);
-static gchar *__mc_get_gst_input_format(media_packet_h packet, bool is_hw);
-static media_packet_h __mc_gst_make_media_packet(mc_gst_core_t *core, unsigned char *data, int size);
+static gchar *__mc_get_gst_input_format(media_format_mimetype_e mimetype, bool is_hw);
+static GstMCBuffer *__mc_gst_make_media_packet(mc_gst_core_t *core, GstBuffer *buffer);
 static gboolean __mc_gst_bus_callback(GstBus *bus, GstMessage *msg, gpointer data);
 static GstBusSyncReply __mc_gst_bus_sync_callback(GstBus *bus, GstMessage *msg, gpointer data);
-static MMVideoBuffer *__mc_gst_make_tbm_buffer(mc_gst_core_t *core, media_packet_h packet);
+static GstMemory *__mc_gst_make_tbm_buffer(mc_gst_core_t *core, GstMCBuffer *mcbuffer);
 static GstMCBuffer *gst_mediacodec_buffer_new(mc_gst_core_t *core, media_packet_h packet, uint64_t size);
-static void gst_mediacodec_buffer_finalize(GstMCBuffer *buffer);
+static void __mc_input_buffer_finalize_cb(GstMCBuffer *buffer);
 static int __mc_set_caps_streamheader(mc_gst_core_t *core, GstMCBuffer *mcbuffer, guint streamheader_size);
 static int __mc_set_caps_codecdata(mc_gst_core_t *core, GstMCBuffer *mcbuffer, guint codecdata_size);
-static void __mc_push_output_to_queue(mc_gst_core_t *core, media_packet_h out_packet);
-static int __mc_gst_create_eos_packet(media_format_h fmt, media_packet_h *out_packet);
+static void __mc_push_output_to_queue(mc_gst_core_t *core, GstMCBuffer *mcbuffer);
+static int __mc_gst_create_eos_packet(media_format_h fmt, GstMCBuffer *mcbuffer);
 static void _mc_gst_handle_input_buffer_used(mc_gst_core_t *core, media_packet_h packet);
+static gboolean _mc_gst_video_info_check_and_new(mc_gst_core_t *core, GstMCBuffer *mcbuffer);
+static void _mc_gst_video_info_free(mc_gst_core_t *core);
+static void _mc_gst_video_meta_add(mc_gst_core_t *core, GstBuffer *buffer);
 
 static gint __gst_handle_stream_error(mc_gst_core_t *core, GError *error, GstMessage *message);
 static gint __gst_transform_gsterror(mc_gst_core_t *core, GstMessage *message, GError *error);
@@ -70,11 +70,9 @@ static gint __gst_handle_resource_error(mc_gst_core_t *core, int code);
 static gint __gst_handle_library_error(mc_gst_core_t *core, int code);
 static gint __gst_handle_core_error(mc_gst_core_t *core, int code);
 static const gchar * _mc_error_to_string(mc_ret_e err);
+static const gchar * _mc_bit_to_string(int bit);
 
 static int _mc_link_vtable(mc_gst_core_t *core, mediacodec_codec_type_e id, gboolean is_encoder, gboolean is_hw);
-#ifdef TIZEN_PROFILE_LITE
-static int __tbm_get_physical_addr_bo(tbm_bo_handle tbm_bo_handle_fd_t, int *phy_addr, int *phy_size);
-#endif
 static int _mc_gst_flush_buffers(mc_gst_core_t *core);
 static void _mc_gst_set_flush_input(mc_gst_core_t *core);
 static void _mc_gst_set_flush_output(mc_gst_core_t *core);
@@ -88,79 +86,114 @@ static void __csc_tiled_to_linear_crop(unsigned char *yuv420_dest,
 
 static void _mc_send_eos_signal(mc_gst_core_t *core);
 static void _mc_wait_for_eos(mc_gst_core_t *core);
-static int _mediacodec_get_mime(mc_gst_core_t *core);
+static int _mc_get_mime(mc_gst_core_t *core);
+static int _mc_set_codec_data(mc_gst_core_t *core, GstMCBuffer *mcbuffer, bool codec_config);
+static gboolean _mc_gst_vid_caps_new(mc_gst_core_t *core, mediacodec_codec_type_e codec_id, gint index);
+static gboolean _mc_gst_aud_caps_new(mc_gst_core_t *core, mediacodec_codec_type_e codec_id, gint index);
+
+static int __mc_fill_input_buffer(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer);
+static int __mc_fill_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer);
 
+static int __mc_fill_input_buffer_with_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer);
+static int __mc_fill_input_buffer_with_adec_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer);
+static int __mc_fill_input_buffer_with_venc_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer);
+
+static int __mc_fill_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer);
+static int __mc_fill_aenc_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer);
+static int __mc_fill_venc_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer);
+static int __mc_fill_vdec_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer);
+
+static mc_gst_core_t *mc_gst_core_new();
+static void mc_gst_core_free(mc_gst_core_t *core);
+
+static mc_gst_port_t *mc_gst_port_new(mc_gst_core_t *core);
+static void mc_gst_port_free(mc_gst_port_t *port);
 /* video vtable */
-int(*vdec_vtable[])() = {&__mc_fill_input_buffer_with_packet, &__mc_fill_packet_with_output_buffer};
-int(*venc_vtable[])() = {&__mc_fill_input_buffer_with_packet, &__mc_fill_packet_with_output_buffer};
+__attribute__((unused))
+static int(*vdec_vtable[])() = {&__mc_fill_input_buffer_with_packet, &__mc_fill_packet_with_output_buffer};
 
+static int(*venc_vtable[])() = {&__mc_fill_input_buffer_with_packet, &__mc_fill_packet_with_output_buffer};
 
-int(*vdec_h264_sw_vtable[])() = {&__mc_fill_input_buffer_with_packet,                  /* S/W H.264 Decoder Vtable */
+static int(*vdec_h264_sw_vtable[])() = {&__mc_fill_input_buffer_with_packet,                   /* S/W H.264 Decoder Vtable */
                                                                &__mc_fill_vdec_packet_with_output_buffer};
 
-int(*vdec_mpeg4_sw_vtable[])() = {&__mc_fill_input_buffer_with_packet,                 /* S/W MPEG4 Decoder Vtable */
+static int(*vdec_mpeg4_sw_vtable[])() = {&__mc_fill_input_buffer_with_packet,                  /* S/W MPEG4 Decoder Vtable */
                                                                &__mc_fill_vdec_packet_with_output_buffer};
 
-int(*vdec_h263_sw_vtable[])() = {&__mc_fill_input_buffer_with_packet,                  /* S/W MPEG4 Decoder Vtable */
+static int(*vdec_h263_sw_vtable[])() = {&__mc_fill_input_buffer_with_packet,                   /* S/W MPEG4 Decoder Vtable */
                                                                &__mc_fill_vdec_packet_with_output_buffer};
 
-int(*vdec_h264_hw_vtable[])() = {&__mc_fill_input_buffer_with_packet,                  /* H/W H.264 Decoder Vtable */
+static int(*vdec_h264_hw_vtable[])() = {&__mc_fill_input_buffer_with_packet,                   /* H/W H.264 Decoder Vtable */
                                                                &__mc_fill_vdec_packet_with_output_buffer};
 
-int(*vdec_mpeg4_hw_vtable[])() = {&__mc_fill_input_buffer_with_packet,                 /* H/W MPEG4 Decoder Vtable */
+static int(*vdec_mpeg4_hw_vtable[])() = {&__mc_fill_input_buffer_with_packet,                  /* H/W MPEG4 Decoder Vtable */
                                                                &__mc_fill_vdec_packet_with_output_buffer};
 
-int(*vdec_h263_hw_vtable[])() = {&__mc_fill_input_buffer_with_packet,                  /* H/W MPEG4 Decoder Vtable */
+static int(*vdec_h263_hw_vtable[])() = {&__mc_fill_input_buffer_with_packet,                   /* H/W MPEG4 Decoder Vtable */
                                                                &__mc_fill_vdec_packet_with_output_buffer};
 
-int(*venc_mpeg4_sw_vtable[])() = {&__mc_fill_input_buffer_with_venc_packet,            /* S/W MPEG4 Encoder Vtable */
+static int(*venc_mpeg4_sw_vtable[])() = {&__mc_fill_input_buffer_with_venc_packet,             /* S/W MPEG4 Encoder Vtable */
                                                                &__mc_fill_venc_packet_with_output_buffer};
 
-int(*venc_h263_sw_vtable[])() = {&__mc_fill_input_buffer_with_venc_packet,             /* S/W MPEG4 Encoder Vtable */
+static int(*venc_h263_sw_vtable[])() = {&__mc_fill_input_buffer_with_venc_packet,              /* S/W MPEG4 Encoder Vtable */
                                                                &__mc_fill_venc_packet_with_output_buffer};
 
-int(*venc_h264_hw_vtable[])() = {&__mc_fill_input_buffer_with_venc_packet,             /* H/W H.264 Encoder Vtable */
+static int(*venc_h264_hw_vtable[])() = {&__mc_fill_input_buffer_with_venc_packet,              /* H/W H.264 Encoder Vtable */
                                                                &__mc_fill_venc_packet_with_output_buffer};
 
-int(*venc_mpeg4_hw_vtable[])() = {&__mc_fill_input_buffer_with_venc_packet,            /* H/W MPEG4 Encoder Vtable */
+static int(*venc_mpeg4_hw_vtable[])() = {&__mc_fill_input_buffer_with_venc_packet,             /* H/W MPEG4 Encoder Vtable */
                                                                &__mc_fill_venc_packet_with_output_buffer};
 
-int(*venc_h263_hw_vtable[])() = {&__mc_fill_input_buffer_with_venc_packet,             /* H/W MPEG4 Encoder Vtable */
+static int(*venc_h263_hw_vtable[])() = {&__mc_fill_input_buffer_with_venc_packet,              /* H/W MPEG4 Encoder Vtable */
                                                                &__mc_fill_venc_packet_with_output_buffer};
 
-int(*aenc_vtable[])() = {&__mc_fill_input_buffer_with_packet, &__mc_fill_packet_with_output_buffer};
-int(*adec_vtable[])() = {&__mc_fill_input_buffer_with_packet, &__mc_fill_packet_with_output_buffer};
+__attribute__((unused))
+static int(*aenc_vtable[])() = {&__mc_fill_input_buffer_with_packet, &__mc_fill_packet_with_output_buffer};
 
-int(*aenc_aac_vtable[])() = {&__mc_fill_input_buffer_with_packet,                    /* AAC LC Encoder vtable */
-                                                       &__mc_fill_packet_with_output_buffer};
+static int(*adec_vtable[])() = {&__mc_fill_input_buffer_with_packet, &__mc_fill_packet_with_output_buffer};
 
-int(*adec_aac_vtable[])() = {&__mc_fill_input_buffer_with_packet,                    /* AAC LC Decoder Vtable */
+static int(*aenc_aac_vtable[])() = {&__mc_fill_input_buffer_with_packet,                    /* AAC LC Encoder vtable */
+                                                       &__mc_fill_aenc_packet_with_output_buffer};
+
+static int(*adec_aac_vtable[])() = {&__mc_fill_input_buffer_with_adec_packet,               /* AAC LC Decoder Vtable */
                                                        &__mc_fill_packet_with_output_buffer};
 
-int(*adec_aacv12_vtable[])() = {&__mc_fill_input_buffer_with_packet,                 /* AAC HE Decoder Vtable */
+static int(*adec_aacv12_vtable[])() = {&__mc_fill_input_buffer_with_adec_packet,            /* AAC HE Decoder Vtable */
                                                        &__mc_fill_packet_with_output_buffer};
 
-int(*adec_mp3_vtable[])() = {&__mc_fill_input_buffer_with_packet,                    /* MP3 Decoder Vtable */
+static int(*adec_mp3_vtable[])() = {&__mc_fill_input_buffer_with_packet,                    /* MP3 Decoder Vtable */
                                                        &__mc_fill_packet_with_output_buffer};
 
-int(*adec_amrnb_vtable[])() = {&__mc_fill_input_buffer_with_packet,                  /* AMR-NB Decoder Vtable */
+static int(*adec_amrnb_vtable[])() = {&__mc_fill_input_buffer_with_packet,                  /* AMR-NB Decoder Vtable */
                                                        &__mc_fill_packet_with_output_buffer};
 
-int(*adec_amrwb_vtable[])() = {&__mc_fill_input_buffer_with_packet,                  /* AMR-WB Decoder Vtable */
+static int(*adec_amrwb_vtable[])() = {&__mc_fill_input_buffer_with_packet,                  /* AMR-WB Decoder Vtable */
                                                        &__mc_fill_packet_with_output_buffer};
 
-int(*aenc_amrnb_vtable[])() = {&__mc_fill_input_buffer_with_packet,                  /* AMR-NB Encoder Vtable */
+static int(*aenc_amrnb_vtable[])() = {&__mc_fill_input_buffer_with_packet,                  /* AMR-NB Encoder Vtable */
                                                        &__mc_fill_packet_with_output_buffer};
 
-int(*adec_vorbis_vtable[])() = {&__mc_fill_input_buffer_with_packet,                 /* VORBIS Decoder Vtable */
+static int(*adec_vorbis_vtable[])() = {&__mc_fill_input_buffer_with_packet,                 /* VORBIS Decoder Vtable */
                                                        &__mc_fill_packet_with_output_buffer};
 
-int(*adec_flac_vtable[])() = {&__mc_fill_input_buffer_with_packet,                   /* FLAC Decoder Vtable */
+static int(*adec_flac_vtable[])() = {&__mc_fill_input_buffer_with_packet,                   /* FLAC Decoder Vtable */
                                                        &__mc_fill_packet_with_output_buffer};
 
-int(*adec_wma_vtable[])() = {&__mc_fill_input_buffer_with_packet,                    /* WMA Decoder Vtable */
+static int(*adec_wma_vtable[])() = {&__mc_fill_input_buffer_with_packet,                    /* WMA Decoder Vtable */
                                                        &__mc_fill_packet_with_output_buffer};
 
+static int(*aenc_opus_vtable[])() =  {&__mc_fill_input_buffer_with_packet,                  /* Opus Encoder Vtable */
+                                                       &__mc_fill_aenc_packet_with_output_buffer};
+
+#define MEDIACODEC_CROP_ARRAY_LENGTH 4
+#define MEDIACODEC_ELEMENT_SET_STATE(x_element, x_state)                                          \
+       do {                                                                                            \
+               LOGD("setting state [%s:%d] to [%s]\n", #x_state, x_state, GST_ELEMENT_NAME(x_element)); \
+               if (GST_STATE_CHANGE_FAILURE == gst_element_set_state(x_element, x_state)) {                    \
+                       LOGE("failed to set state %s to %s\n", #x_state, GST_ELEMENT_NAME(x_element));        \
+                       goto STATE_CHANGE_FAILED;                                                               \
+               }                                                                                           \
+       } while (0)
 
 /*
  * fill_inbuf virtual functions
@@ -170,11 +203,9 @@ int __mc_fill_input_buffer(mc_gst_core_t *core, media_packet_h packet, GstMCBuff
        return core->vtable[fill_inbuf](core, packet, mcbuffer);
 }
 
-int __mc_fill_inbuf_with_mm_video_buffer(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer)
+static int __mc_fill_input_buffer_with_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer)
 {
-       int ret = MC_ERROR_NONE;
-
-       MMVideoBuffer *mm_vbuffer = NULL;
+       gint ret = MC_ERROR_NONE;
        void *buf_data = NULL;
        uint64_t buf_size = 0;
 
@@ -190,29 +221,25 @@ int __mc_fill_inbuf_with_mm_video_buffer(mc_gst_core_t *core, media_packet_h pac
                return MC_ERROR;
        }
 
-       mm_vbuffer = __mc_gst_make_tbm_buffer(core, mcbuffer->packet);
+       if (buf_data == NULL)
+               return MC_ERROR;
 
-       if (mm_vbuffer != NULL) {
-               gst_buffer_prepend_memory(mcbuffer->buffer,
-                               gst_memory_new_wrapped(GST_MEMORY_FLAG_READONLY, mm_vbuffer, sizeof(*mm_vbuffer), 0,
-                                       sizeof(*mm_vbuffer), mm_vbuffer, free));
-               LOGD("mm_vbuffer appended, %d, %d", sizeof(*mm_vbuffer), gst_buffer_n_memory(mcbuffer->buffer));
-       }
+       gst_buffer_append_memory(mcbuffer->buffer,
+               gst_memory_new_wrapped(GST_MEMORY_FLAG_READONLY, buf_data, buf_size, 0,
+                       buf_size, mcbuffer, (GDestroyNotify)__mc_input_buffer_finalize_cb));
+       LOGD("packet data apended");
 
-       if (buf_data != NULL) {
-               gst_buffer_prepend_memory(mcbuffer->buffer,
-                               gst_memory_new_wrapped(GST_MEMORY_FLAG_READONLY, buf_data, buf_size, 0,
-                                       buf_size, mcbuffer, (GDestroyNotify)gst_mediacodec_buffer_finalize));
-               LOGD("packet data apended, %d, %d", buf_size, gst_buffer_n_memory(mcbuffer->buffer));
-       }
        return ret;
 }
 
-int __mc_fill_input_buffer_with_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer)
+static int __mc_fill_input_buffer_with_adec_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer)
 {
-       int ret = MC_ERROR_NONE;
-       void *buf_data = NULL;
+       gint ret = MC_ERROR_NONE;
        uint64_t buf_size = 0;
+       unsigned int codec_size = 0;
+       bool codec_config = FALSE;
+       void *buf_data = NULL;
+       void *codec_data = NULL;
 
        ret = media_packet_get_buffer_size(packet, &buf_size);
        if (ret != MEDIA_PACKET_ERROR_NONE) {
@@ -226,35 +253,52 @@ int __mc_fill_input_buffer_with_packet(mc_gst_core_t *core, media_packet_h packe
                return MC_ERROR;
        }
 
+       if (media_packet_is_codec_config(packet, &codec_config) != MEDIA_PACKET_ERROR_NONE) {
+               LOGE("media_packet_is_codec_config failed");
+               return MC_ERROR;
+       }
+
        if (buf_data != NULL) {
-               gst_buffer_append_memory(mcbuffer->buffer,
-                               gst_memory_new_wrapped(GST_MEMORY_FLAG_READONLY, buf_data, buf_size, 0,
-                                       buf_size, mcbuffer, (GDestroyNotify)gst_mediacodec_buffer_finalize));
-               LOGD("packet data apended");
+               media_packet_get_codec_data(packet, &codec_data, &codec_size);
+
+               if (!codec_data && codec_config) {
+                       gst_buffer_append_memory(mcbuffer->buffer,
+                                       gst_memory_new_wrapped(GST_MEMORY_FLAG_READONLY, buf_data, buf_size, 0,
+                                               buf_size, NULL, NULL));
+                       LOGD("csd packet data apended");
+               } else {
+                       gst_buffer_append_memory(mcbuffer->buffer,
+                                       gst_memory_new_wrapped(GST_MEMORY_FLAG_READONLY, buf_data, buf_size, 0,
+                                               buf_size, mcbuffer, (GDestroyNotify)__mc_input_buffer_finalize_cb));
+                       LOGD("packet data apended");
+               }
+
+               if (codec_data)
+                       free(codec_data);
        }
 
        return ret;
 }
 
-int __mc_fill_input_buffer_with_venc_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer)
+static int __mc_fill_input_buffer_with_venc_packet(mc_gst_core_t *core, media_packet_h packet, GstMCBuffer *mcbuffer)
 {
-       int ret = MC_ERROR_NONE;
-       void *uv_ptr = NULL;
-       void *y_ptr = NULL;
-       int buf_size = 0;
-       int stride_width;
-       int stride_height;
-       int width;
-       int height;
+       gint ret = MC_ERROR_NONE;
+       gint i;
+       gint j;
+       gint stride = 0;
+       gint buf_size = 0;
+       gint stride_width;
+       gint stride_height;
+       gint width;
+       gint height;
        uint32_t plane_num;
-       int i;
-       int j;
-       int stride = 0;
+       guint8 *planes[2];
+       GstMemory *mem = NULL;
 
-       mc_encoder_info_t *enc_info = (mc_encoder_info_t *)core->codec_info;
+       mc_gst_port_def_t *port_def = &core->ports[in_port_index]->port_def;
 
-       width = enc_info->width;
-       height = enc_info->height;
+       width = port_def->info.video.width;
+       height = port_def->info.video.height;
 
        ret = media_packet_get_number_of_video_planes(packet, &plane_num);
        if (ret != MEDIA_PACKET_ERROR_NONE) {
@@ -262,7 +306,7 @@ int __mc_fill_input_buffer_with_venc_packet(mc_gst_core_t *core, media_packet_h
                return MC_ERROR;
        }
 
-       ret = media_packet_get_video_plane_data_ptr(packet, 0, &y_ptr);
+       ret = media_packet_get_video_plane_data_ptr(packet, 0, (void **)&planes[0]);
        if (ret != MEDIA_PACKET_ERROR_NONE) {
                LOGW("media_packet_get_video_plane_data_ptr failed");
                return MC_ERROR;
@@ -285,20 +329,20 @@ int __mc_fill_input_buffer_with_venc_packet(mc_gst_core_t *core, media_packet_h
                        mcbuffer->buf_size += stride_width * stride_height;
 
                        for (i = 1; i < plane_num; i++) {
-                               media_packet_get_video_plane_data_ptr(packet, i, &uv_ptr);
+                               media_packet_get_video_plane_data_ptr(packet, i, (void **)&planes[1]);
                                media_packet_get_video_stride_width(packet, i, &stride_width);
                                media_packet_get_video_stride_height(packet, i, &stride_height);
 
                                buf_size = stride_width * stride_height;
 
-                               memcpy(y_ptr + mcbuffer->buf_size, uv_ptr, buf_size);
+                               memcpy(planes[0] + mcbuffer->buf_size, planes[1], buf_size);
                                mcbuffer->buf_size += buf_size;
                                LOGD("plane : %d, buf_size : %d, total : %d", i, buf_size, mcbuffer->buf_size);
                        }
                } else {
 
                        for (j = 0; j < height; j++) {
-                               memcpy(y_ptr + mcbuffer->buf_size, y_ptr + stride, width);
+                               memcpy(planes[0] + mcbuffer->buf_size, planes[0] + stride, width);
                                mcbuffer->buf_size += width;
                                stride += stride_width;
                        }
@@ -306,36 +350,39 @@ int __mc_fill_input_buffer_with_venc_packet(mc_gst_core_t *core, media_packet_h
                        stride = 0;
 
                        for (i = 1; i < plane_num; i++) {
-                               media_packet_get_video_plane_data_ptr(packet, i, &uv_ptr);
+                               media_packet_get_video_plane_data_ptr(packet, i, (void **)&planes[1]);
                                media_packet_get_video_stride_width(packet, i, &stride_width);
                                media_packet_get_video_stride_height(packet, i, &stride_height);
 
                                for (j = 0; j < height>>1; j++) {
-                                       memcpy(y_ptr + mcbuffer->buf_size, uv_ptr + stride, width>>1);
+                                       memcpy(planes[0] + mcbuffer->buf_size, planes[1] + stride, width>>1);
                                        mcbuffer->buf_size += width>>1;
                                        stride += stride_width;
                                }
 
-                               memcpy(y_ptr + mcbuffer->buf_size, uv_ptr, buf_size);
+                               memcpy(planes[0] + mcbuffer->buf_size, planes[1], buf_size);
                                LOGD("plane : %d, buf_size : %d, total : %d", i, buf_size, mcbuffer->buf_size);
                                mcbuffer->buf_size += buf_size;
                        }
                }
-       } else {
-               MMVideoBuffer *mm_video_buffer = NULL;
-
-               mm_video_buffer = __mc_gst_make_tbm_buffer(core, packet);
 
-               gst_buffer_prepend_memory(mcbuffer->buffer,
-                               gst_memory_new_wrapped(GST_MEMORY_FLAG_READONLY, mm_video_buffer, sizeof(MMVideoBuffer), 0,
-                                       sizeof(MMVideoBuffer), mm_video_buffer, free));
+               mem = gst_memory_new_wrapped(GST_MEMORY_FLAG_READONLY,
+                               planes[0], mcbuffer->buf_size, 0,
+                               mcbuffer->buf_size, mcbuffer,
+                               (GDestroyNotify)__mc_input_buffer_finalize_cb);
+       } else {
+               mem = __mc_gst_make_tbm_buffer(core, mcbuffer);
+               LOGD("tizen memory[%p]", mem);
+       }
 
-               LOGD("mm_video_buffer appended, %d, %d", sizeof(MMVideoBuffer), gst_buffer_n_memory(mcbuffer->buffer));
+       if (mem == NULL) {
+               LOGE("gstmemory failed[is_hw:%d]", core->is_hw);
+               return MC_ERROR;
        }
 
-       gst_buffer_prepend_memory(mcbuffer->buffer,
-                       gst_memory_new_wrapped(GST_MEMORY_FLAG_READONLY, y_ptr, mcbuffer->buf_size, 0,
-                               mcbuffer->buf_size, mcbuffer, (GDestroyNotify)gst_mediacodec_buffer_finalize));
+       gst_buffer_append_memory(mcbuffer->buffer, mem);
+
+       _mc_gst_video_meta_add(core, mcbuffer->buffer);
 
        return ret;
 }
@@ -345,12 +392,12 @@ int __mc_fill_input_buffer_with_venc_packet(mc_gst_core_t *core, media_packet_h
  * fill_outbuf virtual functions
  */
 
-int __mc_fill_output_buffer(mc_gst_core_t *core, void *data, int size, media_packet_h *out_packet)
+static int __mc_fill_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer)
 {
-       return core->vtable[fill_outbuf](core, data, size, out_packet);
+       return core->vtable[fill_outbuf](core, data, size, mcbuffer);
 }
 
-int __mc_fill_vdec_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, media_packet_h *packet)
+static int __mc_fill_vdec_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer)
 {
        int i;
        int stride_width;
@@ -358,18 +405,19 @@ int __mc_fill_vdec_packet_with_output_buffer(mc_gst_core_t *core, void *data, in
        uint32_t width;
        uint32_t height;
        uint32_t buf_size;
-       tbm_surface_h tsurf = NULL;
        tbm_surface_info_s tsurf_info;
        tbm_bo bo[MM_VIDEO_BUFFER_PLANE_MAX];
        tbm_bo_handle thandle;
+       tbm_surface_h tsurf = NULL;
+       media_packet_h packet = NULL;
 
        g_return_val_if_fail(core != NULL, MC_PARAM_ERROR);
 
-       mc_decoder_info_t *dec_info = (mc_decoder_info_t *)core->codec_info;
+       mc_gst_port_def_t *port_def = &core->ports[out_port_index]->port_def;
 
        if (!core->is_hw) {
-               width = dec_info->width;
-               height = dec_info->height;
+               width = port_def->info.video.width;
+               height = port_def->info.video.height;
                stride_width = GST_ROUND_UP_4(width);
                stride_height = height;
                buf_size = stride_width * stride_height * 3 / 2;
@@ -382,8 +430,8 @@ int __mc_fill_vdec_packet_with_output_buffer(mc_gst_core_t *core, void *data, in
                        return MC_ERROR;
                }
 
-               tsurf_info.width = dec_info->width;
-               tsurf_info.height = dec_info->height;
+               tsurf_info.width = port_def->info.video.width;
+               tsurf_info.height = port_def->info.video.height;
                tsurf_info.format = TBM_FORMAT_YVU420;
                tsurf_info.bpp = tbm_surface_internal_get_bpp(TBM_FORMAT_YVU420);
                tsurf_info.num_planes = tbm_surface_internal_get_num_planes(TBM_FORMAT_YVU420);
@@ -409,92 +457,74 @@ int __mc_fill_vdec_packet_with_output_buffer(mc_gst_core_t *core, void *data, in
 
                tsurf = tbm_surface_internal_create_with_bos(&tsurf_info, bo, 1);
        } else {
-               int bo_num = 0;
-               MMVideoBuffer *mm_vbuffer = NULL;
-               mm_vbuffer = (MMVideoBuffer *)data;
-
-               if (mm_vbuffer->type == MM_VIDEO_BUFFER_TYPE_TBM_BO) {
-                       tbm_surface_info_s tsurf_info;
-                       memset(&tsurf_info, 0x0, sizeof(tbm_surface_info_s));
-
-                       /* create tbm surface */
-                       for (i = 0; i < MM_VIDEO_BUFFER_PLANE_MAX; i++) {
-                               if (mm_vbuffer->handle.bo[i]) {
-                                       bo_num++;
-                                       tsurf_info.planes[i].stride = mm_vbuffer->stride_width[i];
-                               }
-                       }
-
-                       if (bo_num > 0) {
-                               tsurf_info.width = dec_info->width;
-                               tsurf_info.height = dec_info->height;
-                               tsurf_info.format = TBM_FORMAT_NV12;        /* bo_format */
-                               tsurf_info.bpp = tbm_surface_internal_get_bpp(TBM_FORMAT_NV12);
-                               tsurf_info.num_planes = tbm_surface_internal_get_num_planes(TBM_FORMAT_NV12);
-                               tsurf_info.size = 0;
-
-                               for (i = 0; i < tsurf_info.num_planes; i++) {
-                                       tsurf_info.planes[i].stride = mm_vbuffer->stride_width[i];
-                                       tsurf_info.planes[i].size = mm_vbuffer->stride_width[i] * mm_vbuffer->stride_height[i];
-
-                                       if (i < bo_num)
-                                               tsurf_info.planes[i].offset = 0;
-                                       else
-                                               tsurf_info.planes[i].offset = tsurf_info.planes[i-1].offset + tsurf_info.planes[i - 1].size;
-
-                                       tsurf_info.size += tsurf_info.planes[i].size;
-                                       LOGD("%d plane stride : %d, size : %d", i, tsurf_info.planes[i].stride, tsurf_info.planes[i].size);
-                               }
-                               tsurf = tbm_surface_internal_create_with_bos(&tsurf_info, (tbm_bo *)mm_vbuffer->handle.bo, bo_num);
-                       }
-               }
+               tsurf = (tbm_surface_h)data;
        }
 
        if (tsurf) {
                media_packet_create_from_tbm_surface(core->output_fmt, tsurf,
-                               (media_packet_finalize_cb)__mc_output_buffer_finalize_cb, core, packet);
+                               (media_packet_finalize_cb)__mc_output_buffer_finalize_cb, mcbuffer, &packet);
+               mcbuffer->packet = packet;
        }
 
        return MC_ERROR_NONE;
 }
 
-int __mc_fill_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, media_packet_h *out_packet)
+static int __mc_fill_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer)
 {
+       gint ret = MC_ERROR_NONE;
+       gchar *ext_mem = NULL;
+       gint mem_size = 0;
        void *packet_data = NULL;
-       int ret = MC_ERROR_NONE;
+       media_packet_h packet = NULL;
+
        g_return_val_if_fail(core != NULL, MC_PARAM_ERROR);
 
        if (core->encoder && core->codec_id == MEDIACODEC_AAC)
                media_format_set_audio_aac_type(core->output_fmt, FALSE);
 
-       ret = media_packet_create_alloc(core->output_fmt, __mc_output_buffer_finalize_cb, core, out_packet);
+       mem_size = GST_ROUND_UP_4(size);
+       ext_mem = g_malloc0(mem_size);
+
+       ret = media_packet_create_from_external_memory(core->output_fmt, ext_mem, mem_size, __mc_output_buffer_finalize_cb, mcbuffer, &packet);
        if (ret != MEDIA_PACKET_ERROR_NONE) {
                LOGW("media_packet_create_alloc failed");
+               g_free(ext_mem);
                return MC_ERROR;
        }
+       mcbuffer->packet = packet;
+       mcbuffer->ext_mem = ext_mem;
 
-       media_packet_set_buffer_size(*out_packet, size);
-       media_packet_get_buffer_data_ptr(*out_packet, &packet_data);
+       media_packet_set_buffer_size(packet, size);
+       media_packet_get_buffer_data_ptr(packet, &packet_data);
        memcpy(packet_data, data, size);
 
        return MC_ERROR_NONE;
 }
 
-int __mc_fill_venc_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, media_packet_h *out_packet)
+static int __mc_fill_venc_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer)
 {
-       void *packet_data = NULL;
+       gint ret = MC_ERROR_NONE;
        bool codec_config = FALSE;
        bool sync_flag = FALSE;
        bool slice = FALSE;
-       int ret = MC_ERROR_NONE;
+       gint mem_size = 0;
+       gchar *ext_mem = NULL;
+       gint data_size = 0;
+       void *packet_data = NULL;
+       media_packet_h packet = NULL;
 
        g_return_val_if_fail(core != NULL, MC_PARAM_ERROR);
 
-       switch (core->out_mime) {
+       switch (core->ports[out_port_index]->port_def.coding_type) {
        case MEDIA_FORMAT_H264_SP:
        case MEDIA_FORMAT_H264_MP:
        case MEDIA_FORMAT_H264_HP:
-               ret = _mc_check_h264_bytestream((unsigned char *)data, size, 1, &codec_config, &sync_flag, &slice);
+               data_size = _mc_check_h264_bytestream((unsigned char *)data, size, 1, &codec_config, &sync_flag, &slice);
+
+               if (data_size < 0) {
+                       LOGE("No valid SPS/PPS ...");
+                       return MC_INVALID_IN_BUF;
+               }
                break;
        case MEDIA_FORMAT_MPEG4_SP:
        case MEDIA_FORMAT_MPEG4_ASP:
@@ -510,14 +540,20 @@ int __mc_fill_venc_packet_with_output_buffer(mc_gst_core_t *core, void *data, in
        }
        LOGD("codec_config : %d, sync_flag : %d, slice : %d", codec_config, sync_flag, slice);
 
-       ret = media_packet_create_alloc(core->output_fmt, __mc_output_buffer_finalize_cb, core, out_packet);
+       mem_size = GST_ROUND_UP_4(size);
+       ext_mem = g_malloc0(mem_size);
+
+       ret = media_packet_create_from_external_memory(core->output_fmt, ext_mem, mem_size, __mc_output_buffer_finalize_cb, mcbuffer, &packet);
        if (ret != MEDIA_PACKET_ERROR_NONE) {
                LOGW("media_packet_create_alloc failed");
+               g_free(ext_mem);
                return MC_ERROR;
        }
+       mcbuffer->packet = packet;
+       mcbuffer->ext_mem = ext_mem;
 
-       media_packet_set_buffer_size(*out_packet, size);
-       media_packet_get_buffer_data_ptr(*out_packet, &packet_data);
+       media_packet_set_buffer_size(packet, size);
+       media_packet_get_buffer_data_ptr(packet, &packet_data);
        memcpy(packet_data, data, size);
 
        core->need_sync_flag = sync_flag ? 1 : 0;
@@ -526,6 +562,80 @@ int __mc_fill_venc_packet_with_output_buffer(mc_gst_core_t *core, void *data, in
        return ret;
 }
 
+static int __mc_fill_aenc_packet_with_output_buffer(mc_gst_core_t *core, void *data, int size, GstMCBuffer *mcbuffer)
+{
+       int ret = MC_ERROR_NONE;
+       gint mem_size = 0;
+       GstPad *pad;
+       GstCaps *peercaps;
+       GstMapInfo map;
+       guint8 *ptr;
+       gsize len;
+       gchar *ext_mem = NULL;
+       const GValue *codec_data = NULL;
+       void *packet_data = NULL;
+       media_packet_h packet = NULL;
+
+       g_return_val_if_fail(core != NULL, MC_PARAM_ERROR);
+
+       if (core->encoder && core->codec_id == MEDIACODEC_AAC)
+               media_format_set_audio_aac_type(core->output_fmt, FALSE);
+
+       mem_size = GST_ROUND_UP_4(size);
+       ext_mem = g_malloc0(mem_size);
+
+       ret = media_packet_create_from_external_memory(core->output_fmt, ext_mem, mem_size, __mc_output_buffer_finalize_cb, mcbuffer, &packet);
+       if (ret != MEDIA_PACKET_ERROR_NONE) {
+               LOGW("media_packet_create_alloc failed");
+               g_free(ext_mem);
+               return MC_ERROR;
+       }
+       mcbuffer->packet = packet;
+       mcbuffer->ext_mem = ext_mem;
+
+       media_packet_set_buffer_size(packet, size);
+       media_packet_get_buffer_data_ptr(packet, &packet_data);
+       memcpy(packet_data, data, size);
+
+       if (!core->codec_data) {
+               pad = gst_element_get_static_pad(core->fakesink, "sink");
+               peercaps = gst_pad_get_current_caps(pad);
+               if (peercaps) {
+                       GstStructure *s;
+                       if (gst_caps_is_empty(peercaps)) {
+                               gst_caps_unref(peercaps);
+                               gst_object_unref(pad);
+                               LOGW("Empty caps");
+                               return ret;
+                       }
+
+                       s = gst_caps_get_structure(peercaps, 0);
+                       codec_data = gst_structure_get_value(s, "codec_data");
+                       if (codec_data  == NULL && gst_structure_has_field(s, "streamheader"))
+                               codec_data = gst_structure_get_value(s, "streamheader");
+
+                       core->codec_data = GST_BUFFER(g_value_dup_boxed(codec_data));
+                       gst_caps_unref(peercaps);
+               }
+               gst_object_unref(pad);
+               LOGD("codec data set");
+       }
+
+       if (core->codec_data) {
+               gst_buffer_map(core->codec_data, &map, GST_MAP_READ);
+               ptr = map.data;
+               len = map.size;
+               ret = media_packet_set_codec_data(packet, ptr, len);
+               if (ret != MEDIA_PACKET_ERROR_NONE) {
+                       LOGW("media_packet_set_codec_data failed");
+                       gst_buffer_unmap(core->codec_data, &map);
+                       return MC_ERROR;
+               }
+               gst_buffer_unmap(core->codec_data, &map);
+       }
+
+       return ret;
+}
 
 static GstCaps *__mc_gst_caps_set_buffer_array(GstCaps * caps, const gchar * name, GstBuffer * buf, ...)
 {
@@ -563,14 +673,14 @@ static GstCaps *__mc_gst_caps_set_buffer_array(GstCaps * caps, const gchar * nam
 
 int __mc_set_caps_streamheader(mc_gst_core_t *core, GstMCBuffer *mcbuffer, guint streamheader_size)
 {
-       int ret = MEDIA_PACKET_ERROR_NONE;
-       void *buf_data = NULL;
+       gint ret = MEDIA_PACKET_ERROR_NONE;
        uint64_t buf_size = 0;
        GstBuffer *header1, *header2, *header3;
        guint hsize1, hsize2, hsize3;
        GstBuffer *tmp_header;
-       guint8 *tmp_buf = NULL;
        GstMapInfo map;
+       guint8 *buf_data = NULL;
+       guint8 *tmp_buf = NULL;
 
        ret = media_packet_get_buffer_size(mcbuffer->packet, &buf_size);
        if (ret != MEDIA_PACKET_ERROR_NONE) {
@@ -578,7 +688,7 @@ int __mc_set_caps_streamheader(mc_gst_core_t *core, GstMCBuffer *mcbuffer, guint
                return ret;
        }
 
-       ret = media_packet_get_buffer_data_ptr(mcbuffer->packet, &buf_data);
+       ret = media_packet_get_buffer_data_ptr(mcbuffer->packet, (void **)&buf_data);
        if (ret != MEDIA_PACKET_ERROR_NONE) {
                LOGW("buffer data get failed");
                return ret;
@@ -705,6 +815,31 @@ int __mc_set_caps_streamheader(mc_gst_core_t *core, GstMCBuffer *mcbuffer, guint
                __mc_gst_caps_set_buffer_array(core->caps, "streamheader", header1, header2, NULL);
                gst_buffer_unref(header1);
                gst_buffer_unref(header2);
+       } else if (core->codec_id == MEDIACODEC_OPUS) {
+               const GstTagList *tags;
+               GstTagList *empty_tags = NULL;
+               GstBuffer *header, *comments;
+               guint8 *decoding_channel_mapping = NULL;
+               mc_gst_port_def_t *port_def = &core->ports[in_port_index]->port_def;
+
+               header = gst_codec_utils_opus_create_header(port_def->info.audio.samplerate,
+                       port_def->info.audio.channel,
+                       0, /* channel mapping family */
+                       1, /* stream count */
+                       0, /* coupled count */
+                       decoding_channel_mapping,
+                       0, /* FIXME: look ahead configured value */
+                       0);
+               tags = gst_tag_setter_get_tag_list(GST_TAG_SETTER(core->codec));
+               if (!tags)
+                       tags = empty_tags = gst_tag_list_new_empty();
+               comments = gst_tag_list_to_vorbiscomment_buffer(tags, (const guint8 *) "OpusTags",
+                       8, "Encoded with GStreamer opusenc");
+               core->caps = gst_codec_utils_opus_create_caps_from_header(header, comments);
+               if (empty_tags)
+                       gst_tag_list_unref(empty_tags);
+               gst_buffer_unref(header);
+               gst_buffer_unref(comments);
        } else {
                LOGE("Not support case of Stream header Caps");
        }
@@ -720,21 +855,28 @@ int __mc_set_caps_streamheader(mc_gst_core_t *core, GstMCBuffer *mcbuffer, guint
 
 int __mc_set_caps_codecdata(mc_gst_core_t *core, GstMCBuffer *mcbuffer, guint fixed_size)
 {
-       int ret = MC_ERROR_NONE;
-       void *codec_data = NULL;
-       unsigned int codec_data_size = 0;
+       gint ret = MC_ERROR_NONE;
+       uint32_t codec_data_size = 0;
+       GstMapInfo map;
        GstBuffer *codecdata_buffer;
        guint8 *data = NULL;
-       GstMapInfo map;
+       void *codec_data = NULL;
 
        media_packet_get_codec_data(mcbuffer->packet, &codec_data, &codec_data_size);
 
        if (codec_data != NULL) {               /* get the codec data from media_packet_get_codec_data() */
                data = g_malloc0(codec_data_size);
+
                memcpy(data, codec_data, codec_data_size);
+
+               free(codec_data);
+               codec_data = NULL;
+
                codecdata_buffer = gst_buffer_new_wrapped(data, codec_data_size);
                gst_caps_set_simple(core->caps, "codec_data", GST_TYPE_BUFFER, codecdata_buffer, NULL);
+
                LOGD("set codec data : %" G_GSIZE_FORMAT "", gst_buffer_get_size(codecdata_buffer));
+
                gst_buffer_unref(codecdata_buffer);
        } else {                                        /* get the codec data from media_packet_get_buffer_data_ptr() */
                uint64_t buffer_size = 0;
@@ -750,15 +892,15 @@ int __mc_set_caps_codecdata(mc_gst_core_t *core, GstMCBuffer *mcbuffer, guint fi
                        gst_buffer_map(mcbuffer->buffer, &map, GST_MAP_READ);
                        memcpy(data, map.data, fixed_size);
                        codecdata_buffer = gst_buffer_new_wrapped(data, fixed_size);
-                       gst_buffer_unmap(mcbuffer->buffer, &map);
                        gst_caps_set_simple(core->caps, "codec_data", GST_TYPE_BUFFER, codecdata_buffer, NULL);
                        gst_buffer_unref(codecdata_buffer);
 
                        gst_buffer_replace_memory(mcbuffer->buffer, 0,
-                                       gst_memory_new_wrapped(GST_MEMORY_FLAG_READONLY, buff_data + fixed_size , buffer_size - fixed_size, 0,
-                                               buffer_size - fixed_size, mcbuffer, NULL));
+                                       gst_memory_new_wrapped(GST_MEMORY_FLAG_READONLY, map.data + fixed_size , buffer_size - fixed_size, 0,
+                                               buffer_size - fixed_size, mcbuffer, (GDestroyNotify)__mc_input_buffer_finalize_cb));
 
-                       LOGD("set codec data from packet: %" G_GSIZE_FORMAT "",  gst_buffer_get_size(mcbuffer->buffer));
+                       LOGD("after : set codec data from packet: %" G_GSIZE_FORMAT "",  gst_buffer_get_size(mcbuffer->buffer));
+                       gst_buffer_unmap(mcbuffer->buffer, &map);
                }
        }
        return ret;
@@ -770,47 +912,32 @@ int _mc_output_media_packet_new(mc_gst_core_t *core, bool video, bool encoder, m
                LOGE("media format create failed");
                return MC_ERROR;
        }
+       mc_gst_port_def_t *port_def = &core->ports[out_port_index]->port_def;
 
-       if (encoder) {
-               mc_encoder_info_t *info;
-
-               info = (mc_encoder_info_t *)core->codec_info;
+       if (video) {
+               media_format_set_video_mime(core->output_fmt, out_mime);
+               media_format_set_video_width(core->output_fmt, port_def->info.video.width);
+               media_format_set_video_height(core->output_fmt, port_def->info.video.height);
 
-               if (video) {
-                       media_format_set_video_mime(core->output_fmt, out_mime);
-                       media_format_set_video_width(core->output_fmt, info->width);
-                       media_format_set_video_height(core->output_fmt, info->height);
-                       media_format_set_video_avg_bps(core->output_fmt, info->bitrate);
-               } else {
-                       media_format_set_audio_mime(core->output_fmt, out_mime);
-                       media_format_set_audio_channel(core->output_fmt, info->channel);
-                       media_format_set_audio_samplerate(core->output_fmt, info->samplerate);
-                       media_format_set_audio_bit(core->output_fmt, info->bit);
-                       media_format_set_audio_avg_bps(core->output_fmt, info->bitrate);
-               }
+               if (encoder)
+                       media_format_set_video_avg_bps(core->output_fmt, port_def->info.video.bitrate);
        } else {
-               mc_decoder_info_t *info;
+               media_format_set_audio_mime(core->output_fmt, out_mime);
+               media_format_set_audio_channel(core->output_fmt, port_def->info.audio.channel);
+               media_format_set_audio_samplerate(core->output_fmt, port_def->info.audio.samplerate);
+               media_format_set_audio_bit(core->output_fmt, port_def->info.audio.bit_depth);
 
-               info = (mc_decoder_info_t *)core->codec_info;
-
-               if (video) {
-                       media_format_set_video_mime(core->output_fmt, out_mime);
-                       media_format_set_video_width(core->output_fmt, info->width);
-                       media_format_set_video_height(core->output_fmt, info->height);
-               } else {
-                       media_format_set_audio_mime(core->output_fmt, out_mime);
-                       media_format_set_audio_channel(core->output_fmt, info->channel);
-                       media_format_set_audio_samplerate(core->output_fmt, info->samplerate);
-                       media_format_set_audio_bit(core->output_fmt, info->bit);
-               }
+               if (encoder)
+                       media_format_set_audio_avg_bps(core->output_fmt, port_def->info.audio.bitrate);
        }
+
        return MC_ERROR_NONE;
 }
 
 /*
  * mc_gst_core functions
  */
-mc_gst_core_t *mc_gst_core_new()
+static mc_gst_core_t *mc_gst_core_new()
 {
        mc_gst_core_t *core;
 
@@ -819,7 +946,8 @@ mc_gst_core_t *mc_gst_core_new()
        core = g_new0(mc_gst_core_t, 1);
 
        /* 0 : input, 1 : output */
-       core->ports[0] = NULL;
+       core->ports[0] = mc_gst_port_new(core);
+       core->ports[0]->index = 0;
        core->ports[1] = mc_gst_port_new(core);
        core->ports[1]->index = 1;
 
@@ -833,6 +961,7 @@ mc_gst_core_t *mc_gst_core_new()
        g_mutex_init(&core->prepare_lock);
        g_mutex_init(&core->drain_lock);
 
+       core->need_drain = false;
        core->need_feed = false;
        core->eos = false;
        core->need_codec_data = false;
@@ -840,13 +969,12 @@ mc_gst_core_t *mc_gst_core_new()
        core->unprepare_flag = false;
        core->prepare_count = 0;
        core->etb_count = 0;
-       core->ftb_count = 0;
-
-       g_atomic_int_set(&core->available_queue->running, 1);
-       core->available_queue->thread = g_thread_new("feed thread", &feed_task, core);
+       core->codec_data = NULL;
+       core->allocator = gst_tizen_allocator_new();
 
        core->bufmgr = NULL;
        core->drm_fd = -1;
+
        LOGD("gst_core(%p) is created", core);
 
        MEDIACODEC_FLEAVE();
@@ -854,19 +982,10 @@ mc_gst_core_t *mc_gst_core_new()
        return core;
 }
 
-void mc_gst_core_free(mc_gst_core_t *core)
+static void mc_gst_core_free(mc_gst_core_t *core)
 {
        MEDIACODEC_FENTER();
 
-       mc_aqueue_t *async_queue;
-
-       async_queue = core->available_queue;
-
-       mc_async_queue_disable(async_queue->input);
-
-       g_atomic_int_set(&async_queue->running, 0);
-       g_thread_join(async_queue->thread);
-
        g_mutex_clear(&core->eos_mutex);
        g_mutex_clear(&core->prepare_lock);
        g_mutex_clear(&core->drain_lock);
@@ -874,8 +993,22 @@ void mc_gst_core_free(mc_gst_core_t *core)
        g_cond_clear(&core->buffer_cond);
        g_cond_clear(&core->out_buffer_cond);
 
-       mc_async_queue_free(async_queue->input);
-       g_free(async_queue);
+       mc_async_queue_free(core->available_queue->input);
+       g_free(core->available_queue);
+       core->available_queue = NULL;
+
+       if (core->allocator) {
+               gst_object_unref(core->allocator);
+               core->allocator = NULL;
+       }
+
+       if (core->codec_data)
+               gst_buffer_unref(core->codec_data);
+
+       if (core->ports[0] != NULL) {
+               mc_gst_port_free(core->ports[0]);
+               core->ports[0] = NULL;
+       }
 
        if (core->ports[1] != NULL) {
                mc_gst_port_free(core->ports[1]);
@@ -891,7 +1024,7 @@ void mc_gst_core_free(mc_gst_core_t *core)
 /*
  * mc_gst_port functions
  */
-mc_gst_port_t *mc_gst_port_new(mc_gst_core_t *core)
+static mc_gst_port_t *mc_gst_port_new(mc_gst_core_t *core)
 {
        MEDIACODEC_FENTER();
 
@@ -902,7 +1035,6 @@ mc_gst_port_t *mc_gst_port_new(mc_gst_core_t *core)
        port->num_buffers = -1;
        port->buffer_size = 0;
        port->is_allocated = 0;
-       port->buffers = NULL;
 
        g_mutex_init(&port->mutex);
        port->queue = g_queue_new();
@@ -913,7 +1045,7 @@ mc_gst_port_t *mc_gst_port_new(mc_gst_core_t *core)
        return port;
 }
 
-void mc_gst_port_free(mc_gst_port_t *port)
+static void mc_gst_port_free(mc_gst_port_t *port)
 {
        MEDIACODEC_FENTER();
 
@@ -928,66 +1060,179 @@ void mc_gst_port_free(mc_gst_port_t *port)
        return;
 }
 
-gboolean _mc_update_packet_info(mc_gst_core_t *core, media_format_h fmt)
+gboolean _mc_update_packet_info(mc_gst_core_t *core, media_format_h format)
 {
-       gboolean is_updated = FALSE;
+       int ret = MEDIA_FORMAT_ERROR_NONE;
+       gint bitrate = 0;
+       gboolean is_format_change = FALSE;
 
-       mc_decoder_info_t *codec_info = (mc_decoder_info_t *)core->codec_info;
+       mc_gst_port_def_t *input_port_def = &core->ports[in_port_index]->port_def;
 
        if (core->video) {
-               int width = 0;
-               int height = 0;
-               int bitrate = 0;
-
-               media_format_get_video_info(fmt, NULL, &width, &height, &bitrate, NULL);
-
-               if ((codec_info->width != width) || (codec_info->height != height)) {
-                       LOGD("Resolution changed : %dx%d -> %dx%d", codec_info->width, codec_info->height, width, height);
-                       codec_info->width = width;
-                       codec_info->height = height;
-                       is_updated = TRUE;
+               gint width = 0;
+               gint height = 0;
+               gint framerate = 0;
+               gchar *sformat = NULL;
+               media_format_mimetype_e mimetype = 0;
+
+               ret = media_format_get_video_info(format, &mimetype, &width, &height, &bitrate, NULL);
+               ret |= media_format_get_video_frame_rate(format, &framerate);
+               if (ret != MEDIA_FORMAT_ERROR_NONE) {
+                       LOGE("get video info/frame_rate failed[0x%x]", ret);
+                       return FALSE;
+               }
+
+               is_format_change |= input_port_def->info.video.width != width;
+               is_format_change |= input_port_def->info.video.height != height;
+               is_format_change |= ((input_port_def->info.video.framerate != framerate) && (framerate != 0));
+               if (is_format_change) {
+                       LOGD("Format changed : resolution %dx%d -> %dx%d, framerate %d -> %d",
+                               input_port_def->info.video.width, input_port_def->info.video.height, width, height,
+                               input_port_def->info.video.framerate, framerate);
+                       input_port_def->info.video.width = width;
+                       input_port_def->info.video.height = height;
                }
 
                if (core->encoder) {
-                       mc_encoder_info_t *enc_info = (mc_encoder_info_t *)core->codec_info;
-
-                       if (bitrate != 0 && enc_info->bitrate != bitrate * 1000) {
-                               LOGD("Bitrate changed : %d -> %d", enc_info->bitrate, bitrate);
-                               enc_info->bitrate = bitrate * 1000;
-                               is_updated = TRUE;
+                       bitrate *= 1000;
+                       sformat = __mc_get_gst_input_format(mimetype, core->is_hw);
+                       is_format_change |= ((input_port_def->info.video.bitrate != bitrate) && (bitrate != 0));
+                       is_format_change |= g_strcmp0(input_port_def->info.video.format, sformat);
+                       if (is_format_change) {
+                               if (bitrate != 0) {
+                                       LOGD("Bitrate changed : %d -> %d", input_port_def->info.video.bitrate, bitrate);
+                                       input_port_def->info.video.bitrate = bitrate;
+                               }
+                               LOGD("Format changed : %s -> %s", input_port_def->info.video.format, sformat);
+                               input_port_def->info.video.format = g_strdup(sformat);
                        }
                }
        } else {
-               int channel;
-               int samplerate;
-               int bit;
-               int bitrate;
+               gint channel;
+               gint samplerate;
+               gint bit;
 
-               media_format_get_audio_info(fmt, NULL, &channel, &samplerate, &bit, &bitrate);
+               ret = media_format_get_audio_info(format, NULL, &channel, &samplerate, &bit, &bitrate);
+               if (ret != MEDIA_FORMAT_ERROR_NONE) {
+                       LOGE("get audio info failed[0x%x]", ret);
+                       return FALSE;
+               }
 
-               if ((codec_info->channel != channel) || (codec_info->samplerate != samplerate) || (codec_info->bit != bit)) {
-                       LOGD("Audio info. changed : %d -> %d, %d -> %d, %d -> %d", codec_info->channel, channel, codec_info->samplerate, samplerate, codec_info->bit, bit);
-                       codec_info->channel = channel;
-                       codec_info->samplerate = samplerate;
-                       codec_info->bit = bit;
-                       is_updated = TRUE;
+               is_format_change |= input_port_def->info.audio.channel != channel;
+               is_format_change |= input_port_def->info.audio.samplerate != samplerate;
+               is_format_change |= input_port_def->info.audio.bit_depth != bit;
+               if (is_format_change) {
+                       LOGD("Audio info. changed : %d -> %d, %d -> %d, %d -> %d",
+                               input_port_def->info.audio.channel, channel,
+                               input_port_def->info.audio.samplerate, samplerate,
+                               input_port_def->info.audio.bit_depth, bit);
+                       input_port_def->info.audio.channel = channel;
+                       input_port_def->info.audio.samplerate = samplerate;
+                       input_port_def->info.audio.bit_depth = bit;
                }
 
                if (core->encoder) {
-                       mc_encoder_info_t *enc_info = (mc_encoder_info_t *)core->codec_info;
-
-                       if (bitrate != 0 && enc_info->bitrate != bitrate * 1000) {
-                               LOGD("Bitrate changed : %d -> %d", enc_info->bitrate, bitrate);
-                               enc_info->bitrate = bitrate * 1000;
-                               is_updated = TRUE;
+                       bitrate *= 1000;
+                       is_format_change |= ((input_port_def->info.audio.bitrate != bitrate) && (bitrate != 0));
+                       if (is_format_change) {
+                               LOGD("Bitrate changed : %d -> %d", input_port_def->info.audio.bitrate, bitrate);
+                               input_port_def->info.audio.bitrate = bitrate;
                        }
                }
        }
 
-       return is_updated;
+       return is_format_change;
+}
+
+static gboolean _mc_gst_video_info_check_and_new(mc_gst_core_t *core, GstMCBuffer *mcbuffer)
+{
+       int i = 0;
+       gchar *caps_str = NULL;
+       tbm_surface_h surface = NULL;
+       tbm_surface_info_s sinfo = {0, };
+
+       if (!core || !mcbuffer) {
+               LOGE("NULL core[%p] or mcbuffer[%p]", core, mcbuffer);
+               return FALSE;
+       }
+
+       if (!core->video_info) {
+               caps_str = gst_caps_to_string(core->caps);
+
+               LOGI("caps[%s] to video info", caps_str);
+
+               g_free(caps_str);
+
+               core->video_info = gst_video_info_new_from_caps(core->caps);
+               if (!core->video_info) {
+                       LOGE("video info failed");
+                       return FALSE;
+               }
+
+               if (media_packet_get_tbm_surface(mcbuffer->packet, &surface) != MEDIA_PACKET_ERROR_NONE) {
+                       LOGE("get surface failed");
+                       return FALSE;
+               }
+
+               if (tbm_surface_get_info(surface, &sinfo) != TBM_SURFACE_ERROR_NONE) {
+                       LOGE("get surface info failed");
+                       return FALSE;
+               }
+
+               for (i = 0 ; i < sinfo.num_planes ; i++) {
+                       GST_VIDEO_INFO_PLANE_OFFSET(core->video_info, i) = sinfo.planes[i].offset;
+                       GST_VIDEO_INFO_PLANE_STRIDE(core->video_info, i) = sinfo.planes[i].stride;
+
+                       LOGI("[%d] offset[%zu], stride[%d]", i,
+                               GST_VIDEO_INFO_PLANE_OFFSET(core->video_info, i),
+                               GST_VIDEO_INFO_PLANE_STRIDE(core->video_info, i));
+               }
+
+               LOGI("new video info[%p]", core->video_info);
+       }
+
+       return TRUE;
+}
+
+static void _mc_gst_video_info_free(mc_gst_core_t *core)
+{
+       if (!core)
+               return;
+
+       if (core->video_info) {
+               LOGI("free video info[%p]", core->video_info);
+               gst_video_info_free(core->video_info);
+               core->video_info = NULL;
+       }
+}
+
+static void _mc_gst_video_meta_add(mc_gst_core_t *core, GstBuffer *buffer)
+{
+       GstVideoMeta *vmeta = NULL;
+
+       if (!core || !core->video_info || !buffer)
+               return;
+
+       vmeta = gst_buffer_add_video_meta_full(buffer, GST_VIDEO_FRAME_FLAG_NONE,
+               GST_VIDEO_INFO_FORMAT(core->video_info),
+               GST_VIDEO_INFO_WIDTH(core->video_info),
+               GST_VIDEO_INFO_HEIGHT(core->video_info),
+               GST_VIDEO_INFO_N_PLANES(core->video_info),
+               core->video_info->offset,
+               core->video_info->stride);
+
+       if (!vmeta) {
+               LOGE("No video meta");
+               return;
+       }
+
+       if (core->is_hw) {
+               vmeta->map = gst_tizen_video_meta_map;
+               vmeta->unmap = gst_tizen_video_meta_unmap;
+       }
 }
 
-static int _mc_gst_update_caps(mc_gst_core_t *core, GstMCBuffer *mcbuffer, bool codec_config)
+static int _mc_set_codec_data(mc_gst_core_t *core, GstMCBuffer *mcbuffer, bool codec_config)
 {
        MEDIACODEC_FENTER();
 
@@ -996,125 +1241,91 @@ static int _mc_gst_update_caps(mc_gst_core_t *core, GstMCBuffer *mcbuffer, bool
 
        int ret = MC_ERROR_NONE;
 
-       if (core->video) {
-               if (core->encoder) {
-                       mc_encoder_info_t *enc_info = (mc_encoder_info_t *)core->codec_info;
-
-                       core->format = __mc_get_gst_input_format(mcbuffer->packet, core->is_hw);
-                       gst_caps_set_simple(core->caps,
-                                       "format", G_TYPE_STRING, core->format,
-                                       "width", G_TYPE_INT, enc_info->width,
-                                       "height", G_TYPE_INT, enc_info->height,
-                                       "framerate", GST_TYPE_FRACTION, enc_info->fps, 1,
-                                       NULL);
-
-                       if (g_object_class_find_property(G_OBJECT_GET_CLASS(core->codec), "bitrate"))
-                               g_object_set(GST_OBJECT(core->codec), "bitrate", enc_info->bitrate, NULL);
-                       else
-                               g_object_set(GST_OBJECT(core->codec), "target-bitrate", enc_info->bitrate, NULL);
-                       LOGD("set bitrate = %d.", enc_info->bitrate);
-               } else {
-                       mc_decoder_info_t *dec_info = (mc_decoder_info_t *)core->codec_info;
-
-                       gst_caps_set_simple(core->caps,
-                                       "width", G_TYPE_INT, dec_info->width,
-                                       "height", G_TYPE_INT, dec_info->height,
-                                       NULL);
-
-                       ret = __mc_set_caps_codecdata(core, mcbuffer, CODECDATA_NOT_USE);
-                       if (ret != MC_ERROR_NONE) {
+       switch (core->codec_id) {
+       case MEDIACODEC_AAC:
+       case MEDIACODEC_AAC_HE:
+       case MEDIACODEC_AAC_HE_PS:
+               if (codec_config) {
+                       ret = __mc_set_caps_codecdata(core, mcbuffer, AAC_CODECDATA_SIZE);
+                       if (ret != MC_ERROR_NONE)
                                LOGW("__mc_set_caps_codecdata failed");
-                       }
                }
-       } else {
-               if (core->encoder) {
-                       mc_encoder_info_t *enc_info = (mc_encoder_info_t *)core->codec_info;
-
-                       gst_caps_set_simple(core->caps,
-                                       "rate", G_TYPE_INT, enc_info->samplerate,
-                                       "channels", G_TYPE_INT, enc_info->channel,
-                                       NULL);
-                       g_object_set(GST_OBJECT(core->codec), "bitrate", enc_info->bitrate, NULL);
-               } else {
-                       mc_decoder_info_t *dec_info = (mc_decoder_info_t *)core->codec_info;
-
-                       gst_caps_set_simple(core->caps,
-                                       "rate", G_TYPE_INT, dec_info->samplerate,
-                                       "channels", G_TYPE_INT, dec_info->channel,
-                                       NULL);
-
-                       if (codec_config) {
-                               switch (core->codec_id) {
-                               case MEDIACODEC_AAC:
-                               case MEDIACODEC_AAC_HE:
-                               case MEDIACODEC_AAC_HE_PS:
-                                       ret = __mc_set_caps_codecdata(core, mcbuffer, AAC_CODECDATA_SIZE);
-                                       if (ret != MC_ERROR_NONE) {
-                                               LOGW("__mc_set_caps_codecdata failed");
-                                       }
-                                       break;
-                               case MEDIACODEC_WMAV1:
-                               case MEDIACODEC_WMAV2:
-                               case MEDIACODEC_WMAPRO:
-                               case MEDIACODEC_WMALSL:
-                                       ret = __mc_set_caps_codecdata(core, mcbuffer, WMA_CODECDATA_SIZE);
-                                       if (ret != MC_ERROR_NONE) {
-                                               LOGW("__mc_set_caps_codecdata failed");
-                                       }
-                                       break;
-                               case MEDIACODEC_VORBIS:
-                               case MEDIACODEC_FLAC:
-                                       ret = __mc_set_caps_streamheader(core, mcbuffer, VORBIS_CODECDATA_SIZE);
-                                       if (ret != MC_ERROR_NONE) {
-                                               LOGW("__mc_set_caps_streamheader failed");
-                                       }
-                                       break;
-                               default:
-                                       LOGD("doesn't need to set codecdata");
-                                       break;
-
-                               }
-                       }
+               break;
+       case MEDIACODEC_WMAV1:
+       case MEDIACODEC_WMAV2:
+       case MEDIACODEC_WMAPRO:
+       case MEDIACODEC_WMALSL:
+               if (codec_config) {
+                       ret = __mc_set_caps_codecdata(core, mcbuffer, WMA_CODECDATA_SIZE);
+                       if (ret != MC_ERROR_NONE)
+                               LOGW("__mc_set_caps_codecdata failed");
+               }
+               break;
+       case MEDIACODEC_VORBIS:
+       case MEDIACODEC_FLAC:
+       case MEDIACODEC_OPUS:
+               if (codec_config) {
+                       ret = __mc_set_caps_streamheader(core, mcbuffer, VORBIS_CODECDATA_SIZE);
+                       if (ret != MC_ERROR_NONE)
+                               LOGW("__mc_set_caps_streamheader failed");
                }
+               break;
+       case MEDIACODEC_H264:
+       case MEDIACODEC_MPEG4:
+               ret = __mc_set_caps_codecdata(core, mcbuffer, CODECDATA_NOT_USE);
+               if (ret != MC_ERROR_NONE)
+                       LOGW("__mc_set_caps_codecdata failed");
+               break;
+       default:
+               LOGD("doesn't need to set codecdata");
+               break;
        }
-       g_object_set(core->appsrc, "caps", core->caps, NULL);
 
        MEDIACODEC_FLEAVE();
        return ret;
+
+
 }
 
 static gpointer feed_task(gpointer data)
 {
-       mc_gst_core_t *core = (mc_gst_core_t *)data;
-       int ret = MC_ERROR_NONE;
+       gint ret = MC_ERROR_NONE;
        bool codec_config = FALSE;
        bool eos = FALSE;
-       media_format_h fmt = NULL;
-       media_packet_h in_buf = NULL;
+       bool initiative = TRUE;
+       bool is_format_change = FALSE;
+       media_format_h format = NULL;
+       media_packet_h input_buffer = NULL;
        GstMCBuffer *mcbuffer = NULL;
-       bool initiative = true;
 
        MEDIACODEC_FENTER();
 
+       mc_gst_core_t *core = (mc_gst_core_t *)data;
+
        while (g_atomic_int_get(&core->available_queue->running)) {
                LOGD("waiting for next input....");
-               in_buf = _mc_get_input_buffer(core);
-               if (!in_buf)
+               input_buffer = _mc_get_input_buffer(core);
+               if (!input_buffer)
                        goto LEAVE;
 
-               media_packet_get_format(in_buf,  &fmt);
-               if (fmt) {
-                       if (_mc_update_packet_info(core, fmt))
-                               initiative = TRUE;
-                       media_format_unref(fmt);
+               media_packet_get_format(input_buffer,  &format);
+               if (format) {
+                       if (_mc_update_packet_info(core, format)) {
+                               is_format_change = TRUE;
+                               if (!core->mc_caps_new(core, core->codec_id, in_port_index)) {
+                                       LOGE("caps new failed");
+                                       goto ERROR;
+                               }
+                       }
+                       media_format_unref(format);
                }
 
-               if (media_packet_is_codec_config(in_buf, &codec_config) != MEDIA_PACKET_ERROR_NONE) {
+               if (media_packet_is_codec_config(input_buffer, &codec_config) != MEDIA_PACKET_ERROR_NONE) {
                        LOGE("media_packet_is_codec_config failed");
                        goto ERROR;
                }
 
-               if (media_packet_is_end_of_stream(in_buf, &eos) != MEDIA_PACKET_ERROR_NONE) {
+               if (media_packet_is_end_of_stream(input_buffer, &eos) != MEDIA_PACKET_ERROR_NONE) {
                        LOGE("media_packet_is_end_of_stream failed");
                        goto ERROR;
                }
@@ -1126,41 +1337,56 @@ static gpointer feed_task(gpointer data)
                        LOGD("end of stream");
                        gst_app_src_end_of_stream(GST_APP_SRC(core->appsrc));
                        _mc_wait_for_eos(core);
-                       initiative = true;
+                       initiative = TRUE;
 
-                       _mc_gst_handle_input_buffer_used(core, in_buf);
+                       _mc_gst_handle_input_buffer_used(core, input_buffer);
                        goto LEAVE;
                }
 
-               mcbuffer = _mc_gst_media_packet_to_gstbuffer(core, in_buf, codec_config);
+               mcbuffer = _mc_gst_media_packet_to_gstbuffer(core, input_buffer, codec_config);
                if (!mcbuffer) {
                        LOGW("gstbuffer can't make");
                        goto ERROR;
                }
-               /* mcbuffer took the ownership of the in_buf, so set in_buf to NULL to aviod double unref */
-               in_buf = NULL;
-
-               if (codec_config)
-                       initiative = TRUE;
-
-               if (initiative) {
-                       GstPad *pad;
-
-                       ret = _mc_gst_update_caps(core, mcbuffer, codec_config);
-                       if (ret != MC_ERROR_NONE) {
-                               LOGE("failed to update caps");
-                               /* unref mcbuff->buffer will invoke the finalize() of GstMcBuffer */
-                               gst_buffer_unref(mcbuffer->buffer);
-                               goto ERROR;
+               /* mcbuffer took the ownership of the input_buffer, so set input_buffer to NULL to aviod double unref */
+               input_buffer = NULL;
+
+               if (codec_config || initiative) {
+                       GstPad *pad = NULL;
+                       if (!core->encoder) {
+                               ret = _mc_set_codec_data(core, mcbuffer, codec_config);
+                               if (ret != MC_ERROR_NONE) {
+                                       LOGE("failed to set codec data");
+                                       gst_buffer_unref(mcbuffer->buffer);
+                                       goto ERROR;
+                               }
                        }
-
                        pad = gst_element_get_static_pad(core->appsrc, "src");
                        gst_pad_push_event(pad, gst_event_new_stream_start("start"));
                        gst_object_unref(pad);
+                       is_format_change = TRUE;
+                       initiative = FALSE;
+                       core->offset = GST_BUFFER_OFFSET_NONE;
+               }
+
+               if (is_format_change) {
+                       g_object_set(core->appsrc, "caps", core->caps, NULL);
+
+                       if (core->encoder) {
+                               int bitrate = core->video ? \
+                                       core->ports[in_port_index]->port_def.info.video.bitrate : \
+                                       core->ports[in_port_index]->port_def.info.audio.bitrate;
 
-                       LOGD("caps updated");
+                               g_object_set(core->codec, core->codec_type->property->bitrate_name, bitrate, NULL);
+
+                               LOGI("bitrate[property:%s,v:%d] %d updated",
+                                       core->codec_type->property->bitrate_name, core->video, bitrate);
+                       }
+
+                       is_format_change = FALSE;
                }
 
+
                /* inject buffer */
                ret = _mc_gst_gstbuffer_to_appsrc(core, mcbuffer);
                if (ret != GST_FLOW_OK) {
@@ -1168,12 +1394,10 @@ static gpointer feed_task(gpointer data)
                        goto ERROR;
                }
 
-               initiative = false;
-
                continue;
 ERROR:
-               if (in_buf)
-                       _mc_gst_handle_input_buffer_used(core, in_buf);
+               if (input_buffer)
+                       _mc_gst_handle_input_buffer_used(core, input_buffer);
 
                _mc_gst_set_flush_input(core);
 
@@ -1184,13 +1408,13 @@ ERROR:
 
                continue;
 LEAVE:
-               /*LOGE("status : in_buf : %p, codec_config : %d, eos : %d, encoder : %d in feed_task", in_buf, codec_config, eos, core->encoder);*/
+               /*LOGE("status : input_buffer : %p, codec_config : %d, eos : %d, encoder : %d in feed_task", input_buffer, codec_config, eos, core->encoder);*/
                continue;
 
        }
 
-       LOGI("status : in_buf : %p, codec_config : %d, eos : %d, video : %d, encoder : %d in feed_task",
-                       in_buf, codec_config, eos, core->video, core->encoder);
+       LOGI("status : input_buffer : %p, codec_config : %d, eos : %d, video : %d, encoder : %d in feed_task",
+                       input_buffer, codec_config, eos, core->video, core->encoder);
        LOGD("feed task finished %p v(%d)e(%d)", core, core->video, core->encoder);
 
        MEDIACODEC_FLEAVE();
@@ -1198,6 +1422,28 @@ LEAVE:
        return NULL;
 }
 
+static void _mc_gst_feed_task_new(mc_gst_core_t *core)
+{
+       g_return_if_fail(core && core->available_queue);
+
+       g_atomic_int_set(&core->available_queue->running, 1);
+       core->available_queue->thread = g_thread_new("feed thread", &feed_task, core);
+
+       LOGI("new thread for feed[%p]", core->available_queue->thread);
+}
+
+static void _mc_gst_feed_task_free(mc_gst_core_t *core)
+{
+       g_return_if_fail(core && core->available_queue);
+
+       mc_async_queue_disable(core->available_queue->input);
+
+       g_atomic_int_set(&core->available_queue->running, 0);
+       g_thread_join(core->available_queue->thread);
+
+       LOGI("feed thread[%p] is released", core->available_queue->thread);
+}
+
 static void __mc_gst_stop_feed(GstElement *pipeline, gpointer data)
 {
        mc_gst_core_t *core = (mc_gst_core_t *)data;
@@ -1221,128 +1467,109 @@ static void __mc_gst_start_feed(GstElement *pipeline, guint size, gpointer data)
        }
 }
 
-static int _mc_link_vtable(mc_gst_core_t *core, mediacodec_codec_type_e id, gboolean encoder, gboolean is_hw)
+static gboolean _mc_gst_aud_caps_new(mc_gst_core_t *core, mediacodec_codec_type_e codec_id, gint index)
 {
-       MEDIACODEC_FENTER();
+       gchar *caps_string = NULL;
+       g_autoptr(GstCaps) caps = NULL;
+       mc_gst_port_def_t *port_def = &core->ports[index]->port_def;
 
-       g_return_val_if_fail(core != NULL, MC_PARAM_ERROR);
+       caps = gst_caps_new_simple(core->mime,
+               "rate", G_TYPE_INT, port_def->info.audio.samplerate,
+               "channels", G_TYPE_INT, port_def->info.audio.channel, NULL);
 
-       switch (id) {
+       switch (codec_id) {
        case MEDIACODEC_AAC:
-               /* if set to 'CODEC_CONFIG', then It is also available case of  MEDIA_FORMAT_AAC_LC (RAW) */
-               LOGD("aac lc (adts) vtable");
-               if (encoder) {
-                       core->vtable = aenc_aac_vtable;
-                       core->caps = gst_caps_new_simple(core->mime,
-                                       "format", G_TYPE_STRING, "F32LE",
-                                       "layout", G_TYPE_STRING, "interleaved", NULL);
+               if (core->encoder) {
+                       gst_caps_set_simple(caps,
+                               "format", G_TYPE_STRING, _mc_bit_to_string(port_def->info.audio.bit_depth),
+                               "layout", G_TYPE_STRING, "interleaved", NULL);
                        g_object_set(GST_OBJECT(core->codec), "compliance", -2, NULL);
                } else {
+                       gst_caps_set_simple(caps,
+                               "framed", G_TYPE_BOOLEAN, TRUE,
+                               "mpegversion", G_TYPE_INT, 4,
+                               "stream-format", G_TYPE_STRING, "adts",
+                               NULL);
                        LOGD("CAPS for codec_id (MEDIACODEC_AAC_LC - normal ADTS)");
-
-                       core->vtable = adec_aac_vtable;
-                       core->caps = gst_caps_new_simple(core->mime,
-                                       "framed", G_TYPE_BOOLEAN, TRUE,
-                                       "mpegversion", G_TYPE_INT, 4,
-                                       "stream-format", G_TYPE_STRING, "adts",
-                                       NULL);
                }
                break;
        case MEDIACODEC_AAC_HE:
        case MEDIACODEC_AAC_HE_PS:
-               LOGD("aac he v12 vtable");
-               if (encoder) {
+               if (core->encoder) {
                        LOGD("[MC_NOT_SUPPORTED] he-aac-v12 encoder is not supported yet!!!");
-                       return MC_NOT_SUPPORTED;
+                       return FALSE;
                } else {
-                       LOGD("CAPS for codec_id (MEDIACODEC_AAC_HE and _PS - MP4/M4A case)");
-                       core->vtable = adec_aacv12_vtable;
-                       core->caps = gst_caps_new_simple(core->mime,
-                                       "mpegversion", G_TYPE_INT, 4,     /*TODO : need adding version /profile*/
-                                       "framed", G_TYPE_BOOLEAN, TRUE,
-                                       "stream-format", G_TYPE_STRING, "raw",
-                                       NULL);
+                       gst_caps_set_simple(caps,
+                               "mpegversion", G_TYPE_INT, 4,
+                               "framed", G_TYPE_BOOLEAN, TRUE,
+                               "stream-format", G_TYPE_STRING, "raw",
+                               NULL);
+                       LOGD("CAPS for codec_id (MEDIACODEC_AAC_HE)");
                }
                break;
        case MEDIACODEC_MP3:
-               LOGD("mp3 vtable - Only support decoder");
-               if (encoder) {
+               if (core->encoder) {
                        LOGD("[MC_NOT_SUPPORTED] mp3 encoder is not supported yet!!!");
-                       return MC_NOT_SUPPORTED;
+                       return FALSE;
                } else {
-                       core->vtable = adec_mp3_vtable;
-                       core->caps = gst_caps_new_simple(core->mime,
-                                       "framed", G_TYPE_BOOLEAN, TRUE,
-                                       "mpegversion", G_TYPE_INT, 1,       /* To-Do : plz check */
-                                       "mpegaudioversion", G_TYPE_INT, 1,  /* To-Do : plz check */
-                                       "layer", G_TYPE_INT, 3,             /* To-Do : plz check */
-                                       NULL);
+                       gst_caps_set_simple(caps,
+                               "framed", G_TYPE_BOOLEAN, TRUE,
+                               "mpegversion", G_TYPE_INT, 1,       /* To-Do : plz check */
+                               "mpegaudioversion", G_TYPE_INT, 1,  /* To-Do : plz check */
+                               "layer", G_TYPE_INT, 3,             /* To-Do : plz check */
+                               NULL);
+                       LOGD("CAPS for codec_id (MEDIACODEC_MP3)");
                }
                break;
        case MEDIACODEC_AMR_NB:
-               LOGD("amrnb vtable");
-               if (encoder) {
-                       core->vtable = aenc_amrnb_vtable;
-                       core->caps = gst_caps_new_simple(core->mime,
-                                       "format", G_TYPE_STRING, "S16LE",
-                                       "layout", G_TYPE_STRING, "interleaved",
-                                       NULL);
-
+               if (core->encoder) {
+                       gst_caps_set_simple(caps,
+                               "format", G_TYPE_STRING, _mc_bit_to_string(port_def->info.audio.bit_depth),
+                               "layout", G_TYPE_STRING, "interleaved",
+                               NULL);
+                       LOGD("CAPS for codec_id (MEDIACODEC_AMR_NB)");
                } else {
-                       core->vtable = adec_amrnb_vtable;
-                       core->caps = gst_caps_new_simple(core->mime,
-                                       "rate", G_TYPE_INT, 8000,
-                                       NULL);
+                       gst_caps_set_simple(caps,
+                               "rate", G_TYPE_INT, 8000,
+                               NULL);
                }
                break;
        case MEDIACODEC_AMR_WB:
-               LOGD("amrwb vtable - Only support decoder");
-               if (encoder) {
+               if (core->encoder) {
                        LOGD("[MC_NOT_SUPPORTED] amr-wb encoder is not supported yet!!!");
-                       return MC_NOT_SUPPORTED;
+                       return FALSE;
                } else {
-                       core->vtable = adec_amrwb_vtable;
-                       core->caps = gst_caps_new_simple(core->mime,
-                                       "rate", G_TYPE_INT, 16000,
-                                       NULL);
+                       gst_caps_set_simple(caps,
+                               "rate", G_TYPE_INT, 16000,
+                               NULL);
                }
                break;
        case MEDIACODEC_VORBIS:
-               LOGD("vorbis vtable");
-               if (encoder) {
+               if (core->encoder) {
                        LOGD("[MC_NOT_SUPPORTED] vorbis encoder is not supported yet!!!");
-                       return MC_NOT_SUPPORTED;
+                       return FALSE;
                } else {
-                       core->vtable = adec_vorbis_vtable;
-                       core->caps = gst_caps_new_empty_simple("audio/x-vorbis");
                }
                break;
        case MEDIACODEC_FLAC:
-               LOGD("flac vtable");
-               if (encoder) {
+               if (core->encoder) {
                        LOGD("[MC_NOT_SUPPORTED] flac encoder is not supported yet!!!");
-                       return MC_NOT_SUPPORTED;
+                       return FALSE;
                } else {
-                       core->vtable = adec_flac_vtable;
-                       core->caps = gst_caps_new_simple(core->mime,
-                                       "framed", G_TYPE_BOOLEAN, TRUE,
-                                       /* FIXME - Insert More Info */
-                                       NULL);
+                       gst_caps_set_simple(caps,
+                               "framed", G_TYPE_BOOLEAN, TRUE,
+                               /* FIXME - Insert More Info */
+                               NULL);
                }
                break;
        case MEDIACODEC_WMAV1:
        case MEDIACODEC_WMAV2:
        case MEDIACODEC_WMAPRO:
        case MEDIACODEC_WMALSL:
-               LOGD("wma(V1 / V2 / LSL / PRO) vtable");
-               if (encoder) {
+               if (core->encoder) {
                        LOGD("[MC_NOT_SUPPORTED] wma encoder is not supported yet!!!");
-                       return MC_NOT_SUPPORTED;
+                       return FALSE;
                } else {
-                       mc_decoder_info_t *dec_info = (mc_decoder_info_t *)core->codec_info;
-
-                       core->vtable = adec_wma_vtable;
-
                        /*
                         * Need to extract from Stream Type Specific ... or
                         * Need to get Demuxer's Caps from Stream Type Specific
@@ -1369,100 +1596,242 @@ static int _mc_link_vtable(mc_gst_core_t *core, mediacodec_codec_type_e id, gboo
                                LOGE("Not support WMA format");
                        }
 
-                       core->caps = gst_caps_new_simple(core->mime,
-                                       "bitrate", G_TYPE_INT, bitrate,
-                                       "depth", G_TYPE_INT, dec_info->bit,
-                                       /* FIXME - Need More Info */
-                                       "wmaversion", G_TYPE_INT, wma_version,
-                                       "format_tag", G_TYPE_INT, format_tag,
-                                       "block_align", G_TYPE_INT, block_align,
-                                       NULL);
+                       gst_caps_set_simple(caps,
+                               "bitrate", G_TYPE_INT, bitrate,
+                               "depth", G_TYPE_INT, port_def->info.audio.bit_depth,
+                               /* FIXME - Need More Info */
+                               "wmaversion", G_TYPE_INT, wma_version,
+                               "format_tag", G_TYPE_INT, format_tag,
+                               "block_align", G_TYPE_INT, block_align,
+                               NULL);
+               }
+               break;
+       case MEDIACODEC_OPUS:
+               if (core->encoder) {
+                       gst_caps_set_simple(caps,
+                               "format", G_TYPE_STRING, _mc_bit_to_string(port_def->info.audio.bit_depth),
+                               "layout", G_TYPE_STRING, "interleaved", NULL);
+               } else {
+                       LOGD("[MC_NOT_SUPPORTED] opus decoder is not supported yet!!!");
+                       return FALSE;
+               }
+               break;
+       default:
+               break;
+       }
+
+       caps_string = gst_caps_to_string(caps);
+       if (caps_string) {
+               LOGI("new caps[%p:%s]", caps, caps_string);
+               g_free(caps_string);
+       }
+
+       if (core->caps)
+               gst_caps_unref(core->caps);
+
+       _mc_gst_video_info_free(core);
+
+       core->caps = g_steal_pointer(&caps);
+
+       return TRUE;
+}
+
+static gboolean _mc_gst_vid_caps_new(mc_gst_core_t *core, mediacodec_codec_type_e codec_id, gint index)
+{
+       gchar *caps_string = NULL;
+       GstCaps *caps = NULL;
+       mc_gst_port_def_t *port_def = &core->ports[index]->port_def;
+
+       caps = gst_caps_new_simple(core->mime,
+               "width", G_TYPE_INT, port_def->info.video.width,
+               "height", G_TYPE_INT, port_def->info.video.height,
+               "framerate", GST_TYPE_FRACTION, port_def->info.video.framerate, 1,
+               NULL);
+
+       switch (codec_id) {
+       case MEDIACODEC_H263:
+               if (core->encoder) {
+                       gst_caps_set_simple(caps,
+                               "format", G_TYPE_STRING, port_def->info.video.format,
+                               NULL);
+               } else {
+                       gst_caps_set_simple(caps,
+                               "mpegversion", G_TYPE_INT, 4,
+                               "framerate", GST_TYPE_FRACTION, 30, 1,
+                               NULL);
+               }
+               break;
+       case MEDIACODEC_MPEG4:
+               if (core->encoder) {
+                       gst_caps_set_simple(caps,
+                               "format", G_TYPE_STRING, port_def->info.video.format,
+                               NULL);
+               } else {
+                       gst_caps_set_simple(caps,
+                               "mpegversion", G_TYPE_INT, 4,
+                               "systemstream", G_TYPE_BOOLEAN, false,
+                               "parsed", G_TYPE_BOOLEAN, TRUE,
+                               "framerate", GST_TYPE_FRACTION, 30, 1,
+                               NULL);
+               }
+               break;
+       case MEDIACODEC_H264:
+               if (core->encoder) {
+                       gst_caps_set_simple(caps,
+                               "format", G_TYPE_STRING, port_def->info.video.format,
+                               NULL);
+                       g_object_set(GST_OBJECT(core->codec), "byte-stream", TRUE, NULL);
+                       LOGE("format : %s", port_def->info.video.format);
+               } else {
+                       gst_caps_set_simple(caps,
+                               "parsed", G_TYPE_BOOLEAN, TRUE,  /* FIXME different from sw */
+                               "alignment", G_TYPE_STRING, "au",
+                               "stream-format", G_TYPE_STRING, "byte-stream",
+                               "framerate", GST_TYPE_FRACTION, 30, 1,
+                               NULL);
+               }
+               break;
+       default:
+               break;
+       }
+
+       caps_string = gst_caps_to_string(caps);
+       if (caps_string) {
+               LOGI("new caps[%p:%s]", caps, caps_string);
+               g_free(caps_string);
+       }
+
+       if (core->caps)
+               gst_caps_unref(core->caps);
+       _mc_gst_video_info_free(core);
+
+       core->caps = caps;
+
+       return TRUE;
+}
+
+static int _mc_link_vtable(mc_gst_core_t *core, mediacodec_codec_type_e id, gboolean encoder, gboolean is_hw)
+{
+       MEDIACODEC_FENTER();
+
+       g_return_val_if_fail(core != NULL, MC_PARAM_ERROR);
+
+       switch (id) {
+       case MEDIACODEC_AAC:
+               if (encoder)
+                       core->vtable = aenc_aac_vtable;
+               else
+                       core->vtable = adec_aac_vtable;
+               break;
+       case MEDIACODEC_AAC_HE:
+       case MEDIACODEC_AAC_HE_PS:
+               if (encoder) {
+                       LOGD("[MC_NOT_SUPPORTED] he-aac-v12 encoder is not supported yet!!!");
+                       return MC_NOT_SUPPORTED;
+               } else {
+                       core->vtable = adec_aacv12_vtable;
+               }
+               break;
+       case MEDIACODEC_MP3:
+               if (encoder) {
+                       LOGD("[MC_NOT_SUPPORTED] mp3 encoder is not supported yet!!!");
+                       return MC_NOT_SUPPORTED;
+               } else {
+                       core->vtable = adec_mp3_vtable;
+               }
+               break;
+       case MEDIACODEC_AMR_NB:
+               LOGD("amrnb vtable");
+               if (encoder)
+                       core->vtable = aenc_amrnb_vtable;
+               else
+                       core->vtable = adec_amrnb_vtable;
+               break;
+       case MEDIACODEC_AMR_WB:
+               LOGD("amrwb vtable - Only support decoder");
+               if (encoder) {
+                       LOGD("[MC_NOT_SUPPORTED] amr-wb encoder is not supported yet!!!");
+                       return MC_NOT_SUPPORTED;
+               } else {
+                       core->vtable = adec_amrwb_vtable;
+               }
+               break;
+       case MEDIACODEC_VORBIS:
+               LOGD("vorbis vtable");
+               if (encoder)
+                       return MC_NOT_SUPPORTED;
+               else
+                       core->vtable = adec_vorbis_vtable;
+               break;
+       case MEDIACODEC_FLAC:
+               LOGD("flac vtable");
+               if (encoder) {
+                       LOGD("[MC_NOT_SUPPORTED] flac encoder is not supported yet!!!");
+                       return MC_NOT_SUPPORTED;
+               } else {
+                       core->vtable = adec_flac_vtable;
+               }
+               break;
+       case MEDIACODEC_OPUS:
+               LOGD("opus vtable");
+               if (encoder)
+                       core->vtable = aenc_opus_vtable;
+               else
+                       core->vtable = adec_vtable;
+               break;
+       case MEDIACODEC_WMAV1:
+       case MEDIACODEC_WMAV2:
+       case MEDIACODEC_WMAPRO:
+       case MEDIACODEC_WMALSL:
+               LOGD("wma(V1 / V2 / LSL / PRO) vtable");
+               if (encoder) {
+                       LOGD("[MC_NOT_SUPPORTED] wma encoder is not supported yet!!!");
+                       return MC_NOT_SUPPORTED;
+               } else {
+                       core->vtable = adec_wma_vtable;
                }
                break;
        case MEDIACODEC_H263:
                LOGD("h263 vtable");
                if (encoder) {
                        core->vtable = is_hw ? venc_h263_hw_vtable : venc_h263_sw_vtable;
-                       core->caps = gst_caps_new_empty_simple("video/x-raw");
                } else {
-                       if (is_hw) {
+                       if (is_hw)
                                core->vtable = vdec_h263_hw_vtable;
-                               core->caps = gst_caps_new_simple(core->mime,
-                                               "mpegversion", G_TYPE_INT, 4,
-                                               "framerate", GST_TYPE_FRACTION, 30, 1,
-                                               NULL);
-                       } else {
+                       else
                                core->vtable = vdec_h263_sw_vtable;
-                               core->caps = gst_caps_new_simple(core->mime,
-                                               "variant", G_TYPE_STRING, "itu",
-                                               "framerate", GST_TYPE_FRACTION, 30, 1,
-                                               NULL);
-                       }
                }
                break;
        case MEDIACODEC_MPEG4:
                LOGD("mpeg4 vtable");
-               if (encoder) {
+               if (encoder)
                        core->vtable = is_hw ? venc_mpeg4_hw_vtable : venc_mpeg4_sw_vtable;
-                       core->caps = gst_caps_new_empty_simple("video/x-raw");
-               } else {
+               else
                        core->vtable = is_hw ? vdec_mpeg4_hw_vtable : vdec_mpeg4_sw_vtable;
-                       core->caps = gst_caps_new_simple(core->mime,
-                                       "mpegversion", G_TYPE_INT, 4,
-                                       "systemstream", G_TYPE_BOOLEAN, false,
-                                       "parsed", G_TYPE_BOOLEAN, TRUE,
-                                       "framerate", GST_TYPE_FRACTION, 30, 1,
-                                       NULL);
-               }
                break;
        case MEDIACODEC_H264:
                LOGD("h264 vtable");
                if (encoder) {
                        core->vtable = is_hw ? venc_h264_hw_vtable : venc_vtable;
-                       core->caps = gst_caps_new_empty_simple("video/x-raw");
-#ifdef TIZEN_PROFILE_LITE
-                       g_object_set(GST_OBJECT(core->codec), "byte-stream", TRUE, NULL);
-#endif
                } else {
-                       if (is_hw) {
+                       if (is_hw)
                                core->vtable = vdec_h264_hw_vtable;
-                               core->caps = gst_caps_new_simple(core->mime,
-                                               "parsed", G_TYPE_BOOLEAN, TRUE,
-                                               "alignment", G_TYPE_STRING, "au",
-                                               "stream-format", G_TYPE_STRING, "byte-stream",
-                                               "framerate", GST_TYPE_FRACTION, 30, 1,
-                                               NULL);
-                       } else {
+                       else
                                core->vtable = vdec_h264_sw_vtable;
-                               core->caps = gst_caps_new_simple(core->mime,
-                                               "alignment", G_TYPE_STRING, "au",
-                                               "stream-format", G_TYPE_STRING, "byte-stream",
-                                               "framerate", GST_TYPE_FRACTION, 30, 1,
-                                               NULL);
-                       }
                }
                break;
        default:
                break;
        }
-               /* set caps */
-               g_object_set(core->appsrc, "caps", core->caps, NULL);
+
+       MEDIACODEC_FLEAVE();
 
        return MC_ERROR_NONE;
 }
 
-static int _mc_gst_gstbuffer_to_appsrc(mc_gst_core_t *core, GstMCBuffer *mcbuffer)
+static gint _mc_gst_gstbuffer_to_appsrc(mc_gst_core_t *core, GstMCBuffer *mcbuffer)
 {
-       MEDIACODEC_FENTER();
-
-       int ret = MC_ERROR_NONE;
-
-       LOGD("pushed buffer to appsrc : %p, buffer of size %" G_GSIZE_FORMAT "",
-                       mcbuffer->buffer, gst_buffer_get_size(mcbuffer->buffer));
-
-       ret = gst_app_src_push_buffer(GST_APP_SRC(core->appsrc), mcbuffer->buffer);
-
-       return ret;
+       return gst_app_src_push_buffer(GST_APP_SRC(core->appsrc), mcbuffer->buffer);
 }
 
 media_packet_h _mc_get_input_buffer(mc_gst_core_t *core)
@@ -1473,23 +1842,22 @@ media_packet_h _mc_get_input_buffer(mc_gst_core_t *core)
 
 mc_ret_e mc_gst_prepare(mc_handle_t *mc_handle)
 {
-       MEDIACODEC_FENTER();
-
        int ret = MC_ERROR_NONE;
-       media_format_mimetype_e out_mime;
        int num_supported_codec = 0;
        int i = 0;
-
-       if (!mc_handle)
-               return MC_PARAM_ERROR;
-
-       mediacodec_codec_type_e id;
        bool video;
        bool encoder;
        bool hardware;
        gchar *factory_name = NULL;
+       media_format_mimetype_e out_mime;
+       mediacodec_codec_type_e id;
        mc_codec_map_t *codec_map;
 
+       MEDIACODEC_FENTER();
+
+       if (!mc_handle)
+               return MC_PARAM_ERROR;
+
        id = mc_handle->codec_id;
        video = mc_handle->is_video;
        encoder = mc_handle->is_encoder;
@@ -1516,9 +1884,13 @@ mc_ret_e mc_gst_prepare(mc_handle_t *mc_handle)
        new_core->eos = false;
        new_core->encoder = encoder;
        new_core->video = video;
-       new_core->codec_info = encoder ? (void *)&mc_handle->info.encoder : (void *)&mc_handle->info.decoder;
-       new_core->out_mime = codec_map[i].type.out_format;
+       memcpy(&new_core->ports[in_port_index]->port_def.info, &mc_handle->info, sizeof(mc_handle->info));
+       memcpy(&new_core->ports[out_port_index]->port_def.info, &mc_handle->info, sizeof(mc_handle->info));
+       new_core->ports[out_port_index]->port_def.coding_type = out_mime;
        new_core->codec_id = id;
+       new_core->codec_type = &codec_map[i].type;
+       new_core->mc_caps_new = video ? &_mc_gst_vid_caps_new : &_mc_gst_aud_caps_new;
+       new_core->extra_converter = &mc_handle->extra_converter;
 
        new_core->bufmgr = tbm_bufmgr_init(new_core->drm_fd);
        if (new_core->bufmgr == NULL) {
@@ -1530,7 +1902,8 @@ mc_ret_e mc_gst_prepare(mc_handle_t *mc_handle)
        LOGD("factory name : %s, output_fmt : %x", factory_name, out_mime);
 
        /* create media_packet for output fmt */
-       if ((ret = _mc_output_media_packet_new(new_core, video, encoder, out_mime)) != MC_ERROR_NONE) {
+       ret = _mc_output_media_packet_new(new_core, video, encoder, out_mime);
+       if (ret != MC_ERROR_NONE) {
                LOGE("Failed to create output pakcet");
                return ret;
        }
@@ -1544,21 +1917,41 @@ mc_ret_e mc_gst_prepare(mc_handle_t *mc_handle)
                }
        }
 
-       mc_handle->core = new_core;
-
        /* create basic core elements */
-       if ((ret = _mc_gst_create_pipeline(mc_handle->core, factory_name) != MC_ERROR_NONE)) {
+       ret = _mc_gst_create_pipeline(new_core, factory_name);
+       if (ret != MC_ERROR_NONE) {
                LOGE("failed to create pipeline");
                return ret;
        }
 
        /* link vtable */
-       if ((ret = _mc_link_vtable(mc_handle->core, id, encoder, hardware)) != MC_ERROR_NONE) {
+       ret = _mc_link_vtable(new_core, id, encoder, hardware);
+       if (ret != MC_ERROR_NONE) {
                LOGE("vtable link failed");
                return ret;
        }
 
+       /* set caps in capsfilter as default*/
+       if (!new_core->mc_caps_new(new_core, id, out_port_index)) {
+               LOGE("caps new failed");
+               return MC_INTERNAL_ERROR;
+       }
+
+       /* FIXME will parse input format from ini. format is needed when linking elements*/
+       if (new_core->video && new_core->encoder) {
+               gst_caps_set_simple(new_core->caps,
+                       "format", G_TYPE_STRING, (new_core->is_hw ? "SN12" : "I420"),
+                       NULL);
+       }
+
+       g_object_set(new_core->capsfilter, "caps", new_core->caps, NULL);
+
+       _mc_gst_feed_task_new(new_core);
+
+       mc_handle->core = new_core;
        LOGD("initialized... %d", ret);
+       MEDIACODEC_FLEAVE();
+
        return ret;
 }
 
@@ -1585,8 +1978,12 @@ mc_ret_e mc_gst_unprepare(mc_handle_t *mc_handle)
                if (core->eos)
                        _mc_send_eos_signal(core);
 
+               _mc_gst_feed_task_free(core);
+
                _mc_gst_set_flush_input(core);
 
+               _mc_gst_video_info_free(core);
+
                ret = _mc_gst_destroy_pipeline(core);
 
                /* unset callback */
@@ -1617,16 +2014,17 @@ mc_ret_e mc_gst_unprepare(mc_handle_t *mc_handle)
                }
        }
 
+       MEDIACODEC_FLEAVE();
+
        return ret;
 }
 
-mc_ret_e mc_gst_process_input(mc_handle_t *mc_handle, media_packet_h inbuf, uint64_t timeOutUs)
+mc_ret_e mc_gst_process_input(mc_handle_t *mc_handle, media_packet_h inbuf, uint64_t timeout_us)
 {
        MEDIACODEC_FENTER();
 
        int ret = MC_ERROR_NONE;
        mc_gst_core_t *core = NULL;
-       gint64 end_time;
 
        if (!mc_handle)
                return MC_PARAM_ERROR;
@@ -1635,14 +2033,10 @@ mc_ret_e mc_gst_process_input(mc_handle_t *mc_handle, media_packet_h inbuf, uint
 
        g_mutex_lock(&core->drain_lock);
 
-       while (g_atomic_int_get(&core->etb_count) > MAXINUM_QNUM) {
-               end_time = g_get_monotonic_time() + timeOutUs;
+       while (g_atomic_int_get(&core->etb_count) == MAXINUM_QNUM) {
                LOGD("Waiting until packets are drained..");
-
-               if (!g_cond_wait_until(&core->buffer_cond, &core->drain_lock, end_time)) {
-                       LOGD("time out...");
-                       break;
-               }
+               core->need_drain = true;
+               g_cond_wait(&core->buffer_cond, &core->drain_lock);
        }
        g_mutex_unlock(&core->drain_lock);
 
@@ -1669,17 +2063,16 @@ mc_ret_e mc_gst_process_input(mc_handle_t *mc_handle, media_packet_h inbuf, uint
        return ret;
 }
 
-mc_ret_e mc_gst_get_output(mc_handle_t *mc_handle, media_packet_h *outbuf, uint64_t timeOutUs)
+mc_ret_e mc_gst_get_output(mc_handle_t *mc_handle, media_packet_h *outbuf, uint64_t timeout_us)
 {
-       MEDIACODEC_FENTER();
-
-       int ret = MC_ERROR_NONE;
-       mc_gst_core_t *core = NULL;
-       media_packet_h out_packet = NULL;
+       gint ret = MC_ERROR_NONE;
        gint64 end_time = -1;
        gboolean signalled;
+       mc_gst_core_t *core = NULL;
+       media_packet_h out_packet = NULL;
 
-       end_time = g_get_monotonic_time() + timeOutUs;
+       MEDIACODEC_FENTER();
+       end_time = g_get_monotonic_time() + timeout_us;
 
        if (!mc_handle)
                return MC_PARAM_ERROR;
@@ -1714,11 +2107,11 @@ mc_ret_e mc_gst_get_output(mc_handle_t *mc_handle, media_packet_h *outbuf, uint6
 
 mc_ret_e mc_gst_flush_buffers(mc_handle_t *mc_handle)
 {
-       MEDIACODEC_FENTER();
-
-       int ret = MC_ERROR_NONE;
+       gint ret = MC_ERROR_NONE;
        mc_gst_core_t *core = NULL;
 
+       MEDIACODEC_FENTER();
+
        if (!mc_handle)
                return MC_PARAM_ERROR;
 
@@ -1736,14 +2129,14 @@ static gboolean __mc_gst_init_gstreamer()
 {
        MEDIACODEC_FENTER();
 
+       gint i = 0;
+       gint arg_count = 0;
        static gboolean initialized = FALSE;
        static const int max_argc = 50;
        gint *argc = NULL;
        gchar **argv = NULL;
        gchar **argv2 = NULL;
        GError *err = NULL;
-       int i = 0;
-       int arg_count = 0;
 
        if (initialized) {
                LOGD("gstreamer already initialized.\n");
@@ -1781,65 +2174,157 @@ static gboolean __mc_gst_init_gstreamer()
        LOGD("argc : %d\n", *argc);
        arg_count = *argc;
 
-       for (i = 0; i < arg_count; i++) {
-               argv2[i] = argv[i];
-               LOGD("argv[%d] : %s\n", i, argv2[i]);
+       for (i = 0; i < arg_count; i++) {
+               argv2[i] = argv[i];
+               LOGD("argv[%d] : %s\n", i, argv2[i]);
+       }
+
+       /* initializing gstreamer */
+       if (!gst_init_check(argc, &argv, &err)) {
+               LOGE("Could not initialize GStreamer: %s\n", err ? err->message : "unknown error occurred");
+               if (err)
+                       g_error_free(err);
+
+               goto ERROR;
+       }
+
+       /* release */
+       for (i = 0; i < arg_count; i++)
+               MC_FREEIF(argv2[i]);
+
+       MC_FREEIF(argv);
+       MC_FREEIF(argv2);
+       MC_FREEIF(argc);
+
+       /* done */
+       initialized = TRUE;
+
+       MEDIACODEC_FLEAVE();
+       return TRUE;
+
+ERROR:
+       /* release */
+       for (i = 0; i < arg_count; i++) {
+               LOGD("free[%d] : %s\n", i, argv2[i]);
+               MC_FREEIF(argv2[i]);
+       }
+
+       MC_FREEIF(argv);
+       MC_FREEIF(argv2);
+       MC_FREEIF(argc);
+
+       return FALSE;
+}
+
+static GstElement *__mc_gst_extra_converter_new(mc_extra_converter_t *extra_converter)
+{
+       GstElement *element = NULL;
+       gint array[MEDIACODEC_CROP_ARRAY_LENGTH] = {0, };
+
+       if (!extra_converter) {
+               LOGE("NULL extra converter");
+               return NULL;
+       }
+
+       LOGI("extra converter[%s]", extra_converter->name);
+
+       element = gst_element_factory_make(extra_converter->name, NULL);
+       if (!element) {
+               LOGE("create element[%s] failed", extra_converter->name);
+               return NULL;
+       }
+
+       array[0] = extra_converter->crop_x;
+       array[1] = extra_converter->crop_y;
+       array[2] = extra_converter->crop_w;
+       array[3] = extra_converter->crop_h;
+
+       if (mc_gst_set_property_array_int(element,
+               "crop", array, MEDIACODEC_CROP_ARRAY_LENGTH) != MC_ERROR_NONE) {
+               gst_object_unref(element);
+               return NULL;
+       }
+
+       LOGI("set crop to extra converter[%d,%d,%dx%d]",
+               array[0], array[1], array[2], array[3] );
+
+       return element;
+}
+
+
+#ifdef TIZEN_FEATURE_ENABLE_DUMP_SOURCE
+static GstPadProbeReturn __dump_probe(GstPad *pad, GstPadProbeInfo *info, gpointer u_data)
+{
+       static int count = 0;
+       int i = 0;
+       const gchar *dump_path = (const gchar *)u_data;
+       GstBuffer *buffer = GST_PAD_PROBE_INFO_BUFFER(info);
+       GstMemory *memory = NULL;
+       FILE *fp = NULL;
+       tbm_surface_h surface = NULL;
+       tbm_surface_info_s sinfo = {0, };
+
+       if (!dump_path) {
+               LOGW("NULL path");
+               return GST_PAD_PROBE_OK;
        }
 
-       /* initializing gstreamer */
-       if (!gst_init_check(argc, &argv, &err)) {
-               LOGE("Could not initialize GStreamer: %s\n", err ? err->message : "unknown error occurred");
-               if (err)
-                       g_error_free(err);
-
-               goto ERROR;
+       if (count++ > 10) {
+               LOGW("[%s] SKIP DUMP", dump_path);
+               return GST_PAD_PROBE_OK;
        }
 
-       /* release */
-       for (i = 0; i < arg_count; i++)
-               MC_FREEIF(argv2[i]);
+       memory = gst_buffer_peek_memory(buffer, 0);
 
-       MC_FREEIF(argv);
-       MC_FREEIF(argv2);
-       MC_FREEIF(argc);
+       if (!gst_is_tizen_memory(memory)) {
+               LOGW("Not tizen memory");
+               return GST_PAD_PROBE_OK;
+       }
 
-       /* done */
-       initialized = TRUE;
+       surface = gst_tizen_memory_get_surface(memory);
+       if (!surface) {
+               LOGW("No surface");
+               return GST_PAD_PROBE_OK;
+       }
 
-       MEDIACODEC_FLEAVE();
-       return TRUE;
+       fp = fopen(dump_path, "a");
+       if (!fp) {
+               LOGW("file open failed[%s]", dump_path);
+               return GST_PAD_PROBE_OK;
+       }
 
-ERROR:
+       tbm_surface_get_info(surface, &sinfo);
 
-       /* release */
-       for (i = 0; i < arg_count; i++) {
-               LOGD("free[%d] : %s\n", i, argv2[i]);
-               MC_FREEIF(argv2[i]);
+       for (i = 0 ; i < sinfo.num_planes ; i++) {
+               LOGI("[dump:%s] write plane[%d] size[%u]", dump_path, i, sinfo.planes[i].size);
+               fwrite(sinfo.planes[i].ptr, 1, sinfo.planes[i].size, fp);
        }
 
-       MC_FREEIF(argv);
-       MC_FREEIF(argv2);
-       MC_FREEIF(argc);
+       fclose(fp);
 
-       return FALSE;
+       return GST_PAD_PROBE_OK;
 }
+#endif /* TIZEN_FEATURE_ENABLE_DUMP_SOURCE */
+
 
-mc_ret_e _mc_gst_create_pipeline(mc_gst_core_t *core, gchar *factory_name)
+mc_ret_e _mc_gst_create_pipeline(mc_gst_core_t *core, const gchar *factory_name)
 {
+       int i = 0;
+       int bitrate = 0;
        GstBus *bus = NULL;
 
        MEDIACODEC_FENTER();
 
        g_mutex_lock(&core->prepare_lock);
-       if (core->prepare_count == 0) {
 
+       if (core->prepare_count == 0) {
                if (!__mc_gst_init_gstreamer()) {
                        LOGE("gstreamer initialize fail");
                        g_mutex_unlock(&core->prepare_lock);
                        return MC_NOT_INITIALIZED;
                }
-               core->codec = gst_element_factory_make(factory_name, NULL);
 
+               core->codec = gst_element_factory_make(factory_name, NULL);
                if (!core->codec) {
                        LOGE("codec element create fail");
                        goto ERROR;
@@ -1850,46 +2335,113 @@ mc_ret_e _mc_gst_create_pipeline(mc_gst_core_t *core, gchar *factory_name)
 
                /* create common elements */
                core->pipeline = gst_pipeline_new(NULL);
-
                if (!core->pipeline) {
                        LOGE("pipeline create fail");
                        goto ERROR;
                }
 
                core->appsrc = gst_element_factory_make("appsrc", NULL);
-
                if (!core->appsrc) {
                        LOGE("appsrc can't create");
                        goto ERROR;
                }
 
-               core->capsfilter = gst_element_factory_make("capsfilter", NULL);
+               if (!core->video && core->encoder) {
+                       core->audioconvert = gst_element_factory_make("audioconvert", NULL);
+                       if (!core->audioconvert) {
+                               LOGE("audioconvert can't create");
+                               goto ERROR;
+                       }
+
+                       core->audioresample = gst_element_factory_make("audioresample", NULL);
+                       if (!core->audioresample) {
+                               LOGE("audioresample can't create");
+                               goto ERROR;
+                       }
+               }
+
+               if (core->video && core->encoder && core->extra_converter->enable) {
+                       core->videoconvert = __mc_gst_extra_converter_new(core->extra_converter);
+                       if (!core->videoconvert) {
+                               LOGE("create[%s] failed", core->extra_converter->name);
+                               goto ERROR;
+                       }
+               }
 
+               core->capsfilter = gst_element_factory_make("capsfilter", NULL);
                if (!core->capsfilter) {
                        LOGE("capsfilter can't create");
                        goto ERROR;
                }
 
                core->fakesink = gst_element_factory_make("fakesink", NULL);
-
                if (!core->fakesink) {
                        LOGE("fakesink create fail");
                        goto ERROR;
                }
+
                g_object_set(core->fakesink, "enable-last-sample", FALSE, NULL);
 
                /*__mc_link_elements(core);*/
-               gst_bin_add_many(GST_BIN(core->pipeline), core->appsrc, core->capsfilter, core->codec, core->fakesink, NULL);
+               if (!core->video && core->encoder) {
+                       gst_bin_add_many(GST_BIN(core->pipeline), core->appsrc, core->audioresample, core->audioconvert, core->capsfilter, core->codec, core->fakesink, NULL);
 
-               /* link elements */
-               if (!(gst_element_link_many(core->appsrc, core->capsfilter, core->codec, core->fakesink, NULL))) {
-                       LOGE("gst_element_link_many is failed");
-                       goto ERROR;
+                       /* link elements */
+                       if (!(gst_element_link_many(core->appsrc, core->audioresample, core->audioconvert, core->capsfilter, core->codec, core->fakesink, NULL))) {
+                               LOGE("gst_element_link_many is failed");
+                               goto ERROR;
+                       }
+               } else if (core->video && core->encoder) {
+                       if (core->extra_converter->enable) {
+                               gst_bin_add_many(GST_BIN(core->pipeline), core->appsrc, core->capsfilter, core->videoconvert, core->codec, core->fakesink, NULL);
+
+                               /* link elements */
+                               if (!(gst_element_link_many(core->appsrc, core->videoconvert, core->codec, core->fakesink, NULL))) {
+                                       LOGE("gst_element_link_many is failed");
+                                       goto ERROR;
+                               }
+                       } else {
+                               gst_bin_add_many(GST_BIN(core->pipeline), core->appsrc, core->capsfilter, core->codec, core->fakesink, NULL);
+
+                               /* link elements */
+                               if (!(gst_element_link_many(core->appsrc, core->codec, core->fakesink, NULL))) {
+                                       LOGE("gst_element_link_many is failed");
+                                       goto ERROR;
+                               }
+                       }
+               } else {
+                       gst_bin_add_many(GST_BIN(core->pipeline), core->appsrc, core->capsfilter, core->codec, core->fakesink, NULL);
+
+                       /* link elements */
+                       if (!(gst_element_link_many(core->appsrc, core->capsfilter, core->codec, core->fakesink, NULL))) {
+                               LOGE("gst_element_link_many is failed");
+                               goto ERROR;
+                       }
+               }
+
+#ifdef TIZEN_FEATURE_ENABLE_DUMP_SOURCE
+               {
+                       GstPad *pad = NULL;
+
+                       pad = gst_element_get_static_pad(core->videoconvert, "sink");
+                       if (pad) {
+                               gst_pad_add_probe(pad, GST_PAD_PROBE_TYPE_BUFFER, __dump_probe, "/tmp/input.dump", NULL);
+                               gst_object_unref(pad);
+                               pad = NULL;
+                       }
+
+                       pad = gst_element_get_static_pad(core->videoconvert, "src");
+                       if (pad) {
+                               gst_pad_add_probe(pad, GST_PAD_PROBE_TYPE_BUFFER, __dump_probe, "/tmp/output.dump", NULL);
+                               gst_object_unref(pad);
+                               pad = NULL;
+                       }
                }
+#endif /* TIZEN_FEATURE_ENABLE_DUMP_SOURCE */
 
                /* connect signals, bus watcher */
                bus = gst_pipeline_get_bus(GST_PIPELINE(core->pipeline));
-               core->bus_whatch_id = gst_bus_add_watch(bus, __mc_gst_bus_callback, core);
+               core->bus_watch_id = gst_bus_add_watch(bus, __mc_gst_bus_callback, core);
                core->thread_default = g_main_context_get_thread_default();
 
                /* set sync handler to get tag synchronously */
@@ -1904,11 +2456,35 @@ mc_ret_e _mc_gst_create_pipeline(mc_gst_core_t *core, gchar *factory_name)
                g_object_set(GST_OBJECT(core->fakesink), "signal-handoffs", TRUE, NULL);
                core->signal_handoff = g_signal_connect(core->fakesink, "handoff", G_CALLBACK(__mc_gst_buffer_add), core);
 
-               /* set state PLAYING */
-               MEDIACODEC_ELEMENT_SET_STATE(GST_ELEMENT_CAST(core->pipeline), GST_STATE_PLAYING);
+               /* set bitrate and properties */
+               if (core->encoder) {
+                       if (core->video)
+                               bitrate = core->ports[in_port_index]->port_def.info.video.bitrate;
+                       else
+                               bitrate = core->ports[in_port_index]->port_def.info.audio.bitrate;
+
+                       LOGI("set encoder bitrate[property:%s,v:%d] %d",
+                               core->codec_type->property->bitrate_name, core->video, bitrate);
 
+                       g_object_set(core->codec,
+                               core->codec_type->property->bitrate_name, bitrate,
+                               NULL);
+               }
+
+               for (i = 0 ; i < core->codec_type->property->ext_num ; i++) {
+                       LOGI("set property [%s] -> [%s]",
+                               core->codec_type->property->ext_name[i],
+                               core->codec_type->property->ext_value[i]);
+
+                       gst_util_set_object_arg((GObject *)core->codec,
+                               core->codec_type->property->ext_name[i],
+                               core->codec_type->property->ext_value[i]);
+               }
 
+               /* set state PLAYING */
+               MEDIACODEC_ELEMENT_SET_STATE(GST_ELEMENT_CAST(core->pipeline), GST_STATE_PLAYING);
        }
+
        core->prepare_count++;
        g_mutex_unlock(&core->prepare_lock);
 
@@ -1931,6 +2507,18 @@ ERROR:
        if (core->capsfilter)
                gst_object_unref(GST_OBJECT(core->capsfilter));
 
+       if (core->audioresample)
+               gst_object_unref(GST_OBJECT(core->audioresample));
+
+       if (core->videoscale)
+               gst_object_unref(GST_OBJECT(core->videoscale));
+
+       if (core->videoconvert)
+               gst_object_unref(GST_OBJECT(core->videoconvert));
+
+       if (core->audioconvert)
+               gst_object_unref(GST_OBJECT(core->audioconvert));
+
        if (core->fakesink)
                gst_object_unref(GST_OBJECT(core->fakesink));
 
@@ -1958,16 +2546,17 @@ mc_ret_e _mc_gst_destroy_pipeline(mc_gst_core_t *core)
                                }
                        }
 
-                       if (core->bus_whatch_id) {
+                       if (core->bus_watch_id) {
                                GSource *source = NULL;
-                               source = g_main_context_find_source_by_id(core->thread_default, core->bus_whatch_id);
+                               source = g_main_context_find_source_by_id(core->thread_default, core->bus_watch_id);
                                g_source_destroy(source);
-                               LOGD("bus_whatch_id destroy");
+                               LOGD("bus_watch_id destroy");
                        }
 
                        MEDIACODEC_ELEMENT_SET_STATE(core->pipeline, GST_STATE_NULL);
 
                        gst_object_unref(GST_OBJECT(core->pipeline));
+
                        if (core->caps) {
                                gst_caps_unref(core->caps);
                                core->caps = NULL;
@@ -1992,38 +2581,32 @@ STATE_CHANGE_FAILED:
        return MC_ERROR;
 }
 
-void __mc_push_output_to_queue(mc_gst_core_t *core, media_packet_h out_packet)
+void __mc_push_output_to_queue(mc_gst_core_t *core, GstMCBuffer *mcbuffer)
 {
        g_mutex_lock(&core->ports[1]->mutex);
 
        /* push it to output buffer queue */
-       g_queue_push_tail(core->ports[1]->queue, out_packet);
+       g_queue_push_tail(core->ports[1]->queue, mcbuffer->packet);
        g_cond_broadcast(&core->out_buffer_cond);
-       g_atomic_int_inc(&core->ftb_count);
 
-       GstBuffer *buffer = NULL;
-       media_packet_get_extra(out_packet, (void**)&buffer);
-       if (buffer) {
-               LOGD("dq : v(%d)e(%d) %d TIMESTAMP = %"GST_TIME_FORMAT " DURATION = %"GST_TIME_FORMAT, core->video, core->encoder,
-                       core->ftb_count, GST_TIME_ARGS(GST_BUFFER_TIMESTAMP(buffer)), GST_TIME_ARGS(GST_BUFFER_DURATION(buffer)));
+       if (mcbuffer->buffer) {
+               LOGD("dq : v(%d)e(%d) TIMESTAMP = %"GST_TIME_FORMAT " DURATION = %"GST_TIME_FORMAT, core->video, core->encoder,
+                       GST_TIME_ARGS(GST_BUFFER_TIMESTAMP(mcbuffer->buffer)), GST_TIME_ARGS(GST_BUFFER_DURATION(mcbuffer->buffer)));
        } else {
-               LOGD("dq : v(%d)e(%d) %d ", core->video, core->encoder, core->ftb_count);
+               LOGD("dq : v(%d)e(%d)", core->video, core->encoder);
        }
 
        g_mutex_unlock(&core->ports[1]->mutex);
 
        if (core->user_cb[_MEDIACODEC_EVENT_TYPE_FILLBUFFER]) {
                ((mc_fill_buffer_cb) core->user_cb[_MEDIACODEC_EVENT_TYPE_FILLBUFFER])
-                       (out_packet, core->user_data[_MEDIACODEC_EVENT_TYPE_FILLBUFFER]);
+                       (mcbuffer->packet, core->user_data[_MEDIACODEC_EVENT_TYPE_FILLBUFFER]);
        }
 }
 
 void __mc_gst_buffer_add(GstElement *element, GstBuffer *buffer, GstPad *pad, gpointer data)
 {
-       guint n;
-       GstMemory *mem;
-       GstMapInfo map = GST_MAP_INFO_INIT;
-       media_packet_h out_packet = NULL;
+       GstMCBuffer *mcbuffer = NULL;
 
        MEDIACODEC_FENTER();
 
@@ -2031,34 +2614,26 @@ void __mc_gst_buffer_add(GstElement *element, GstBuffer *buffer, GstPad *pad, gp
 
        gst_buffer_ref(buffer);
 
-       n = gst_buffer_n_memory(buffer);
+       mcbuffer = __mc_gst_make_media_packet(core, buffer);
 
-       mem = gst_buffer_peek_memory(buffer, n-1);
+       LOGI("@%p(%d) out_packet : %p", core, core->encoder, mcbuffer->packet);
 
-       gst_memory_map(mem, &map, GST_MAP_READ);
-       LOGD("n : %d, map.data : %p, map.size : %d", n, map.data, map.size);
-
-       out_packet = __mc_gst_make_media_packet(core, map.data, map.size);
-
-       LOGI("@%p(%d) out_packet : %p", core, core->encoder, out_packet);
-       gst_memory_unmap(mem, &map);
-
-       if (out_packet) {
-               media_packet_set_extra(out_packet, buffer);
-               media_packet_set_pts(out_packet, GST_BUFFER_TIMESTAMP(buffer));
-               media_packet_set_duration(out_packet, GST_BUFFER_DURATION(buffer));
+       if (mcbuffer->packet) {
+               media_packet_set_pts(mcbuffer->packet, GST_BUFFER_TIMESTAMP(buffer));
+               media_packet_set_dts(mcbuffer->packet, GST_BUFFER_DTS(buffer));
+               media_packet_set_duration(mcbuffer->packet, GST_BUFFER_DURATION(buffer));
 
                if (core->need_codec_data) {
-                       media_packet_set_flags(out_packet, MEDIA_PACKET_CODEC_CONFIG);
+                       media_packet_set_flags(mcbuffer->packet, MEDIA_PACKET_CODEC_CONFIG);
                        core->need_codec_data = false;
                }
 
                if (core->need_sync_flag) {
-                       media_packet_set_flags(out_packet, MEDIA_PACKET_SYNC_FRAME);
+                       media_packet_set_flags(mcbuffer->packet, MEDIA_PACKET_SYNC_FRAME);
                        core->need_sync_flag = false;
                }
 
-               __mc_push_output_to_queue(core, out_packet);
+               __mc_push_output_to_queue(core, mcbuffer);
        } else {
                gst_buffer_unref(buffer);
                LOGE("Failed to dequeue output packet");
@@ -2071,65 +2646,29 @@ void __mc_gst_buffer_add(GstElement *element, GstBuffer *buffer, GstPad *pad, gp
 
 int __mc_output_buffer_finalize_cb(media_packet_h packet, int error_code, void *user_data)
 {
-       void *buffer = NULL;
-       int i = 0;
-       guint n;
-       GstMemory *mem;
-       GstMapInfo map = GST_MAP_INFO_INIT;
-       MMVideoBuffer *mm_video_buf = NULL;
-       GList *find;
-
        MEDIACODEC_FENTER();
 
-       mc_gst_core_t *core = (mc_gst_core_t *)user_data;
+       GstMCBuffer *mcbuffer = (GstMCBuffer *)user_data;
 
-       g_mutex_lock(&core->ports[1]->mutex);
+       gst_buffer_unref((GstBuffer *)mcbuffer->buffer);
 
-       if ((find = g_queue_find(core->ports[1]->queue, packet))) {
-               LOGD("remove packet from queue");
-               g_queue_remove(core->ports[1]->queue, packet);
+       if (mcbuffer->ext_mem) {
+               g_free(mcbuffer->ext_mem);
+               LOGD("freed external memory");
+               mcbuffer->ext_mem = NULL;
        }
 
-       g_mutex_unlock(&core->ports[1]->mutex);
-
-       g_atomic_int_dec_and_test(&core->ftb_count);
-       media_packet_get_extra(packet, &buffer);
-
-       n = gst_buffer_n_memory(buffer);
-
-       if (n > 1) {
-               mem = gst_buffer_peek_memory(buffer, n-1);
-               gst_memory_map(mem, &map, GST_MAP_READ);
-               mm_video_buf = (MMVideoBuffer *)map.data;
-
-               if (!mm_video_buf) {
-                       LOGW("gstbuffer map.data is null");
-               } else {
-                       for (i = 0; i < MM_VIDEO_BUFFER_PLANE_MAX; i++) {
-                               if (mm_video_buf->handle.bo[i])
-                                       tbm_bo_unref(mm_video_buf->handle.bo[i]);
-                       }
-               }
-               gst_memory_unmap(mem, &map);
-       }
-       gst_buffer_unref((GstBuffer *)buffer);
-       LOGD("@v(%d)e(%d)output port filled buffer(%d): %p", core->video, core->encoder, core->ftb_count, packet);
+       LOGD("output port filled buffer : %p", packet);
+       g_free(mcbuffer);
 
        MEDIACODEC_FLEAVE();
 
        return MEDIA_PACKET_FINALIZE;
 }
 
-gchar *__mc_get_gst_input_format(media_packet_h packet, bool is_hw)
+gchar *__mc_get_gst_input_format(media_format_mimetype_e mimetype, bool is_hw)
 {
        gchar *format = NULL;
-       media_format_h fmt = NULL;
-       media_format_mimetype_e mimetype = 0;
-
-       media_packet_get_format(packet, &fmt);
-       media_format_get_video_info(fmt, &mimetype, NULL, NULL, NULL, NULL);
-       media_format_unref(fmt);
-       LOGD("input packet mimetype : %x", mimetype);
 
        switch (mimetype) {
        case MEDIA_FORMAT_I420:
@@ -2147,18 +2686,21 @@ gchar *__mc_get_gst_input_format(media_packet_h packet, bool is_hw)
        default:
                break;
        }
-       LOGD("input packet format : %s", format);
+
+       LOGD("input packet format : %s", format ? format : "(null)" );
+
        return format;
 }
 
 GstMCBuffer *_mc_gst_media_packet_to_gstbuffer(mc_gst_core_t *core, media_packet_h packet, bool codec_config)
 {
-       int ret = MEDIA_PACKET_ERROR_NONE;
-       GstMCBuffer *mcbuffer = NULL;
-       void *buf_data = NULL;
+       gint ret = MEDIA_PACKET_ERROR_NONE;
        uint64_t buf_size = 0;
        uint64_t pts = 0;
+       uint64_t dts = 0;
        uint64_t dur = 0;
+       void *buf_data = NULL;
+       GstMCBuffer *mcbuffer = NULL;
 
        ret = media_packet_get_buffer_size(packet, &buf_size);
        if (ret != MEDIA_PACKET_ERROR_NONE) {
@@ -2188,10 +2730,14 @@ GstMCBuffer *_mc_gst_media_packet_to_gstbuffer(mc_gst_core_t *core, media_packet
                 * will not be invoked
                 */
                gst_buffer_unref(mcbuffer->buffer);
-               free(mcbuffer);
+               g_free(mcbuffer);
                return NULL;
        }
 
+       /* dts */
+       media_packet_get_pts(packet, &dts);
+       GST_BUFFER_DTS(mcbuffer->buffer) = dts;
+
        /* pts */
        media_packet_get_pts(packet, &pts);
        GST_BUFFER_PTS(mcbuffer->buffer) = pts;
@@ -2200,84 +2746,132 @@ GstMCBuffer *_mc_gst_media_packet_to_gstbuffer(mc_gst_core_t *core, media_packet
        media_packet_get_duration(packet, &dur);
        GST_BUFFER_DURATION(mcbuffer->buffer) = dur;
 
+       GST_BUFFER_OFFSET(mcbuffer->buffer) = core->offset;
+
+       core->offset += buf_size;
+       GST_BUFFER_OFFSET_END(mcbuffer->buffer) = core->offset;
+
        return mcbuffer;
 }
 
-media_packet_h __mc_gst_make_media_packet(mc_gst_core_t *core, unsigned char *data, int size)
+GstMCBuffer *__mc_gst_make_media_packet(mc_gst_core_t *core, GstBuffer *buffer)
 {
-       int ret = MEDIA_PACKET_ERROR_NONE;
-       media_packet_h packet = NULL;
+       gint ret = MEDIA_PACKET_ERROR_NONE;
+       GstMemory *mem;
+       GstMapInfo map = GST_MAP_INFO_INIT;
+       GstMCBuffer *mcbuffer = NULL;
+       void *data = NULL;
+       gint size = 0;
+
+       mem = gst_buffer_peek_memory(buffer, 0);
+
+       if (gst_is_tizen_memory(mem)) {
+               data = (void *)gst_tizen_memory_get_surface(mem);
+               size = tbm_surface_internal_get_size((tbm_surface_h)data);
+       } else {
+               if (!gst_memory_map(mem, &map, GST_MAP_READ)) {
+                       LOGE("gst_memory_map failed for buffer[%p]", buffer);
+                       return NULL;
+               }
+
+               data = map.data;
+               size = map.size;
+       }
+
+       mcbuffer = g_new0(GstMCBuffer, 1);
+
+       mcbuffer->buffer = buffer;
+       mcbuffer->core = core;
+       mcbuffer->buf_size = size;
+
+       ret = __mc_fill_output_buffer(core, data, mcbuffer->buf_size,  mcbuffer);
+
+       if (!gst_is_tizen_memory(mem))
+               gst_memory_unmap(mem, &map);
 
-       ret = __mc_fill_output_buffer(core, data, size,  &packet);
        if (ret != MC_ERROR_NONE) {
                LOGW("failed to fill outbuf: %s (ox%08x)", _mc_error_to_string(ret), ret);
+               g_free(mcbuffer);
                return NULL;
        }
 
-
-       return packet;
+       return mcbuffer;
 }
 
-int __mc_gst_create_eos_packet(media_format_h fmt, media_packet_h *out_packet)
+int __mc_gst_create_eos_packet(media_format_h fmt, GstMCBuffer *mcbuffer)
 {
-       media_packet_h mediabuf = NULL;
-       int ret = MC_ERROR_NONE;
+       gint ret = MC_ERROR_NONE;
+       media_packet_h packet = NULL;
 
        MEDIACODEC_FENTER();
-       if (media_packet_create(fmt, NULL, NULL, &mediabuf)) {
-               LOGE("media_packet_create_alloc failed\n");
+       if (media_packet_create(fmt, __mc_output_buffer_finalize_cb, mcbuffer, &packet)) {
+               LOGE("media_packet_create failed\n");
                ret = MC_ERROR;
                goto ERROR;
        }
 
-       if (media_packet_set_flags(mediabuf, MEDIA_PACKET_END_OF_STREAM)) {
+       if (media_packet_set_flags(packet, MEDIA_PACKET_END_OF_STREAM)) {
                LOGE("unable to set EOS flag\n");
                ret = MC_ERROR;
                goto ERROR;
        }
 
-       *out_packet = mediabuf;
+       mcbuffer->buffer = NULL;
+       mcbuffer->ext_mem = NULL;
+       mcbuffer->buf_size = 0;
+       mcbuffer->packet = packet;
        MEDIACODEC_FLEAVE();
 
        return ret;
 ERROR:
-       if (mediabuf)
-               media_packet_destroy(mediabuf);
-       *out_packet = NULL;
+       if (packet)
+               media_packet_unref(packet);
        MEDIACODEC_FLEAVE();
        return ret;
 }
 
 void _mc_gst_handle_input_buffer_used(mc_gst_core_t *core, media_packet_h packet)
 {
-       g_atomic_int_dec_and_test(&core->etb_count);
+       if (core) {
+               g_atomic_int_dec_and_test(&core->etb_count);
+               LOGD("@v(%d)e(%d) input port used(%d)----- ", core->video, core->encoder, core->etb_count);
+       }
 
        if (core && core->user_cb[_MEDIACODEC_EVENT_TYPE_EMPTYBUFFER]) {
                ((mc_empty_buffer_cb)core->user_cb[_MEDIACODEC_EVENT_TYPE_EMPTYBUFFER])
                        (packet, core->user_data[_MEDIACODEC_EVENT_TYPE_EMPTYBUFFER]);
-       }
 
-       if (core)
-               LOGD("@v(%d)e(%d) input port emptied buffer(%d): %p", core->video, core->encoder, core->etb_count, packet);
+               g_mutex_lock(&core->drain_lock);
+
+               if (core->need_drain) {
+                       LOGD("@v(%d)e(%d) input port used----- single process_input.....", core->video, core->encoder);
+                       core->need_drain = false;
+                       g_cond_signal(&core->buffer_cond);
+               }
+               g_mutex_unlock(&core->drain_lock);
+       }
 }
 
 gboolean __mc_gst_bus_callback(GstBus *bus, GstMessage *msg, gpointer data)
 {
-       int ret  = MC_ERROR_NONE;
+       gint ret  = MC_ERROR_NONE;
+       GstMCBuffer *mcbuffer = NULL;
+
        mc_gst_core_t *core = (mc_gst_core_t *)data;
-       LOGD("@%p v(%d)e(%d)", core, core->video, core->encoder);
+       LOGI("@%p v(%d)e(%d)bus message : %s", core, core->video, core->encoder, gst_message_type_get_name(GST_MESSAGE_TYPE(msg)));
 
        switch (GST_MESSAGE_TYPE(msg)) {
 
        case GST_MESSAGE_EOS:
                _mc_send_eos_signal(core);
 
-               media_packet_h out_packet = NULL;
-               if (MC_ERROR_NONE == __mc_gst_create_eos_packet(core->output_fmt, &out_packet)) {
-                       __mc_push_output_to_queue(core, out_packet);
+               mcbuffer = g_new0(GstMCBuffer, 1);
+               if (__mc_gst_create_eos_packet(core->output_fmt, mcbuffer) == MC_ERROR_NONE) {
+                       __mc_push_output_to_queue(core, mcbuffer);
                        LOGD("send eos packet.");
                } else {
                        LOGE("failed to create eos packet.");
+                       g_free(mcbuffer);
                }
 
                if (core->user_cb[_MEDIACODEC_EVENT_TYPE_EOS]) {
@@ -2311,6 +2905,16 @@ gboolean __mc_gst_bus_callback(GstBus *bus, GstMessage *msg, gpointer data)
                        else
                                LOGW("Unexpected error has occured");
 
+               g_mutex_lock(&core->drain_lock);
+
+               if (core->need_drain) {
+                       LOGD("@v(%d)e(%d) input port used----- single process_input.....", core->video, core->encoder);
+                       core->need_drain = false;
+                       g_cond_signal(&core->buffer_cond);
+               }
+
+               g_mutex_unlock(&core->drain_lock);
+
                        if (core->user_cb[_MEDIACODEC_EVENT_TYPE_ERROR]) {
                                ((mc_error_cb) core->user_cb[_MEDIACODEC_EVENT_TYPE_ERROR])
                                        (ret, core->user_data[_MEDIACODEC_EVENT_TYPE_ERROR]);
@@ -2330,11 +2934,11 @@ gboolean __mc_gst_bus_callback(GstBus *bus, GstMessage *msg, gpointer data)
 
 static gboolean __mc_gst_check_useful_message(mc_gst_core_t *core, GstMessage *msg)
 {
-       gboolean retval = false;
+       gboolean retval = FALSE;
 
        if (!core->pipeline) {
                LOGE("mediacodec pipeline handle is null");
-               return true;
+               return TRUE;
        }
 
        switch (GST_MESSAGE_TYPE(msg)) {
@@ -2342,10 +2946,10 @@ static gboolean __mc_gst_check_useful_message(mc_gst_core_t *core, GstMessage *m
        case GST_MESSAGE_EOS:
        case GST_MESSAGE_ERROR:
        case GST_MESSAGE_WARNING:
-               retval = true;
+               retval = TRUE;
                break;
        default:
-               retval = false;
+               retval = FALSE;
                break;
        }
 
@@ -2357,7 +2961,7 @@ static GstBusSyncReply __mc_gst_bus_sync_callback(GstBus *bus, GstMessage *msg,
        mc_gst_core_t *core = (mc_gst_core_t *)data;
        GstBusSyncReply reply = GST_BUS_DROP;
 
-       LOGD("__mc_gst_bus_sync_callback is called");
+       LOGD("__mc_gst_bus_sync_callback is called : %s", gst_message_type_get_name(GST_MESSAGE_TYPE(msg)));
 
        if (!core->pipeline) {
                LOGE("mediacodec pipeline handle is null");
@@ -2387,116 +2991,55 @@ static GstBusSyncReply __mc_gst_bus_sync_callback(GstBus *bus, GstMessage *msg,
        return reply;
 }
 
-static MMVideoBuffer *__mc_gst_make_tbm_buffer(mc_gst_core_t *core, media_packet_h packet)
+static GstMemory *__mc_gst_make_tbm_buffer(mc_gst_core_t *core, GstMCBuffer *mcbuffer)
 {
-       int i;
-       int num_bos;
+       int ret = MEDIA_PACKET_ERROR_NONE;
        tbm_surface_h surface = NULL;
-       tbm_surface_info_s surface_info;
-       tbm_bo_handle handle_bo;
+       GstMemory *mem = NULL;
 
-       if (!packet) {
+       if (!mcbuffer->packet) {
                LOGE("output is null");
                return NULL;
        }
 
-       MMVideoBuffer *mm_vbuffer = NULL;
-       mm_vbuffer = (MMVideoBuffer *)malloc(sizeof(MMVideoBuffer));
-       if (!mm_vbuffer) {
-               LOGE("Failed to alloc MMVideoBuffer");
+       if (!_mc_gst_video_info_check_and_new(core, mcbuffer)) {
+               LOGE("video info failed");
                return NULL;
        }
-       memset(mm_vbuffer, 0x00, sizeof(MMVideoBuffer));
 
-       media_packet_get_tbm_surface(packet, &surface);
-       num_bos = tbm_surface_internal_get_num_bos(surface);
-       int err = tbm_surface_get_info((tbm_surface_h)surface, &surface_info);
-       if (err != TBM_SURFACE_ERROR_NONE) {
-               LOGE("get tbm surface is failed");
-               free(mm_vbuffer);
+       ret = media_packet_get_tbm_surface(mcbuffer->packet, &surface);
+       if (ret != MEDIA_PACKET_ERROR_NONE) {
+               LOGE("Failed to get tbm surface");
                return NULL;
        }
 
-       for (i = 0; i < num_bos; i++) {
-               mm_vbuffer->handle.bo[i] = tbm_surface_internal_get_bo(surface, i);
-               LOGD("mm_vbuffer->handle.bo[%d] : %p", i, mm_vbuffer->handle.bo[i]);
-       }
-
-#ifdef TIZEN_PROFILE_LITE
-       int phy_addr = 0;
-       int phy_size = 0;
-       tbm_bo_handle handle_fd = tbm_bo_get_handle(mm_vbuffer->handle.bo[0], TBM_DEVICE_MM);
-       if (__tbm_get_physical_addr_bo(handle_fd, &phy_addr, &phy_size) == 0) {
-               mm_vbuffer->handle.paddr[0] = (void *)phy_addr;
-               LOGD("mm_vbuffer->paddr : %p", mm_vbuffer->handle.paddr[0]);
-       }
-#endif
-
-       mm_vbuffer->type = MM_VIDEO_BUFFER_TYPE_TBM_BO;
-       mm_vbuffer->width[0] = surface_info.width;
-       mm_vbuffer->height[0] = surface_info.height;
-       mm_vbuffer->width[1] = surface_info.width;
-       mm_vbuffer->height[1] = surface_info.height>>1;
-       mm_vbuffer->size[0] = surface_info.planes[0].size;
-       mm_vbuffer->size[1] = surface_info.planes[1].size;
-       mm_vbuffer->stride_width[0] = surface_info.planes[0].stride;
-       mm_vbuffer->stride_height[0] = surface_info.planes[0].size / surface_info.planes[0].stride;
-       mm_vbuffer->stride_width[1] = surface_info.planes[1].stride;
-       mm_vbuffer->stride_height[1] = surface_info.planes[1].size / surface_info.planes[1].stride;
-
-       if (mm_vbuffer->handle.bo[0]) {
-               handle_bo = tbm_bo_get_handle(mm_vbuffer->handle.bo[0], TBM_DEVICE_CPU);
-               mm_vbuffer->data[0] = handle_bo.ptr;
-
-               handle_bo = tbm_bo_get_handle(mm_vbuffer->handle.bo[0], TBM_DEVICE_MM);
-               mm_vbuffer->handle.dmabuf_fd[0] = handle_bo.u32;
-       }
-
-       if (mm_vbuffer->handle.bo[1]) {
-               handle_bo = tbm_bo_get_handle(mm_vbuffer->handle.bo[1], TBM_DEVICE_CPU);
-               mm_vbuffer->data[1] = handle_bo.ptr;
-
-               handle_bo = tbm_bo_get_handle(mm_vbuffer->handle.bo[1], TBM_DEVICE_MM);
-               mm_vbuffer->handle.dmabuf_fd[1] = handle_bo.u32;
-       } else {
-               mm_vbuffer->data[1] = mm_vbuffer->data[0] + mm_vbuffer->stride_width[0] * mm_vbuffer->stride_height[0];
-       }
-       mm_vbuffer->plane_num = 2;
-
-       LOGD("size[0] : %d, size[1] : %d, bo[0] :%p, bo[1] :%p", mm_vbuffer->size[0], mm_vbuffer->size[1], mm_vbuffer->handle.bo[0], mm_vbuffer->handle.bo[1]);
+       mem = gst_tizen_allocator_alloc_surface(core->allocator,
+                       core->video_info, surface, mcbuffer, (GDestroyNotify)__mc_input_buffer_finalize_cb);
 
-       return mm_vbuffer;
+       return mem;
 }
 
-static void gst_mediacodec_buffer_finalize(GstMCBuffer *mcbuffer)
+static void __mc_input_buffer_finalize_cb(GstMCBuffer *mcbuffer)
 {
        MEDIACODEC_FENTER();
 
        if (!mcbuffer)
                return;
 
-       mc_gst_core_t *core = (mc_gst_core_t *)mcbuffer->core;
+       LOGD("============>>>>>  _finalize_cb  : %p, %p", mcbuffer, mcbuffer->packet);
 
-       _mc_gst_handle_input_buffer_used(core, mcbuffer->packet);
+       _mc_gst_handle_input_buffer_used(mcbuffer->core, mcbuffer->packet);
 
-       free(mcbuffer);
-       mcbuffer = NULL;
+       g_free(mcbuffer);
 
        MEDIACODEC_FLEAVE();
-
-       return;
 }
 
 static GstMCBuffer *gst_mediacodec_buffer_new(mc_gst_core_t *core, media_packet_h packet, uint64_t size)
 {
        GstMCBuffer *mcbuffer = NULL;
 
-       mcbuffer = (GstMCBuffer *)malloc(sizeof(*mcbuffer));
-
-       if (mcbuffer == NULL) {
-               LOGE("malloc fail");
-               return NULL;
-       }
+       mcbuffer = g_new0(GstMCBuffer, 1);
 
        mcbuffer->buffer = gst_buffer_new();
        mcbuffer->buf_size = 0;
@@ -2665,13 +3208,11 @@ static gint __gst_transform_gsterror(mc_gst_core_t *core, GstMessage *message, G
                break;
        }
 
-       return MEDIACODEC_ERROR_INVALID_STREAM;
-
 INTERNAL_ERROR:
        return MEDIACODEC_ERROR_INTERNAL;
 }
 
-static int _mc_gst_flush_buffers(mc_gst_core_t *core)
+static gint _mc_gst_flush_buffers(mc_gst_core_t *core)
 {
        gboolean ret = FALSE;
        GstEvent *event = NULL;
@@ -2680,6 +3221,23 @@ static int _mc_gst_flush_buffers(mc_gst_core_t *core)
 
        _mc_gst_set_flush_input(core);
 
+       LOGW("Trying send flush_start .... ");
+       event = gst_event_new_flush_start();
+       ret = gst_element_send_event(core->appsrc, event);
+       if (ret != TRUE) {
+               LOGE("failed to send Flush_Start event");
+               return MC_ERROR;
+       }
+
+       LOGW("Trying send flush_stop .... ");
+       event = gst_event_new_flush_stop(TRUE);
+       ret = gst_element_send_event(core->appsrc, event);
+       if (ret != TRUE) {
+               LOGE("failed to send Flush_Stop event");
+               return MC_ERROR;
+       }
+
+       LOGW("Trying send seek .... ");
        event = gst_event_new_seek(1.0, GST_FORMAT_BYTES, GST_SEEK_FLAG_FLUSH,
                        GST_SEEK_TYPE_SET, 0, GST_SEEK_TYPE_NONE, -1);
 
@@ -2702,17 +3260,17 @@ static void _mc_gst_set_flush_input(mc_gst_core_t *core)
        media_packet_h packet = NULL;
 
        MEDIACODEC_FENTER();
-       LOGI("_mc_gst_set_flush_input called");
+       LOGI("_mc_gst_set_flush_input called : input_queue_len = %d, etb_count = %d", core->available_queue->input->length, core->etb_count);
 
        while (!mc_async_queue_is_empty(core->available_queue->input)) {
                packet = mc_async_queue_pop_forced(core->available_queue->input);
-               g_atomic_int_dec_and_test(&core->etb_count);
                LOGD("%p poped(%d)", packet, core->etb_count);
 
                _mc_gst_handle_input_buffer_used(core, packet);
        }
 
        mc_async_queue_flush(core->available_queue->input);
+       LOGI("_mc_gst_set_flush_input ended : input_queue_len = %d, etb_count = %d", core->available_queue->input->length, core->etb_count);
        MEDIACODEC_FLEAVE();
 }
 
@@ -2721,67 +3279,18 @@ static void _mc_gst_set_flush_output(mc_gst_core_t *core)
        media_packet_h packet = NULL;
 
        MEDIACODEC_FENTER();
-       g_mutex_lock(&core->ports[1]->mutex);
-
-       while (!g_queue_is_empty(core->ports[1]->queue)) {
-               packet = g_queue_pop_head(core->ports[1]->queue);
-               g_atomic_int_dec_and_test(&core->ftb_count);
-               LOGD("%p poped(%d)", packet, core->ftb_count);
-               if (packet) {
-                       media_packet_destroy(packet);
-                       LOGD("outpacket destroyed");
-                       packet = NULL;
-               }
-       }
-       g_mutex_unlock(&core->ports[1]->mutex);
-       MEDIACODEC_FLEAVE();
-}
-
-#ifdef TIZEN_PROFILE_LITE
-int __tbm_get_physical_addr_bo(tbm_bo_handle tbm_bo_handle_fd_t, int *phy_addr, int *phy_size)
-{
-       int tbm_bo_handle_fd;
-
-       int ret = 0;
-
-       tbm_bo_handle_fd = tbm_bo_handle_fd_t.u32;
-
-       int open_flags = O_RDWR;
-       int ion_fd = -1;
 
-       struct ion_mmu_data mmu_data;
-       struct ion_custom_data  custom_data;
-
-       mmu_data.fd_buffer = tbm_bo_handle_fd;
-       custom_data.cmd = 4;
-       custom_data.arg = (unsigned long)&mmu_data;
-
-       ion_fd = open("/dev/ion", open_flags);
-       if (ion_fd < 0)
-               LOGE("[tbm_get_physical_addr_bo] ion_fd open device failed");
-
-       if (ioctl(ion_fd, ION_IOC_CUSTOM, &custom_data) < 0) {
-               LOGE("[tbm_get_physical_addr_bo] ION_IOC_CUSTOM failed");
-               ret = -1;
-       }
+       g_mutex_lock(&core->ports[1]->mutex);
 
-       if (!ret) {
-               *phy_addr = mmu_data.iova_addr;
-               *phy_size = mmu_data.iova_size;
-       } else {
-               *phy_addr = 0;
-               *phy_size = 0;
-               LOGW("[tbm_get_physical_addr_bo] getting physical address is failed. phy_addr = 0");
+       while ((packet = g_queue_pop_head(core->ports[1]->queue))) {
+               LOGD("release packet[%p]", packet);
+               media_packet_unref(packet);
        }
 
-       if (ion_fd != -1) {
-               close(ion_fd);
-               ion_fd = -1;
-       }
+       g_mutex_unlock(&core->ports[1]->mutex);
 
-       return 0;
+       MEDIACODEC_FLEAVE();
 }
-#endif
 
 #if TIZEN_EXYNOS_SPECIFIC
 /*
@@ -2802,13 +3311,13 @@ int __tbm_get_physical_addr_bo(tbm_bo_handle tbm_bo_handle_fd_t, int *phy_addr,
  * @return
  *   address of tiled data
  */
-static int __tile_4x2_read(int x_size, int y_size, int x_pos, int y_pos)
+static gint __tile_4x2_read(gint x_size, gint y_size, gint x_pos, gint y_pos)
 {
-       int pixel_x_m1, pixel_y_m1;
-       int roundup_x;
-       int linear_addr0, linear_addr1, bank_addr ;
-       int x_addr;
-       int trans_addr;
+       gint pixel_x_m1, pixel_y_m1;
+       gint roundup_x;
+       gint linear_addr0, linear_addr1, bank_addr ;
+       gint x_addr;
+       gint trans_addr;
 
        pixel_x_m1 = x_size - 1;
        pixel_y_m1 = y_size - 1;
@@ -2873,14 +3382,14 @@ static int __tile_4x2_read(int x_size, int y_size, int x_pos, int y_pos)
  * @param buttom
  *   Crop size of buttom
  */
-static void __csc_tiled_to_linear_crop(unsigned char *yuv420_dest, unsigned char *nv12t_src,
-               int yuv420_width, int yuv420_height,
-               int left, int top, int right, int buttom)
+static void __csc_tiled_to_linear_crop(gchar *yuv420_dest, gchar *nv12t_src,
+               gint yuv420_width, gint yuv420_height,
+               gint left, int top, gint right, gint buttom)
 {
-       int i, j;
-       int tiled_offset = 0, tiled_offset1 = 0;
-       int linear_offset = 0;
-       int temp1 = 0, temp2 = 0, temp3 = 0, temp4 = 0;
+       gint i, j;
+       gint tiled_offset = 0, tiled_offset1 = 0;
+       gint linear_offset = 0;
+       gint temp1 = 0, temp2 = 0, temp3 = 0, temp4 = 0;
 
        temp3 = yuv420_width-right;
        temp1 = temp3-left;
@@ -3107,7 +3616,20 @@ const gchar * _mc_error_to_string(mc_ret_e err)
        }
 }
 
-int _mediacodec_get_mime(mc_gst_core_t *core)
+const gchar * _mc_bit_to_string(int bit)
+{
+       switch (bit) {
+       case 16:
+               return "S16LE";
+       case 32:
+               return "F32LE";
+       default:
+               return "NULL";
+
+       }
+}
+
+int _mc_get_mime(mc_gst_core_t *core)
 {
        media_format_mimetype_e mime = MEDIA_FORMAT_MAX;
 
@@ -3134,14 +3656,14 @@ int _mediacodec_get_mime(mc_gst_core_t *core)
                break;
        case MEDIACODEC_AAC:
                if (core->encoder)
-                       mime = MEDIA_FORMAT_PCM;
+                       mime = MEDIA_FORMAT_PCM_F32LE;  /*FIXME need to change PCM supported by chipset */
                else
                        mime = MEDIA_FORMAT_AAC;
 
                break;
        case MEDIACODEC_AAC_HE:
                if (core->encoder)
-                       mime = MEDIA_FORMAT_PCM;
+                       mime = MEDIA_FORMAT_PCM_F32LE;  /* FIXME need to change PCM supported by chipset */
                else
                        mime = MEDIA_FORMAT_AAC_HE;
 
@@ -3169,8 +3691,14 @@ int _mediacodec_get_mime(mc_gst_core_t *core)
        case MEDIACODEC_AMR_WB:
                mime = MEDIA_FORMAT_AMR_WB;
                break;
+       case MEDIACODEC_OPUS:
+               if (core->encoder)
+                       mime = MEDIA_FORMAT_OPUS;
+               else
+                       mime = MEDIA_FORMAT_PCM_S16LE;
+               break;
        default:
-               LOGE("NOT SUPPORTED!!!!");
+               LOGE("NOT SUPPORTED!!!! 0x%x ", core->codec_id);
                break;
        }
        return mime;
@@ -3178,8 +3706,9 @@ int _mediacodec_get_mime(mc_gst_core_t *core)
 
 mc_ret_e mc_gst_get_packet_pool(mc_handle_t *mc_handle, media_packet_pool_h *packet_pool)
 {
-       int curr_size;
-       int max_size, min_size;
+       gint ret = MC_ERROR_NONE;
+       gint curr_size;
+       gint max_size, min_size;
        media_format_mimetype_e mime_format = MEDIA_FORMAT_MAX;
        media_format_h fmt_handle = NULL;
        media_packet_pool_h pool = NULL;
@@ -3190,8 +3719,7 @@ mc_ret_e mc_gst_get_packet_pool(mc_handle_t *mc_handle, media_packet_pool_h *pac
 
        core = (mc_gst_core_t *)mc_handle->core;
 
-       int ret = media_packet_pool_create(&pool);
-
+       ret = media_packet_pool_create(&pool);
        if (ret != MEDIA_PACKET_ERROR_NONE) {
                LOGE("media_packet_pool_create failed");
                return MC_ERROR;
@@ -3199,39 +3727,31 @@ mc_ret_e mc_gst_get_packet_pool(mc_handle_t *mc_handle, media_packet_pool_h *pac
 
        if (media_format_create(&fmt_handle) != MEDIA_FORMAT_ERROR_NONE) {
                LOGE("media format create failed");
+               media_packet_pool_destroy(pool);
                return MC_ERROR;
        }
 
-       mime_format = _mediacodec_get_mime(core);
+       mime_format = _mc_get_mime(core);
 
        if (core->video) {
-               if (core->encoder) {
-                       media_format_set_video_mime(fmt_handle, mime_format);
-                       media_format_set_video_width(fmt_handle, mc_handle->info.encoder.width);
-                       media_format_set_video_height(fmt_handle, mc_handle->info.encoder.height);
-                       media_format_set_video_avg_bps(fmt_handle, mc_handle->info.encoder.bitrate);
-               } else {
-                       media_format_set_video_mime(fmt_handle, mime_format);
-                       media_format_set_video_width(fmt_handle, mc_handle->info.decoder.width);
-                       media_format_set_video_height(fmt_handle, mc_handle->info.decoder.height);
-               }
+               media_format_set_video_mime(fmt_handle, mime_format);
+               media_format_set_video_width(fmt_handle, mc_handle->info.video.width);
+               media_format_set_video_height(fmt_handle, mc_handle->info.video.height);
 
+               if (core->encoder)
+                       media_format_set_video_avg_bps(fmt_handle, mc_handle->info.video.bitrate);
        } else {
-               if (core->encoder) {
-                       media_format_set_audio_mime(fmt_handle, mime_format);
-                       media_format_set_audio_channel(fmt_handle, mc_handle->info.encoder.channel);
-                       media_format_set_audio_samplerate(fmt_handle, mc_handle->info.encoder.samplerate);
-                       media_format_set_audio_bit(fmt_handle, mc_handle->info.encoder.bit);
-               } else {
                        media_format_set_audio_mime(fmt_handle, mime_format);
-                       media_format_set_audio_channel(fmt_handle, mc_handle->info.decoder.channel);
-                       media_format_set_audio_samplerate(fmt_handle, mc_handle->info.decoder.samplerate);
-                       media_format_set_audio_bit(fmt_handle, mc_handle->info.decoder.bit);
-               }
+                       media_format_set_audio_channel(fmt_handle, mc_handle->info.audio.channel);
+                       media_format_set_audio_samplerate(fmt_handle, mc_handle->info.audio.samplerate);
+                       media_format_set_audio_bit(fmt_handle, mc_handle->info.audio.bit_depth);
+               if (core->encoder)
+                       media_format_set_audio_avg_bps(fmt_handle, mc_handle->info.audio.bitrate);
        }
 
        ret = media_packet_pool_set_media_format(pool, fmt_handle);
        if (ret != MEDIA_PACKET_ERROR_NONE) {
+               media_packet_pool_destroy(pool);
                LOGE("media_packet_pool_set_media_format failed");
                return MC_ERROR;
        }
@@ -3242,12 +3762,14 @@ mc_ret_e mc_gst_get_packet_pool(mc_handle_t *mc_handle, media_packet_pool_h *pac
        min_size = max_size;
        ret = media_packet_pool_set_size(pool, min_size, max_size);
        if (ret != MEDIA_PACKET_ERROR_NONE) {
+               media_packet_pool_destroy(pool);
                LOGE("media_packet_pool_set_size failed");
                return MC_ERROR;
        }
 
        ret = media_packet_pool_allocate(pool);
        if (ret != MEDIA_PACKET_ERROR_NONE) {
+               media_packet_pool_destroy(pool);
                LOGE("media_packet_pool_allocate failed");
                return MC_OUT_OF_MEMORY;
        }
@@ -3257,3 +3779,36 @@ mc_ret_e mc_gst_get_packet_pool(mc_handle_t *mc_handle, media_packet_pool_h *pac
        *packet_pool = pool;
        return MC_ERROR_NONE;
 }
+
+mc_ret_e mc_gst_set_property_array_int(GstElement *element, const gchar *property_name, gint *array, guint array_length)
+{
+       guint i = 0;
+       GValue value = G_VALUE_INIT;
+       GValue tmp = G_VALUE_INIT;
+
+       if (!element || !property_name || !array) {
+               LOGE("NULL param[%p,%p,%p]", element, property_name, array);
+               return MC_PARAM_ERROR;
+       }
+
+       g_value_init(&value, GST_TYPE_ARRAY);
+       g_value_init(&tmp, G_TYPE_INT);
+
+       LOGI("set element[%s], property[%s], array_length[%d]",
+               GST_ELEMENT_NAME(element), property_name, array_length);
+
+       gst_value_array_init(&value, array_length);
+
+       for (i = 0 ; i < array_length ; i++) {
+               LOGI("    array[%u] %d", i, array[i]);
+               g_value_set_int(&tmp, array[i]);
+               gst_value_array_append_value(&value, &tmp);
+       }
+
+       g_object_set_property(G_OBJECT(element), property_name, &value);
+
+       g_value_unset(&tmp);
+       g_value_unset(&value);
+
+       return MC_ERROR_NONE;
+}