Remove mmlog & fix bugs for image transform 35/48635/3 accepted/tizen/mobile/20150925.012807 accepted/tizen/tv/20150925.012817 accepted/tizen/wearable/20150925.012824 submit/tizen/20150924.075606
authorJi Yong Min <jiyong.min@samsung.com>
Thu, 24 Sep 2015 04:57:33 +0000 (13:57 +0900)
committerJi Yong Min <jiyong.min@samsung.com>
Thu, 24 Sep 2015 06:20:42 +0000 (15:20 +0900)
Change-Id: I0c1735cc48492d0b424a9b95cb3b419946023aca
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>
configure.ac
gstcs/Makefile.am
gstcs/include/mm_util_gstcs.h [changed mode: 0644->0755]
gstcs/include/mm_util_gstcs_internal.h
gstcs/mm_util_gstcs.c
packaging/libmm-imgp-gstcs.spec

index 7b8bf90..7d5fcfa 100755 (executable)
@@ -35,9 +35,9 @@ PKG_CHECK_MODULES(MMCOMMON, mm-common)
 AC_SUBST(MMCOMMON_CFLAGS)
 AC_SUBST(MMCOMMON_LIBS)
 
-PKG_CHECK_MODULES(MMLOG, mm-log)
-AC_SUBST(MMLOG_CFLAGS)
-AC_SUBST(MMLOG_LIBS)
+PKG_CHECK_MODULES(MMLOG, dlog)
+AC_SUBST(DLOG_CFLAGS)
+AC_SUBST(DLOG_LIBS)
 
 PKG_CHECK_MODULES(GLIB, glib-2.0)
 AC_SUBST(GLIB_CFLAGS)
index dda9be1..3c3ce01 100755 (executable)
@@ -16,7 +16,7 @@ libmmutil_imgp_gstcs_la_CFLAGS = -I$(srcdir)/include \
                              $(GST_PLUGIN_BASE_CFLAGS) \
                              $(GST_INTERFACE_CFLAGS) \
                              $(GSTPBUTILS_CFLAGS) \
-                             $(MMLOG_CFLAGS) -DMMF_LOG_OWNER=0x0100 -DMMF_DEBUG_PREFIX=\"MMF-IMAGE\"
+                             $(DLOG_CFLAGS)
 
 libmmutil_imgp_gstcs_la_LIBADD = $(MMCOMMON_LIBS) \
                            $(GLIB_LIBS) \
@@ -26,4 +26,4 @@ libmmutil_imgp_gstcs_la_LIBADD = $(MMCOMMON_LIBS) \
                             $(GST_PLUGIN_BASE_LIBS) \
                             $(GST_INTERFACE_LIBS) \
                             $(GSTPBUTILS_LIBS) \
-                           $(MMLOG_LIBS)
+                           $(DLOG_LIBS)
old mode 100644 (file)
new mode 100755 (executable)
index 7650440..efed447
@@ -92,22 +92,12 @@ typedef struct _imgp_info_s
        unsigned int dst_height;
        unsigned int output_stride;
        unsigned int output_elevation;
+       unsigned int buffer_size;
        mm_util_img_rotate_type_e angle;
 } imgp_info_s;
 
 /**
  *
- * @remark     image size
- *
- * @param      input_format_label                                                                       [in]           "filename.yuv" or  "filename,rgb" etc
- * @param      input_width, input_height, output_width, output_height   [in]            int value
- * @return     This function returns image size
-*/
-static int
-mm_setup_image_size(const char* image_format_label, int width, int height);
-
-/**
- *
  * @remark     colorspace converter            I420, nv12 etc <-> RGB888 or ARGB8888 etc
  *
  * @remark     resize                                  if input_width != output_width or input_height != output_height
index d113904..f6f8fc6 100755 (executable)
@@ -33,6 +33,46 @@ extern "C" {
 #include <gst/app/gstappsink.h>
 #include "mm_util_gstcs.h"
 #include "mm_log.h"
+
+#ifdef LOG_TAG
+#undef LOG_TAG
+#endif
+
+#define LOG_TAG "MM_UTIL_GSTCS"
+
+#define FONT_COLOR_RESET    "\033[0m"
+#define FONT_COLOR_RED      "\033[31m"
+
+#define gstcs_debug(fmt, arg...) do { \
+               LOGD(FONT_COLOR_RESET""fmt"", ##arg);     \
+       } while (0)
+
+#define gstcs_info(fmt, arg...) do { \
+               LOGI(FONT_COLOR_RESET""fmt"", ##arg);     \
+       } while (0)
+
+#define gstcs_warn(fmt, arg...) do { \
+               LOGW(FONT_COLOR_RESET""fmt"", ##arg);     \
+       } while (0)
+
+#define gstcs_error(fmt, arg...) do { \
+               LOGE(FONT_COLOR_RED""fmt""FONT_COLOR_RESET, ##arg);     \
+       } while (0)
+
+#define gstcs_retm_if(expr, fmt, arg...) do { \
+               if(expr) { \
+                       LOGE(FONT_COLOR_RED""fmt""FONT_COLOR_RESET, ##arg);     \
+                       return; \
+               } \
+       } while (0)
+
+#define gstcs_retvm_if(expr, val, fmt, arg...) do { \
+               if(expr) { \
+                       LOGE(FONT_COLOR_RED""fmt""FONT_COLOR_RESET, ##arg);     \
+                       return (val); \
+               } \
+       } while (0)
+
 #define GSTCS_FREE(src) { if(src) {g_free(src); src = NULL;} }
 typedef struct _image_format_s
 {
@@ -49,6 +89,7 @@ typedef struct _image_format_s
 typedef struct _gstreamer_s
 {
        GMainLoop *loop;
+       GMainContext *context;
        GstElement *pipeline;
        GstElement *appsrc;
        GstElement *colorspace;
@@ -56,9 +97,20 @@ typedef struct _gstreamer_s
        GstElement *videoflip;
        GstElement *appsink;
        GstBuffer *output_buffer;
-       gboolean outbuf_available;
 } gstreamer_s;
 
+/**
+ *
+ * @remark     image size
+ *
+ * @param      input_format_label                                                                       [in]           "filename.yuv" or  "filename,rgb" etc
+ * @param      input_width, input_height, output_width, output_height   [in]            int value
+ * @return     This function returns image size
+*/
+static int
+mm_setup_image_size(const char* image_format_label, int width, int height);
+
+
 #ifdef __cplusplus
 }
 #endif
index 57b1c58..a5df965 100755 (executable)
 #define MM_UTIL_ROUND_UP_8(num) (((num)+7)&~7)
 #define MM_UTIL_ROUND_UP_16(num) (((num)+15)&~15)
 
-#define MAX_GET_STATE_COUNT 2000
 
-#define setup_image_size_I420(width, height) { \
-       int size=0; \
-       size = (MM_UTIL_ROUND_UP_4 (width) * MM_UTIL_ROUND_UP_2 (height) + MM_UTIL_ROUND_UP_8 (width) * MM_UTIL_ROUND_UP_2 (height) /2); \
-       return size; \
-}
-
-#define setup_image_size_Y42B(width, height) { \
-       int size=0; \
-       size = (MM_UTIL_ROUND_UP_4 (width) * height + MM_UTIL_ROUND_UP_8 (width) * height); \
-       return size; \
-}
-
-#define setup_image_size_Y444(width, height) { \
-       int size=0; \
-       size = (MM_UTIL_ROUND_UP_4 (width) * height * 3); \
-       return size; \
-}
-
-#define setup_image_size_UYVY(width, height) { \
-       int size=0; \
-       size = (MM_UTIL_ROUND_UP_2 (width) * 2 * height); \
-       return size; \
-}
-
-#define setup_image_size_YUYV(width, height) { \
-       int size=0; \
-       size = (MM_UTIL_ROUND_UP_2 (width) * 2 * height); \
-       return size; \
-}
-
-#define setup_image_size_YV12(width, height) { \
-       int size=0; \
-       size = (MM_UTIL_ROUND_UP_4 (width) * MM_UTIL_ROUND_UP_2 (height)+ MM_UTIL_ROUND_UP_8 (width) * MM_UTIL_ROUND_UP_2 (height) / 2); \
-       return size; \
-}
-
-#define setup_image_size_NV12(width, height) { \
-       int size=0; \
-       size = (MM_UTIL_ROUND_UP_4 (width) * MM_UTIL_ROUND_UP_2 (height) *1.5); \
-       return size; \
-}
-
-#define setup_image_size_RGB565(width, height) { \
-       int size=0; \
-       size = (MM_UTIL_ROUND_UP_4 (width * 2) *height); \
-       return size; \
-}
-
-#define setup_image_size_RGB888(width, height) { \
-       int size=0; \
-       size = (MM_UTIL_ROUND_UP_4 (width*3) * height); \
-       return size; \
-}
-
-#define setup_image_size_BGR888(width, height) { \
-       int size=0; \
-       size = (MM_UTIL_ROUND_UP_4 (width*3) * height); \
-       return size; \
-}
-
-static void
-_mm_sink_sample (GstElement * appsink, gpointer user_data)
+static GstFlowReturn
+_mm_sink_sample(GstElement * appsink, gpointer user_data)
 {
        GstBuffer *_buf=NULL;
        GstSample *_sample = NULL;
        gstreamer_s * pGstreamer_s = (gstreamer_s*) user_data;
        _sample = gst_app_sink_pull_sample((GstAppSink*)appsink);
-       _buf = gst_sample_get_buffer(_sample);
-
-       pGstreamer_s->output_buffer = _buf;
-
-       if(pGstreamer_s->output_buffer != NULL) {
-               GstMapInfo mapinfo = GST_MAP_INFO_INIT;
-               gst_buffer_map(pGstreamer_s->output_buffer, &mapinfo, GST_MAP_READ);
-               debug_log("Create Output Buffer: GST_BUFFER_DATA: %p\t GST_BUFFER_SIZE: %d", mapinfo.data, mapinfo.size);
-               gst_buffer_unmap(pGstreamer_s->output_buffer, &mapinfo);
-       } else {
-               debug_error("ERROR -Input Prepare Buffer! Check createoutput buffer function");
+       if (_sample) {
+               _buf = gst_sample_get_buffer(_sample);
+
+               pGstreamer_s->output_buffer = _buf;
+
+               if(pGstreamer_s->output_buffer != NULL) {
+                       GstMapInfo mapinfo = GST_MAP_INFO_INIT;
+                       gst_buffer_map(pGstreamer_s->output_buffer, &mapinfo, GST_MAP_READ);
+                       gstcs_debug("Create Output Buffer: GST_BUFFER_DATA: %p\t GST_BUFFER_SIZE: %d", mapinfo.data, mapinfo.size);
+                       gst_buffer_unmap(pGstreamer_s->output_buffer, &mapinfo);
+               } else {
+                       gstcs_error("ERROR -Input Prepare Buffer! Check createoutput buffer function");
+               }
        }
 
-       pGstreamer_s->outbuf_available = TRUE;
-
        gst_buffer_ref (pGstreamer_s->output_buffer); /* when you want to avoid flushing */
        gst_sample_unref(_sample);
+
+       return GST_FLOW_OK;
+}
+
+static gboolean
+_mm_on_src_message(GstBus * bus, GstMessage * message, gpointer user_data)
+{
+       gstreamer_s * pGstreamer_s = (gstreamer_s*) user_data;
+       switch (GST_MESSAGE_TYPE (message)) {
+       case GST_MESSAGE_EOS: {
+               gstcs_debug("The source got dry");
+               gst_app_src_end_of_stream(GST_APP_SRC(pGstreamer_s->appsrc));
+               g_main_context_pop_thread_default(pGstreamer_s->context);
+               g_main_loop_quit (pGstreamer_s->loop);
+               break;
+               }
+       case GST_MESSAGE_ERROR: {
+               GError *err = NULL;
+               gchar *dbg_info = NULL;
+
+               gst_message_parse_error (message, &err, &dbg_info);
+               gstcs_error ("ERROR from element %s: %s\n", GST_OBJECT_NAME (message->src), err->message);
+               gstcs_error ("Debugging info: %s\n", (dbg_info) ? dbg_info : "none");
+               g_error_free (err);
+               g_free (dbg_info);
+               g_main_context_pop_thread_default(pGstreamer_s->context);
+               g_main_loop_quit (pGstreamer_s->loop);
+               gstcs_debug("Quit GST_CS\n");
+               break;
+               }
+       default:
+               break;
+       }
+       return TRUE;
+}
+
+static int
+_mm_get_byte_per_pixcel(const char *__format_label)
+{
+       int byte_per_pixcel = 1;
+       if (strcmp(__format_label, "RGB565") == 0) {
+               byte_per_pixcel = 2;
+       } else if (strcmp(__format_label, "RGB888") == 0 ||
+               strcmp(__format_label, "BGR888") == 0) {
+               byte_per_pixcel = 3;
+       } else if (strcmp(__format_label, "RGBA8888") == 0 ||
+               strcmp(__format_label, "ARGB8888") == 0 ||
+               strcmp(__format_label, "BGRA8888") == 0 ||
+               strcmp(__format_label, "ABGR8888") == 0 ||
+               strcmp(__format_label, "RGBX") == 0 ||
+               strcmp(__format_label, "XRGB") == 0 ||
+               strcmp(__format_label, "BGRX") == 0 ||
+               strcmp(__format_label, "XBGR") == 0) {
+               byte_per_pixcel = 4;
+       }
+
+       gstcs_debug("byte per pixcel : %d", byte_per_pixcel);
+
+       return byte_per_pixcel;
 }
 
 static int
@@ -122,95 +120,43 @@ _mm_create_pipeline( gstreamer_s* pGstreamer_s)
        int ret = MM_ERROR_NONE;
        pGstreamer_s->pipeline= gst_pipeline_new ("videoconvert");
        if (!pGstreamer_s->pipeline) {
-               debug_error("pipeline could not be created. Exiting.\n");
+               gstcs_error("pipeline could not be created. Exiting.\n");
                ret = MM_ERROR_IMAGE_INVALID_VALUE;
        }
        pGstreamer_s->appsrc= gst_element_factory_make("appsrc","appsrc");
        if (!pGstreamer_s->appsrc) {
-               debug_error("appsrc could not be created. Exiting.\n");
+               gstcs_error("appsrc could not be created. Exiting.\n");
                ret = MM_ERROR_IMAGE_INVALID_VALUE;
        }
-       pGstreamer_s->colorspace=gst_element_factory_make("videoconvert","colorconverter");
+       pGstreamer_s->colorspace=gst_element_factory_make("videoconvert","colorspace");
        if (!pGstreamer_s->colorspace) {
-               debug_error("colorspace could not be created. Exiting.\n");
+               gstcs_error("colorspace could not be created. Exiting.\n");
                ret = MM_ERROR_IMAGE_INVALID_VALUE;
        }
        pGstreamer_s->videoscale=gst_element_factory_make("videoscale", "scale");
        if (!pGstreamer_s->videoscale) {
-               debug_error("videoscale could not be created. Exiting.\n");
+               gstcs_error("videoscale could not be created. Exiting.\n");
                ret = MM_ERROR_IMAGE_INVALID_VALUE;
        }
        pGstreamer_s->videoflip=gst_element_factory_make("videoflip", "flip");
        if (!pGstreamer_s->videoflip) {
-               debug_error("videoflip could not be created. Exiting.\n");
+               gstcs_error("videoflip could not be created. Exiting.\n");
                ret = MM_ERROR_IMAGE_INVALID_VALUE;
        }
        pGstreamer_s->appsink=gst_element_factory_make("appsink","appsink");
        if (!pGstreamer_s->appsink) {
-               debug_error("appsink could not be created. Exiting.\n");
+               gstcs_error("appsink could not be created. Exiting.\n");
                ret = MM_ERROR_IMAGE_INVALID_VALUE;
        }
-       pGstreamer_s->outbuf_available = FALSE;
-
        return ret;
 }
 
-static gboolean
-_mm_check_resize_format(int src_width, int src_height, int dst_width, int dst_height)
-{
-       gboolean _bool=FALSE;
-
-       if( (src_width != dst_width) || (src_height != dst_height) ) {
-               _bool = TRUE;
+static void _mm_destroy_notify(gpointer data) {
+       unsigned char *_data = (unsigned char *)data;
+       if (_data != NULL) {
+               free(_data);
+               _data = NULL;
        }
-
-       return _bool;
-}
-
-static gboolean
-_mm_check_rotate_format(int GstVideoFlipMethod)
-{
-       gboolean _bool=FALSE;
-
-       if((GstVideoFlipMethod >= 1) && ( GstVideoFlipMethod<= 7)) {
-               _bool = TRUE;
-       }
-
-       return _bool;
-}
-
-static gboolean
-_mm_check_resize_format_label(char* __format_label)
-{
-       gboolean _bool = FALSE;
-
-       if(strcmp(__format_label, "AYUV") == 0
-               || strcmp(__format_label, "UYVY") == 0 ||strcmp(__format_label, "Y800") == 0 || strcmp(__format_label, "I420") == 0 || strcmp(__format_label, "YV12") == 0
-               || strcmp(__format_label, "RGB888") == 0 || strcmp(__format_label, "RGB565") == 0 || strcmp(__format_label, "BGR888") == 0 || strcmp(__format_label, "RGBA8888") == 0
-               || strcmp(__format_label, "ARGB8888") == 0 ||strcmp(__format_label, "BGRA8888") == 0 ||strcmp(__format_label, "ABGR8888") == 0 ||strcmp(__format_label, "RGBX") == 0
-               ||strcmp(__format_label, "XRGB") == 0 ||strcmp(__format_label, "BGRX") == 0 ||strcmp(__format_label, "XBGR") == 0 ||strcmp(__format_label, "Y444") == 0
-               ||strcmp(__format_label, "Y42B") == 0 ||strcmp(__format_label, "YUY2") == 0 ||strcmp(__format_label, "YUYV") == 0 ||strcmp(__format_label, "UYVY") == 0
-               ||strcmp(__format_label, "Y41B") == 0 ||strcmp(__format_label, "Y16") == 0 ||strcmp(__format_label, "Y800") == 0 ||strcmp(__format_label, "Y8") == 0
-               ||strcmp(__format_label, "GREY") == 0 ||strcmp(__format_label, "AY64") == 0 || strcmp(__format_label, "YUV422") == 0) {
-
-               _bool=TRUE;
-       }
-
-       return _bool;
-}
-
-static gboolean
-_mm_check_rotate_format_label(const char* __format_label)
-{
-       gboolean _bool = FALSE;
-
-       if(strcmp(__format_label, "I420") == 0 ||strcmp(__format_label, "YV12") == 0 || strcmp(__format_label, "IYUV")
-               || strcmp(__format_label, "RGB888") ||strcmp(__format_label, "BGR888") == 0 ||strcmp(__format_label, "RGBA8888") == 0
-               || strcmp(__format_label, "ARGB8888") == 0 ||strcmp(__format_label, "BGRA8888") == 0 ||strcmp(__format_label, "ABGR8888") == 0 ) {
-               _bool=TRUE;
-       }
-
-       return _bool;
 }
 
 static void
@@ -218,7 +164,7 @@ _mm_check_caps_format(GstCaps* caps)
 {
        GstStructure *caps_structure = gst_caps_get_structure (caps, 0);
        const gchar* formatInfo = gst_structure_get_string (caps_structure, "format");
-       debug_log("[%d] caps: %s", GST_IS_CAPS(caps), formatInfo);
+       gstcs_debug("[%d] caps: %s", GST_IS_CAPS(caps), formatInfo);
 }
 
 static void
@@ -229,34 +175,35 @@ _mm_link_pipeline(gstreamer_s* pGstreamer_s, image_format_s* input_format, image
        gst_app_sink_set_caps(GST_APP_SINK(pGstreamer_s->appsink), output_format->caps); /*g_object_set(pGstreamer_s->appsink, "caps", output_format->caps, NULL); */
        gst_bin_add_many(GST_BIN(pGstreamer_s->pipeline), pGstreamer_s->appsrc, pGstreamer_s->colorspace, pGstreamer_s->videoscale, pGstreamer_s->videoflip, pGstreamer_s->appsink, NULL);
        if(!gst_element_link_many(pGstreamer_s->appsrc, pGstreamer_s->colorspace, pGstreamer_s->videoscale, pGstreamer_s->videoflip, pGstreamer_s->appsink, NULL)) {
-               debug_error("Fail to link pipeline");
+               gstcs_error("Fail to link pipeline");
        } else {
-               debug_log("Success to link pipeline");
+               gstcs_debug("Success to link pipeline");
        }
-       
+
        g_object_set (G_OBJECT (pGstreamer_s->appsrc), "stream-type", 0, "format", GST_FORMAT_TIME, NULL);
        g_object_set(pGstreamer_s->appsrc, "num-buffers", 1, NULL);
        g_object_set(pGstreamer_s->appsrc, "is-live", TRUE, NULL); /* add because of gstreamer_s time issue */
 
        g_object_set(pGstreamer_s->videoflip, "method", value, NULL ); /* GST_VIDEO_FLIP_METHOD_IDENTITY (0): none- Identity (no rotation) (1): clockwise - Rotate clockwise 90 degrees (2): rotate-180 - Rotate 180 degrees (3): counterclockwise - Rotate counter-clockwise 90 degrees (4): horizontal-flip - Flip horizontally (5): vertical-flip - Flip vertically (6): upper-left-diagonal - Flip across upper left/lower right diagonal (7): upper-right-diagonal - Flip across upper right/lower left diagonal */
 
-       g_object_set(pGstreamer_s->appsink, "drop", TRUE, NULL);
+       /*g_object_set(pGstreamer_s->appsink, "drop", TRUE, NULL);*/
        g_object_set(pGstreamer_s->appsink, "emit-signals", TRUE, "sync", FALSE, NULL);
 }
 
 static void
-_mm_set_image_format_s_capabilities(image_format_s* __format) /*_format_label: I420 _colorsapace: YUV */
+_mm_set_image_input_format_s_capabilities(image_format_s* __format) /*_format_label: I420 _colorsapace: YUV */
 {
        char _format_name[sizeof(GST_VIDEO_FORMATS_ALL)] = {'\0'};
        GstVideoFormat videoFormat;
        int _bpp=0; int _depth=0; int _red_mask=0; int _green_mask=0; int _blue_mask=0; int _alpha_mask=0; int _endianness=0;
 
        if(__format == NULL) {
-               debug_error("Image format is NULL\n");
+               gstcs_error("Image format is NULL\n");
                return;
        }
 
-       debug_log("colorspace: %s(%d)\n", __format->colorspace, strlen(__format->colorspace));
+       gstcs_debug("colorspace: %s(%d)\n", __format->colorspace, strlen(__format->colorspace));
+       memset(_format_name, 0, sizeof(_format_name));
 
        if(strcmp(__format->colorspace,"YUV") == 0) {
                if(strcmp(__format->format_label,"I420") == 0
@@ -269,7 +216,7 @@ _mm_set_image_format_s_capabilities(image_format_s* __format) /*_format_label: I
                }else if(strcmp(__format->format_label,"YUYV") == 0) {
                        strncpy(_format_name, "YVYU", sizeof(GST_VIDEO_FORMATS_ALL)-1);
                }
-
+               gstcs_debug("Chosen video format: %s", _format_name);
                __format->caps = gst_caps_new_simple ("video/x-raw",
                        "format", G_TYPE_STRING, _format_name,
                        "framerate", GST_TYPE_FRACTION, 25, 1,
@@ -292,7 +239,98 @@ _mm_set_image_format_s_capabilities(image_format_s* __format) /*_format_label: I
                }
 
                videoFormat = gst_video_format_from_masks(_depth, _bpp, _endianness, _red_mask, _green_mask, _blue_mask, 0);
-               debug_log("Chosen video format: %s", gst_video_format_to_string(videoFormat));
+               gstcs_debug("Chosen video format: %s", gst_video_format_to_string(videoFormat));
+
+               __format->caps = gst_caps_new_simple ("video/x-raw",
+                       "format", G_TYPE_STRING, gst_video_format_to_string(videoFormat),
+                       "width", G_TYPE_INT, __format->stride,
+                       "height", G_TYPE_INT, __format->elevation,
+                       "framerate", GST_TYPE_FRACTION, 1, 1, NULL);
+       }
+
+       else if(strcmp(__format->colorspace,"RGBA") ==0) {
+               if(strcmp(__format->format_label,"ARGB8888") == 0) { /*[Low Arrary Address] ARGBARGB... [High Array Address]*/
+                       gstcs_debug("ARGB8888");
+                       _bpp=32; _depth=32; _red_mask=16711680; _green_mask=65280; _blue_mask=255; _alpha_mask=-16777216; _endianness=4321;
+               }else if(strcmp(__format->format_label,"BGRA8888") == 0) { /*[Low Arrary Address] BGRABGRA...[High Array Address]*/
+                       gstcs_debug("BGRA8888");
+                       _bpp=32; _depth=32; _red_mask=65280; _green_mask=16711680; _blue_mask=-16777216; _alpha_mask=255; _endianness=4321;
+               }else if(strcmp(__format->format_label,"RGBA8888") == 0) { /*[Low Arrary Address] RGBARGBA...[High Array Address]*/
+                       gstcs_debug("RGBA8888");
+                       _bpp=32; _depth=32; _red_mask=-16777216; _green_mask=16711680; _blue_mask=65280; _alpha_mask=255; _endianness=4321;
+               }else if(strcmp(__format->format_label,"ABGR8888") == 0) { /*[Low Arrary Address] ABGRABGR...[High Array Address]*/
+                       gstcs_debug("ABGR8888");
+                       _bpp=32; _depth=32; _red_mask=255; _green_mask=65280; _blue_mask=16711680; _alpha_mask=-16777216; _endianness=4321;
+               }else {
+                       gstcs_error("***Wrong format cs type***\n");
+               }
+
+               videoFormat = gst_video_format_from_masks(_depth, _bpp, _endianness, _red_mask, _green_mask, _blue_mask, _alpha_mask);
+               gstcs_debug("Chosen video format: %s", gst_video_format_to_string(videoFormat));
+
+               __format->caps = gst_caps_new_simple ("video/x-raw",
+                       "format", G_TYPE_STRING, gst_video_format_to_string(videoFormat),
+                       "width", G_TYPE_INT, __format->width,
+                       "height", G_TYPE_INT, __format->elevation,
+                       "framerate", GST_TYPE_FRACTION, 1, 1, NULL);
+       }
+
+       if(__format->caps) {
+               gstcs_debug("###__format->caps is not NULL###, %p", __format->caps);
+               _mm_check_caps_format(__format->caps);
+       }else {
+               gstcs_error("__format->caps is NULL");
+       }
+}
+
+static void
+_mm_set_image_output_format_s_capabilities(image_format_s* __format) /*_format_label: I420 _colorsapace: YUV */
+{
+       char _format_name[sizeof(GST_VIDEO_FORMATS_ALL)] = {'\0'};
+       GstVideoFormat videoFormat;
+       int _bpp=0; int _depth=0; int _red_mask=0; int _green_mask=0; int _blue_mask=0; int _alpha_mask=0; int _endianness=0;
+
+       if(__format == NULL) {
+               gstcs_error("Image format is NULL\n");
+               return;
+       }
+
+       gstcs_debug("colorspace: %s(%d), w: %d, h: %d\n", __format->colorspace, strlen(__format->colorspace), __format->width, __format->height);
+       memset(_format_name, 0, sizeof(_format_name));
+
+       if(strcmp(__format->colorspace,"YUV") == 0) {
+               if(strcmp(__format->format_label,"I420") == 0
+               || strcmp(__format->format_label,"Y42B") == 0
+               || strcmp(__format->format_label,"Y444") == 0
+               || strcmp(__format->format_label,"YV12") == 0
+               || strcmp(__format->format_label,"NV12") == 0
+               || strcmp(__format->format_label,"UYVY") == 0) {
+                       strncpy(_format_name, __format->format_label, sizeof(GST_VIDEO_FORMATS_ALL)-1);
+               }else if(strcmp(__format->format_label,"YUYV") == 0) {
+                       strncpy(_format_name, "YVYU", sizeof(GST_VIDEO_FORMATS_ALL)-1);
+               }
+               gstcs_debug("Chosen video format: %s", _format_name);
+               __format->caps = gst_caps_new_simple ("video/x-raw",
+                       "format", G_TYPE_STRING, _format_name,
+                       "width", G_TYPE_INT, __format->width,
+                       "height", G_TYPE_INT, __format->height,
+                       "framerate", GST_TYPE_FRACTION, 1, 1,
+                       NULL);
+       }
+
+       else if(strcmp(__format->colorspace,"RGB") ==0 || strcmp(__format->colorspace,"BGRX") ==0) {
+               if(strcmp(__format->format_label,"RGB888") == 0) {
+                       _bpp=24; _depth=24; _red_mask=16711680; _green_mask=65280; _blue_mask=255; _endianness=4321;
+               }else if(strcmp(__format->format_label,"BGR888") == 0) {
+                       _bpp=24; _depth=24; _red_mask=255; _green_mask=65280; _blue_mask=16711680; _endianness=4321;
+               }else if(strcmp(__format->format_label,"RGB565") == 0) {
+                       _bpp=16; _depth=16; _red_mask=63488; _green_mask=2016; _blue_mask=31; _endianness=1234;
+               }else if( (strcmp(__format->format_label, "BGRX") == 0)) {
+                       _bpp=32; _depth=24; _red_mask=65280; _green_mask=16711680; _blue_mask=-16777216; _endianness=4321;
+               }
+
+               videoFormat = gst_video_format_from_masks(_depth, _bpp, _endianness, _red_mask, _green_mask, _blue_mask, 0);
+               gstcs_debug("Chosen video format: %s", gst_video_format_to_string(videoFormat));
 
                __format->caps = gst_caps_new_simple ("video/x-raw",
                        "format", G_TYPE_STRING, gst_video_format_to_string(videoFormat),
@@ -303,23 +341,23 @@ _mm_set_image_format_s_capabilities(image_format_s* __format) /*_format_label: I
 
        else if(strcmp(__format->colorspace,"RGBA") ==0) {
                if(strcmp(__format->format_label,"ARGB8888") == 0) { /*[Low Arrary Address] ARGBARGB... [High Array Address]*/
-                       debug_log("ARGB8888");
+                       gstcs_debug("ARGB8888");
                        _bpp=32; _depth=32; _red_mask=16711680; _green_mask=65280; _blue_mask=255; _alpha_mask=-16777216; _endianness=4321;
                }else if(strcmp(__format->format_label,"BGRA8888") == 0) { /*[Low Arrary Address] BGRABGRA...[High Array Address]*/
-                       debug_log("BGRA8888");
+                       gstcs_debug("BGRA8888");
                        _bpp=32; _depth=32; _red_mask=65280; _green_mask=16711680; _blue_mask=-16777216; _alpha_mask=255; _endianness=4321;
                }else if(strcmp(__format->format_label,"RGBA8888") == 0) { /*[Low Arrary Address] RGBARGBA...[High Array Address]*/
-                       debug_log("RGBA8888");
+                       gstcs_debug("RGBA8888");
                        _bpp=32; _depth=32; _red_mask=-16777216; _green_mask=16711680; _blue_mask=65280; _alpha_mask=255; _endianness=4321;
                }else if(strcmp(__format->format_label,"ABGR8888") == 0) { /*[Low Arrary Address] ABGRABGR...[High Array Address]*/
-                       debug_log("ABGR8888");
+                       gstcs_debug("ABGR8888");
                        _bpp=32; _depth=32; _red_mask=255; _green_mask=65280; _blue_mask=16711680; _alpha_mask=-16777216; _endianness=4321;
                }else {
-                       debug_error("***Wrong format cs type***\n");
+                       gstcs_error("***Wrong format cs type***\n");
                }
 
                videoFormat = gst_video_format_from_masks(_depth, _bpp, _endianness, _red_mask, _green_mask, _blue_mask, _alpha_mask);
-               debug_log("Chosen video format: %s", gst_video_format_to_string(videoFormat));
+               gstcs_debug("Chosen video format: %s", gst_video_format_to_string(videoFormat));
 
                __format->caps = gst_caps_new_simple ("video/x-raw",
                        "format", G_TYPE_STRING, gst_video_format_to_string(videoFormat),
@@ -329,21 +367,21 @@ _mm_set_image_format_s_capabilities(image_format_s* __format) /*_format_label: I
        }
 
        if(__format->caps) {
-               debug_log("###__format->caps is not NULL###, %p", __format->caps);
+               gstcs_debug("###__format->caps is not NULL###, %p", __format->caps);
                _mm_check_caps_format(__format->caps);
        }else {
-               debug_error("__format->caps is NULL");
+               gstcs_error("__format->caps is NULL");
        }
 }
 
 static void
 _mm_set_image_colorspace( image_format_s* __format)
 {
-       debug_log("format_label: %s\n", __format->format_label);
+       gstcs_debug("format_label: %s\n", __format->format_label);
 
        __format->colorspace = (char*)malloc(sizeof(char) * IMAGE_FORMAT_LABEL_BUFFER_SIZE);
        if (__format->colorspace == NULL) {
-               debug_error("memory allocation failed");
+               gstcs_error("memory allocation failed");
                return;
        }
        memset(__format->colorspace, 0, IMAGE_FORMAT_LABEL_BUFFER_SIZE);
@@ -357,11 +395,27 @@ _mm_set_image_colorspace( image_format_s* __format)
        }else if( (strcmp(__format->format_label, "BGRX") == 0)) {
                strncpy(__format->colorspace, "BGRX", IMAGE_FORMAT_LABEL_BUFFER_SIZE-1);
        }else {
-               debug_error("Check your colorspace format label");
+               gstcs_error("Check your colorspace format label");
                GSTCS_FREE(__format->colorspace);
        }
 }
 
+static void
+_mm_round_up_input_image_widh_height(image_format_s* pFormat)
+{
+       if(strcmp(pFormat->colorspace,"YUV") == 0) {
+               pFormat->stride = MM_UTIL_ROUND_UP_8(pFormat->width);
+               pFormat->elevation = MM_UTIL_ROUND_UP_2(pFormat->height);
+       } else if(strcmp(pFormat->colorspace, "RGB") == 0) {
+               pFormat->stride = MM_UTIL_ROUND_UP_4(pFormat->width);
+               pFormat->elevation = MM_UTIL_ROUND_UP_2(pFormat->height);
+       } else if (strcmp(pFormat->colorspace,"RGBA") == 0){
+               pFormat->stride = pFormat->width;
+               pFormat->elevation = MM_UTIL_ROUND_UP_2(pFormat->height);
+       }
+       gstcs_debug("input_format stride: %d, elevation: %d", pFormat->stride, pFormat->elevation);
+}
+
 static image_format_s*
 _mm_set_input_image_format_s_struct(imgp_info_s* pImgp_info) /* char* __format_label, int __width, int __height) */
 {
@@ -369,59 +423,69 @@ _mm_set_input_image_format_s_struct(imgp_info_s* pImgp_info) /* char* __format_l
 
        __format=(image_format_s*)malloc(sizeof(image_format_s));
        if (__format == NULL) {
-               debug_error("memory allocation failed");
+               gstcs_error("memory allocation failed");
                return NULL;
        }
        memset(__format, 0, sizeof(image_format_s));
 
        __format->format_label = (char *)malloc(sizeof(char) * IMAGE_FORMAT_LABEL_BUFFER_SIZE);
        if (__format->format_label == NULL) {
-               debug_error("memory allocation failed");
+               gstcs_error("memory allocation failed");
                GSTCS_FREE(__format);
                return NULL;
        }
        memset(__format->format_label, 0, IMAGE_FORMAT_LABEL_BUFFER_SIZE);
        strncpy(__format->format_label, pImgp_info->input_format_label, strlen(pImgp_info->input_format_label));
-       debug_log("input_format_label: %s\n", pImgp_info->input_format_label);
+       gstcs_debug("input_format_label: %s\n", pImgp_info->input_format_label);
        _mm_set_image_colorspace(__format);
 
        __format->width=pImgp_info->src_width;
        __format->height=pImgp_info->src_height;
+       _mm_round_up_input_image_widh_height(__format);
 
        __format->blocksize = mm_setup_image_size(pImgp_info->input_format_label, pImgp_info->src_width, pImgp_info->src_height);
-       debug_log("blocksize: %d\n", __format->blocksize);
-       _mm_set_image_format_s_capabilities(__format);
+       gstcs_debug("blocksize: %d\n", __format->blocksize);
+       _mm_set_image_input_format_s_capabilities(__format);
 
        return __format;
 }
 
 static void
-_mm_round_up_output_image_widh_height(image_format_s* pFormat)
+_mm_round_up_output_image_widh_height(image_format_s* pFormat, const image_format_s *input_format)
 {
-       if(strcmp(pFormat->colorspace,"YUV") ==0) {
-               pFormat->stride=MM_UTIL_ROUND_UP_8(pFormat->width);
-               pFormat->elevation=MM_UTIL_ROUND_UP_2(pFormat->height);
-       } else if(strcmp(pFormat->colorspace, "RGB") ==0) {
-               pFormat->stride=MM_UTIL_ROUND_UP_4(pFormat->width);
-               pFormat->elevation=MM_UTIL_ROUND_UP_2(pFormat->height);
-       }
+       if(strcmp(pFormat->colorspace,"YUV") == 0) {
+               pFormat->stride = MM_UTIL_ROUND_UP_8(pFormat->width);
+               pFormat->elevation = MM_UTIL_ROUND_UP_2(pFormat->height);
+       } else if(strcmp(pFormat->colorspace, "RGB") == 0) {
+               pFormat->stride = MM_UTIL_ROUND_UP_4(pFormat->width);
+               pFormat->elevation = MM_UTIL_ROUND_UP_2(pFormat->height);
+               pFormat->width = pFormat->stride;
+               if (input_format->height != input_format->elevation)
+                       pFormat->height = pFormat->elevation;
+       } else if (strcmp(pFormat->colorspace,"RGBA") == 0){
+               pFormat->stride = pFormat->width;
+               pFormat->elevation = MM_UTIL_ROUND_UP_2(pFormat->height);
+               if (input_format->height != input_format->elevation)
+                       pFormat->height = pFormat->elevation;
+       }
+       gstcs_debug("output_format stride: %d, elevation: %d", pFormat->stride, pFormat->elevation);
 }
 
 static image_format_s*
-_mm_set_output_image_format_s_struct(imgp_info_s* pImgp_info)
+_mm_set_output_image_format_s_struct(imgp_info_s* pImgp_info, const image_format_s *input_format)
 {
        image_format_s* __format = NULL;
 
        __format=(image_format_s*)malloc(sizeof(image_format_s));
        if (__format == NULL) {
-               debug_error("memory allocation failed");
+               gstcs_error("memory allocation failed");
                return NULL;
        }
        memset(__format, 0, sizeof(image_format_s));
 
        __format->format_label = (char *)malloc(sizeof(char) * IMAGE_FORMAT_LABEL_BUFFER_SIZE);
        if (__format->format_label == NULL) {
-               debug_error("memory allocation failed");
+               gstcs_error("memory allocation failed");
                GSTCS_FREE(__format);
                return NULL;
        }
@@ -431,11 +495,14 @@ _mm_set_output_image_format_s_struct(imgp_info_s* pImgp_info)
 
        __format->width=pImgp_info->dst_width;
        __format->height=pImgp_info->dst_height;
-       _mm_round_up_output_image_widh_height(__format);
+       _mm_round_up_output_image_widh_height(__format, input_format);
+
+       pImgp_info->output_stride = __format->stride;
+       pImgp_info->output_elevation = __format->elevation;
 
        __format->blocksize = mm_setup_image_size(pImgp_info->output_format_label, pImgp_info->dst_width, pImgp_info->dst_height);
-       debug_log("output_format_label: %s", pImgp_info->output_format_label);
-       _mm_set_image_format_s_capabilities(__format);
+       gstcs_debug("output_format_label: %s", pImgp_info->output_format_label);
+       _mm_set_image_output_format_s_capabilities(__format);
        return __format;
 }
 
@@ -445,7 +512,7 @@ _mm_push_buffer_into_pipeline(imgp_info_s* pImgp_info, unsigned char *src, gstre
        int ret = MM_ERROR_NONE;
 
        if(pGstreamer_s->pipeline == NULL) {
-               debug_error("pipeline is NULL\n");
+               gstcs_error("pipeline is NULL\n");
                return MM_ERROR_IMAGE_INVALID_VALUE;
        }
 
@@ -453,7 +520,7 @@ _mm_push_buffer_into_pipeline(imgp_info_s* pImgp_info, unsigned char *src, gstre
        GstBuffer* gst_buf = gst_buffer_new_wrapped_full(GST_MEMORY_FLAG_READONLY, src, data_size, 0, data_size, NULL, NULL);
 
        if(gst_buf==NULL) {
-               debug_error("buffer is NULL\n");
+               gstcs_error("buffer is NULL\n");
                return MM_ERROR_IMAGE_INVALID_VALUE;
        }
 
@@ -461,6 +528,59 @@ _mm_push_buffer_into_pipeline(imgp_info_s* pImgp_info, unsigned char *src, gstre
        return ret;
 }
 
+static int
+_mm_push_buffer_into_pipeline_new(image_format_s *input_format, image_format_s *output_format, unsigned char *src, gstreamer_s * pGstreamer_s)
+{
+       int ret = MM_ERROR_NONE;
+       GstBuffer *gst_buf = NULL;
+       unsigned int src_size = 0;
+       unsigned char *data = NULL;
+       unsigned int stride = input_format->stride;
+       unsigned int elevation = input_format->elevation;
+
+       if(pGstreamer_s->pipeline == NULL) {
+               gstcs_error("pipeline is NULL\n");
+               return MM_ERROR_IMAGE_INVALID_VALUE;
+       }
+
+       gstcs_debug("stride: %d, elevation: %d", stride, elevation);
+       src_size = mm_setup_image_size(input_format->format_label, stride, elevation);
+       gstcs_debug("buffer size (src): %d", src_size);
+
+       int byte_per_pixcel = _mm_get_byte_per_pixcel(input_format->format_label);
+       unsigned int src_row = input_format->width * byte_per_pixcel;
+       unsigned int stride_row = stride * byte_per_pixcel;
+       unsigned int i = 0, y = 0;
+       gstcs_debug("padding will be inserted to buffer");
+       data =(unsigned char *) g_malloc (src_size);
+       if(data==NULL) {
+               gstcs_error("app_buffer is NULL\n");
+               return MM_ERROR_IMAGE_INVALID_VALUE;
+       }
+       for (y = 0; y < (unsigned int)(input_format->height); y++) {
+               guint8 *pLine = (guint8 *) &(src[src_row * y]);
+               for(i = 0; i < src_row; i++) {
+                       data[y * stride_row + i] = pLine[i];
+               }
+               for(i = src_row; i < stride_row; i++) {
+                       data[y * stride_row + i] = 0x00;
+               }
+       }
+       for (y = (unsigned int)(input_format->height); y < (unsigned int)(input_format->elevation); y++) {
+               for(i = 0; i < stride_row; i++) {
+                       data[y * stride_row + i] = 0x00;
+               }
+       }
+       gst_buf = gst_buffer_new_wrapped_full(GST_MEMORY_FLAG_READONLY, data, src_size, 0, src_size, data, _mm_destroy_notify);
+
+       if(gst_buf==NULL) {
+               gstcs_error("buffer is NULL\n");
+               return MM_ERROR_IMAGE_INVALID_VALUE;
+       }
+
+       gst_app_src_push_buffer (GST_APP_SRC (pGstreamer_s->appsrc), gst_buf); /* push buffer to pipeline */
+       return ret;
+}
 
 static int
 _mm_imgp_gstcs_processing( gstreamer_s* pGstreamer_s, unsigned char *src, unsigned char *dst, image_format_s* input_format, image_format_s* output_format, imgp_info_s* pImgp_info)
@@ -468,120 +588,143 @@ _mm_imgp_gstcs_processing( gstreamer_s* pGstreamer_s, unsigned char *src, unsign
        GstBus *bus = NULL;
        GstStateChangeReturn ret_state;
        int ret = MM_ERROR_NONE;
-       int i = 0;
 
        if(src== NULL || dst == NULL) {
-               debug_error("src || dst is NULL");
+               gstcs_error("src || dst is NULL");
                return MM_ERROR_IMAGE_INVALID_VALUE;
        }
 
        /*create pipeline*/
        ret = _mm_create_pipeline(pGstreamer_s);
        if(ret != MM_ERROR_NONE) {
-               debug_error("ERROR - mm_create_pipeline ");
+               gstcs_error("ERROR - mm_create_pipeline ");
        }
 
+       pGstreamer_s->context = g_main_context_new();
+       if (pGstreamer_s->context == NULL) {
+               gstcs_error("ERROR - g_main_context_new ");
+               gst_object_unref (pGstreamer_s->pipeline);
+               g_free (pGstreamer_s);
+               return MM_ERROR_IMAGE_INTERNAL;
+       }
+       pGstreamer_s->loop = g_main_loop_new (pGstreamer_s->context, FALSE);
+       if (pGstreamer_s->loop == NULL) {
+               gstcs_error("ERROR - g_main_loop_new ");
+               gst_object_unref (pGstreamer_s->pipeline);
+               g_main_context_unref(pGstreamer_s->context);
+               g_free (pGstreamer_s);
+               return MM_ERROR_IMAGE_INTERNAL;
+       }
+
+       g_main_context_push_thread_default(pGstreamer_s->context);
 
        /* Make appsink emit the "new-preroll" and "new-sample" signals. This option is by default disabled because signal emission is expensive and unneeded when the application prefers to operate in pull mode. */
        gst_app_sink_set_emit_signals ((GstAppSink*)pGstreamer_s->appsink, TRUE);
 
-       bus = gst_pipeline_get_bus (GST_PIPELINE (pGstreamer_s->pipeline)); /* GST_PIPELINE (pipeline)); */
+       bus = gst_pipeline_get_bus (GST_PIPELINE (pGstreamer_s->pipeline));
+       gst_bus_add_watch (bus, (GstBusFunc) _mm_on_src_message, pGstreamer_s);
        gst_object_unref(bus);
 
-       debug_log("Start mm_push_buffer_into_pipeline");
-       ret = _mm_push_buffer_into_pipeline(pImgp_info, src, pGstreamer_s);
+       if (((input_format->width != input_format->stride) || (input_format->height != input_format->elevation)) &&
+               ((strcmp(input_format->colorspace, "RGB") == 0) || (strcmp(input_format->colorspace, "RGBA") == 0))) {
+               gstcs_debug("Start _mm_push_buffer_into_pipeline_new");
+               ret = _mm_push_buffer_into_pipeline_new(input_format, output_format, src, pGstreamer_s);
+       } else {
+               gstcs_debug("Start mm_push_buffer_into_pipeline");
+               ret = _mm_push_buffer_into_pipeline(pImgp_info, src, pGstreamer_s);
+       }
        if(ret != MM_ERROR_NONE) {
-               debug_error("ERROR - mm_push_buffer_into_pipeline ");
+               gstcs_error("ERROR - mm_push_buffer_into_pipeline ");
+               gst_object_unref (pGstreamer_s->pipeline);
+               g_main_context_unref(pGstreamer_s->context);
+               g_main_loop_unref(pGstreamer_s->loop);
+               g_free (pGstreamer_s);
+               return ret;
        }
-       debug_log("End mm_push_buffer_into_pipeline");
+       gstcs_debug("End mm_push_buffer_into_pipeline");
 
        /*link pipeline*/
-       debug_log("Start mm_link_pipeline");
+       gstcs_debug("Start mm_link_pipeline");
        _mm_link_pipeline( pGstreamer_s, input_format, output_format, pImgp_info->angle);
-       debug_log("End mm_link_pipeline");
+       gstcs_debug("End mm_link_pipeline");
 
        /* Conecting to the new-sample signal emited by the appsink*/
-       debug_log("Start G_CALLBACK (_mm_sink_sample)");
+       gstcs_debug("Start G_CALLBACK (_mm_sink_sample)");
        g_signal_connect (pGstreamer_s->appsink, "new-sample", G_CALLBACK (_mm_sink_sample), pGstreamer_s);
-       debug_log("End G_CALLBACK (_mm_sink_sample)");
+       gstcs_debug("End G_CALLBACK (_mm_sink_sample)");
 
        /* GST_STATE_PLAYING*/
-       debug_log("Start GST_STATE_PLAYING");
+       gstcs_debug("Start GST_STATE_PLAYING");
        ret_state = gst_element_set_state (pGstreamer_s->pipeline, GST_STATE_PLAYING);
-       debug_log("End GST_STATE_PLAYING ret_state: %d", ret_state);
-
-       do {
-               ret_state = gst_element_get_state (pGstreamer_s->pipeline, NULL, NULL, 10*GST_MSECOND);
-               debug_error("gst_element_get_state ret_state: %d [%d, %d]", ret_state, ++i, pGstreamer_s->outbuf_available);
-                if ((ret_state == GST_STATE_CHANGE_SUCCESS) && (pGstreamer_s->outbuf_available)) {
-                       debug_log("available output buffer & success state chnage");
-                       break;
-                }
-       } while (i < MAX_GET_STATE_COUNT);
-
-       if (i == MAX_GET_STATE_COUNT) {
-               debug_error("Fail GST_STATE_CHANGE");
-               gst_object_unref (pGstreamer_s->pipeline);
-               g_free (pGstreamer_s);
+       gstcs_debug("End GST_STATE_PLAYING ret_state: %d", ret_state);
 
-               return MM_ERROR_IMAGE_INVALID_VALUE;
-       }
+       /*g_main_loop_run*/
+       gstcs_debug("g_main_loop_run");
+       g_main_loop_run (pGstreamer_s->loop);
 
-       debug_log("Sucess GST_STATE_CHANGE");
+       gstcs_debug("Sucess GST_STATE_CHANGE");
 
-       /* error */
-       if (ret_state == GST_STATE_CHANGE_FAILURE) {
-               debug_error("GST_STATE_CHANGE_FAILURE");
-               gst_object_unref (pGstreamer_s->pipeline);
-               g_free (pGstreamer_s);
+       /*GST_STATE_NULL*/
+       gst_element_set_state (pGstreamer_s->pipeline, GST_STATE_NULL);
+       gstcs_debug("End GST_STATE_NULL");
 
-               return MM_ERROR_IMAGE_INVALID_VALUE;
-       }else {
-               debug_log("Set GST_STATE_NULL");
-
-               /*GST_STATE_NULL*/
-               gst_element_set_state (pGstreamer_s->pipeline, GST_STATE_NULL);
-               debug_log("End GST_STATE_NULL");
+       gstcs_debug("###pGstreamer_s->output_buffer### : %p", pGstreamer_s->output_buffer);
 
-               debug_log("###pGstreamer_s->output_buffer### : %p", pGstreamer_s->output_buffer);
+       ret_state = gst_element_get_state (pGstreamer_s->pipeline, NULL, NULL, 1*GST_SECOND);
 
-               ret_state = gst_element_get_state (pGstreamer_s->pipeline, NULL, NULL, GST_CLOCK_TIME_NONE);
-
-               if(ret_state == GST_STATE_CHANGE_SUCCESS) {
-                       debug_log("GST_STATE_NULL ret_state = %d (GST_STATE_CHANGE_SUCCESS)\n", ret_state);
-               }else if( ret_state == GST_STATE_CHANGE_ASYNC) {
-                       debug_log("GST_STATE_NULL ret_state = %d (GST_STATE_CHANGE_ASYNC)\n", ret_state);
-               }
+       if(ret_state == GST_STATE_CHANGE_SUCCESS) {
+               gstcs_debug("GST_STATE_NULL ret_state = %d (GST_STATE_CHANGE_SUCCESS)\n", ret_state);
+       }else if( ret_state == GST_STATE_CHANGE_ASYNC) {
+               gstcs_debug("GST_STATE_NULL ret_state = %d (GST_STATE_CHANGE_ASYNC)\n", ret_state);
+       }
 
-               debug_log("Success gst_element_get_state\n");
+       gstcs_debug("Success gst_element_get_state\n");
 
-               if (ret_state == GST_STATE_CHANGE_FAILURE) {
-                       debug_error("GST_STATE_CHANGE_FAILURE");
-               }else {
-                       if(pGstreamer_s->output_buffer != NULL) {
-                               GstMapInfo mapinfo = GST_MAP_INFO_INIT;
-                               gst_buffer_map(pGstreamer_s->output_buffer, &mapinfo, GST_MAP_READ);
-                               int buffer_size = mapinfo.size;
-                               debug_log("buffer size: %d\n", buffer_size);
-                               if( buffer_size != mm_setup_image_size(pImgp_info->output_format_label, pImgp_info->output_stride, pImgp_info->output_elevation)) {
-                                       debug_log("Buffer size is different stride:%d elevation: %d\n", pImgp_info->output_stride, pImgp_info->output_elevation);
-                               }
-                               debug_log("pGstreamer_s->output_buffer: 0x%2x\n", pGstreamer_s->output_buffer);
-                               memcpy(dst, mapinfo.data, buffer_size);
-                               gst_buffer_unmap(pGstreamer_s->output_buffer, &mapinfo);
-                       }else {
-                               debug_log("pGstreamer_s->output_buffer is NULL");
+       if (ret_state == GST_STATE_CHANGE_FAILURE) {
+               gstcs_error("GST_STATE_CHANGE_FAILURE");
+       } else {
+               if(pGstreamer_s->output_buffer != NULL) {
+                       GstMapInfo mapinfo = GST_MAP_INFO_INIT;
+                       gst_buffer_map(pGstreamer_s->output_buffer, &mapinfo, GST_MAP_READ);
+                       int buffer_size = mapinfo.size;
+                       int calc_buffer_size = 0;
+                       if (((pImgp_info->dst_width != output_format->width) || (pImgp_info->dst_height != output_format->height)) &&
+                               ((strcmp(input_format->colorspace, "RGB") == 0) || (strcmp(input_format->colorspace, "RGBA") == 0))) {
+                               gstcs_debug("calculate image size with stride & elevation");
+                               calc_buffer_size = mm_setup_image_size(pImgp_info->output_format_label, output_format->width, output_format->height);
+                       } else {
+                               calc_buffer_size = mm_setup_image_size(pImgp_info->output_format_label, pImgp_info->dst_width, pImgp_info->dst_height);
+                       }
+                       gstcs_debug("buffer size: %d, calc: %d\n", buffer_size, calc_buffer_size);
+                       if( buffer_size != calc_buffer_size) {
+                               gstcs_debug("Buffer size is different \n");
+                               gstcs_debug("unref output buffer");
+                               gst_buffer_unref (pGstreamer_s->output_buffer);
+                               gst_object_unref (pGstreamer_s->pipeline);
+                               pGstreamer_s->output_buffer = NULL;
+                               g_main_context_unref(pGstreamer_s->context);
+                               g_main_loop_unref(pGstreamer_s->loop);
+                               g_free (pGstreamer_s);
+                               return MM_ERROR_IMAGE_INTERNAL;
                        }
+                       gstcs_debug("pGstreamer_s->output_buffer: 0x%2x\n", pGstreamer_s->output_buffer);
+                       memcpy(dst, mapinfo.data, buffer_size);
+                       pImgp_info->buffer_size = buffer_size;
+                       gst_buffer_unmap(pGstreamer_s->output_buffer, &mapinfo);
+               }else {
+                       gstcs_debug("pGstreamer_s->output_buffer is NULL");
                }
-               gst_buffer_unref (pGstreamer_s->output_buffer);
-               debug_log("unref output buffer");
-               gst_object_unref (pGstreamer_s->pipeline);
-               pGstreamer_s->output_buffer = NULL;
-               g_free (pGstreamer_s);
-
-               debug_log("End gstreamer processing");
        }
-       debug_log("dst: %p", dst);
+       gstcs_debug("unref output buffer");
+       gst_buffer_unref (pGstreamer_s->output_buffer);
+       gst_object_unref (pGstreamer_s->pipeline);
+       pGstreamer_s->output_buffer = NULL;
+       g_main_context_unref(pGstreamer_s->context);
+       g_main_loop_unref(pGstreamer_s->loop);
+       g_free (pGstreamer_s);
+
+       gstcs_debug("End gstreamer processing");
+       gstcs_debug("dst: %p", dst);
        return ret;
 }
 
@@ -592,39 +735,41 @@ mm_setup_image_size(const char* _format_label, int width, int height)
        int size=0;
 
        if(strcmp(_format_label, "I420") == 0) {
-               setup_image_size_I420(width, height); /*width * height *1.5; */
+               size = (MM_UTIL_ROUND_UP_4(width) * MM_UTIL_ROUND_UP_2(height) + MM_UTIL_ROUND_UP_8(width) * MM_UTIL_ROUND_UP_2(height) /2); /*width * height *1.5; */
        }else if(strcmp(_format_label, "Y42B") == 0) {
-               setup_image_size_Y42B(width, height); /*width * height *2; */
+               size = (MM_UTIL_ROUND_UP_4(width) * height + MM_UTIL_ROUND_UP_8(width) * height); /*width * height *2; */
        }else if(strcmp(_format_label, "YUV422") == 0) {
-               setup_image_size_Y42B(width, height); /*width * height *2; */
+               size = (MM_UTIL_ROUND_UP_4(width) * height + MM_UTIL_ROUND_UP_8(width) * height); /*width * height *2; */
        }else if(strcmp(_format_label, "Y444") == 0) {
-               setup_image_size_Y444(width, height); /* width * height *3; */
+               size = (MM_UTIL_ROUND_UP_4(width) * height * 3); /* width * height *3; */
        }else if(strcmp(_format_label, "YV12") == 0) {
-               setup_image_size_YV12(width, height); /* width * height *1; */
+               size = (MM_UTIL_ROUND_UP_4(width) * MM_UTIL_ROUND_UP_2(height)+ MM_UTIL_ROUND_UP_8(width) * MM_UTIL_ROUND_UP_2(height) / 2); /* width * height *1; */
        }else if(strcmp(_format_label, "NV12") == 0) {
-               setup_image_size_NV12(width, height); /* width * height *1.5; */
+               size = (MM_UTIL_ROUND_UP_4(width) * MM_UTIL_ROUND_UP_2(height) * 1.5); /* width * height *1.5; */
        }else if(strcmp(_format_label, "RGB565") == 0) {
-               setup_image_size_RGB565(width, height); /* width * height *2; */
+               size = (MM_UTIL_ROUND_UP_4(width) * 2 * height); /* width * height *2; */
        }else if(strcmp(_format_label, "RGB888") == 0) {
-               setup_image_size_RGB888(width, height); /* width * height *3; */
+               size = (MM_UTIL_ROUND_UP_4(width) * 3 * height); /* width * height *3; */
        }else if(strcmp(_format_label, "BGR888") == 0) {
-               setup_image_size_BGR888(width, height); /* width * height *3; */
+               size = (MM_UTIL_ROUND_UP_4(width) * 3 * height); /* width * height *3; */
        }else if(strcmp(_format_label, "UYVY") == 0) {
-               setup_image_size_UYVY(width, height); /* width * height *2; */
+               size = (MM_UTIL_ROUND_UP_2(width) * 2 * height); /* width * height *2; */
        }else if(strcmp(_format_label, "YUYV") == 0) {
-               setup_image_size_YUYV(width, height); /* width * height *2; */
+               size = (MM_UTIL_ROUND_UP_2(width) * 2 * height); /* width * height *2; */
        }else if(strcmp(_format_label, "ARGB8888") == 0) {
-               size = width * height *4; debug_log("file_size: %d\n", size);
+               size = width * height *4;
        }else if(strcmp(_format_label, "BGRA8888") == 0) {
-               size = width * height *4; debug_log("file_size: %d\n", size);
+               size = width * height *4;
        }else if(strcmp(_format_label, "RGBA8888") == 0) {
-               size = width * height *4; debug_log("file_size: %d\n", size);
+               size = width * height *4;
        }else if(strcmp(_format_label, "ABGR8888") == 0) {
-               size = width * height *4; debug_log("file_size: %d\n", size);
+               size = width * height *4;
        }else if(strcmp(_format_label, "BGRX") == 0) {
-               size = width * height *4; debug_log("file_size: %d\n", size);
+               size = width * height *4;
        }
 
+       gstcs_debug("file_size: %d\n", size);
+
        return size;
 }
 
@@ -637,24 +782,24 @@ _mm_imgp_gstcs(imgp_info_s* pImgp_info, unsigned char *src, unsigned char *dst)
        static const int max_argc = 50;
        gint* argc = NULL;
        gchar** argv = NULL;
+       int i = 0;
 
-       g_type_init();
        if(pImgp_info == NULL) {
-               debug_error("imgp_info_s is NULL");
+               gstcs_error("imgp_info_s is NULL");
                return MM_ERROR_IMAGE_INVALID_VALUE;
        }
 
        if(src== NULL || dst == NULL) {
-               debug_error("src || dst is NULL");
+               gstcs_error("src || dst is NULL");
                return MM_ERROR_IMAGE_INVALID_VALUE;
        }
-       debug_log("[src %p] [dst %p]", src, dst);
+       gstcs_debug("[src %p] [dst %p]", src, dst);
 
        argc = malloc(sizeof(int));
        argv = malloc(sizeof(gchar*) * max_argc);
 
        if (!argc || !argv) {
-               debug_error("argc ||argv is NULL");
+               gstcs_error("argc ||argv is NULL");
                GSTCS_FREE(input_format);
                GSTCS_FREE(output_format);
                if (argc != NULL) {
@@ -666,7 +811,7 @@ _mm_imgp_gstcs(imgp_info_s* pImgp_info, unsigned char *src, unsigned char *dst)
                return MM_ERROR_IMAGE_INVALID_VALUE;
        }
        memset(argv, 0, sizeof(gchar*) * max_argc);
-       debug_log("memset argv");
+       gstcs_debug("memset argv");
 
        /* add initial */
        *argc = 1;
@@ -674,43 +819,43 @@ _mm_imgp_gstcs(imgp_info_s* pImgp_info, unsigned char *src, unsigned char *dst)
        /* check disable registry scan */
        argv[*argc] = g_strdup("--gst-disable-registry-update");
        (*argc)++;
-       debug_log("--gst-disable-registry-update");
+       gstcs_debug("--gst-disable-registry-update");
 
        gst_init(argc, &argv);
 
        pGstreamer_s = g_new0 (gstreamer_s, 1);
 
+       for (i = 0; i < (*argc); i++) {
+               GSTCS_FREE(argv[i]);
+       }
        GSTCS_FREE(argv);
        GSTCS_FREE(argc);
 
-       debug_log("[input] format label : %s width: %d height: %d\t[output] format label: %s width: %d height: %d rotation vaule: %d",
+       gstcs_debug("[input] format label : %s width: %d height: %d\t[output] format label: %s width: %d height: %d rotation vaule: %d",
        pImgp_info->input_format_label, pImgp_info->src_width, pImgp_info->src_height, pImgp_info->output_format_label, pImgp_info->dst_width, pImgp_info->dst_height, pImgp_info->angle);
 
        input_format= _mm_set_input_image_format_s_struct(pImgp_info);
        if (input_format == NULL) {
-               debug_error("memory allocation failed");
+               gstcs_error("memory allocation failed");
                return MM_ERROR_IMAGE_NO_FREE_SPACE;
        }
-       output_format= _mm_set_output_image_format_s_struct(pImgp_info);
+       output_format= _mm_set_output_image_format_s_struct(pImgp_info, input_format);
        if (output_format == NULL) {
-               debug_error("memory allocation failed");
+               gstcs_error("memory allocation failed");
                GSTCS_FREE(input_format->format_label);
                GSTCS_FREE(input_format->colorspace);
                GSTCS_FREE(input_format);
                return MM_ERROR_IMAGE_NO_FREE_SPACE;
        }
 
-       pImgp_info->output_stride = output_format->width;
-       pImgp_info->output_elevation = output_format->height;
-
        /* _format_label : I420, RGB888 etc*/
-       debug_log("Start _mm_imgp_gstcs_processing ");
+       gstcs_debug("Start _mm_imgp_gstcs_processing ");
        ret =_mm_imgp_gstcs_processing(pGstreamer_s, src, dst, input_format, output_format, pImgp_info); /* input: buffer pointer for input image , input image format, input image width, input image height, output: buffer porinter for output image */
 
        if(ret == MM_ERROR_NONE) {
-               debug_log("End _mm_imgp_gstcs_processing [dst: %p]", dst);
+               gstcs_debug("End _mm_imgp_gstcs_processing [dst: %p]", dst);
        }else if (ret != MM_ERROR_NONE) {
-               debug_error("ERROR - _mm_imgp_gstcs_processing");
+               gstcs_error("ERROR - _mm_imgp_gstcs_processing");
        }
 
        GSTCS_FREE(input_format->format_label);
@@ -728,7 +873,7 @@ int
 mm_imgp(imgp_info_s* pImgp_info, unsigned char *src, unsigned char *dst, imgp_type_e _imgp_type)
 {
        if (pImgp_info == NULL) {
-               debug_error("input vaule is error");
+               gstcs_error("input vaule is error");
        }
        return _mm_imgp_gstcs(pImgp_info, src, dst);
 }
index 9baf256..a4c7174 100755 (executable)
@@ -1,14 +1,14 @@
 #sbs-git:slp/pkgs/l/libmm-imgp-gstcs libmm-imgp-gstcs 0.1 62b62e6d483557fc5750d1b4986e9a98323f1194
 Name:       libmm-imgp-gstcs
 Summary:    Multimedia Framework Utility Library
-Version:    0.5
+Version:    0.6
 Release:    16
 Group:      System/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1001:    libmm-imgp-gstcs.manifest
 BuildRequires:  pkgconfig(mm-common)
-BuildRequires:  pkgconfig(mm-log)
+BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gmodule-2.0)
@@ -54,13 +54,10 @@ cp LICENSE.APLv2.0 %{buildroot}/usr/share/license/%{name}
 rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
-
 %files
-%manifest %{name}.manifest
 /usr/share/license/%{name}
-%manifest libmm-imgp-gstcs.manifest
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/*.so*