Remove mm_util_color_image_h to remove internal handle

Change-Id: I5e3164d0872ee8f04a45ee2b38f8cb19fba1687d

diff --git a/src/image_util.c b/src/image_util.c
index 612b89f..cce4efa 100755 (executable)
--- a/src/image_util.c
+++ b/src/image_util.c
@@ -113,20 +113,18 @@ static int __create_media_format(media_format_mimetype_e mimetype, unsigned int
        return IMAGE_UTIL_ERROR_NONE;
 }
 
-static void __mm_util_destroy_color_image(mm_util_color_image_h image)
+static void __mm_util_destroy_color_image(mm_image_info_s *image)
 {
-       mm_image_info_s *_color_image = (mm_image_info_s *)image;
-
-       if (_color_image == NULL) {
+       if (image == NULL) {
                image_util_error("[ERROR] - image");
                return;
        }
 
-       IMAGE_UTIL_SAFE_FREE(_color_image->data);
-       IMAGE_UTIL_SAFE_FREE(_color_image);
+       IMAGE_UTIL_SAFE_FREE(image->data);
+       IMAGE_UTIL_SAFE_FREE(image);
 }
 
-static int __mm_util_create_color_image(mm_util_color_image_h *image, unsigned long width, unsigned long height, mm_util_color_format_e color, void *data, size_t size)
+static int __mm_util_create_color_image(mm_image_info_s **image, unsigned long width, unsigned long height, mm_util_color_format_e color, void *data, size_t size)
 {
        int ret = IMAGE_UTIL_ERROR_NONE;
        mm_image_info_s *_color_image = NULL;
@@ -155,32 +153,31 @@ static int __mm_util_create_color_image(mm_util_color_image_h *image, unsigned l
 
        image_util_debug("w [%lu], h [%lu], color [%u], size [%zu], data [%p]", _color_image->width, _color_image->height, _color_image->color, _color_image->size, _color_image->data);
 
-       *image = (mm_util_color_image_h)_color_image;
+       *image = _color_image;
 
        return ret;
 }
 
-static int __mm_util_get_color_image(mm_util_color_image_h image, unsigned long *width, unsigned long *height, mm_util_color_format_e *color, void **data, size_t *size)
+static int __mm_util_get_color_image(mm_image_info_s *image, unsigned long *width, unsigned long *height, mm_util_color_format_e *color, void **data, size_t *size)
 {
        int ret = IMAGE_UTIL_ERROR_NONE;
-       mm_image_info_s *_color_image = (mm_image_info_s *)image;
 
-       image_util_retvm_if((_color_image == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid handle");
+       image_util_retvm_if((image == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid handle");
 
        if (width != NULL)
-               *width = _color_image->width;
+               *width = image->width;
 
        if (height != NULL)
-               *height = _color_image->height;
+               *height = image->height;
 
        if (color != NULL)
-               *color = _color_image->color;
+               *color = image->color;
 
        if (data != NULL)
-               *data = _color_image->data;
+               *data = image->data;
 
        if (size != NULL)
-               *size = _color_image->size;
+               *size = image->size;
 
        return ret;
 }
@@ -285,7 +282,7 @@ static int __mm_util_processing(mm_util_s *handle)
        }
 
        if (dst_buf[dst_index] != NULL && res_buffer_size != 0) {
-               ret = __mm_util_create_color_image((mm_util_color_image_h *)&(handle->dst), (unsigned long)src_width, (unsigned long)src_height, src_format, (void *)dst_buf[dst_index], res_buffer_size);
+               ret = __mm_util_create_color_image(&(handle->dst), (unsigned long)src_width, (unsigned long)src_height, src_format, (void *)dst_buf[dst_index], res_buffer_size);
                if (ret != IMAGE_UTIL_ERROR_NONE)
                        image_util_error("__mm_util_create_color_image failed");
        } else {
@@ -319,7 +316,7 @@ static int __mm_util_transform_exec(mm_util_s *handle, mm_image_info_s *source_i
        return ret;
 }
 
-static int __image_util_image_to_packet(mm_util_color_image_h image, media_packet_h *packet)
+static int __image_util_image_to_packet(mm_image_info_s *image, media_packet_h *packet)
 {
        int err = IMAGE_UTIL_ERROR_NONE;
        mm_util_color_format_e format = 0;
@@ -392,14 +389,14 @@ gpointer __mm_util_thread_repeate(gpointer data)
 {
        mm_util_s *handle = (mm_util_s *) data;
        int ret = IMAGE_UTIL_ERROR_NONE;
-       mm_util_color_image_h pop_data = NULL;
+       mm_image_info_s *pop_data = NULL;
        media_packet_h packet = NULL;
 
        image_util_retvm_if(handle == NULL, NULL, "invalid handle");
 
        while (!handle->is_finish) {
                image_util_debug("waiting...");
-               pop_data = (mm_util_color_image_h)g_async_queue_timeout_pop(handle->queue, 300 * G_TIME_SPAN_MILLISECOND);
+               pop_data = g_async_queue_timeout_pop(handle->queue, 300 * G_TIME_SPAN_MILLISECOND);
                image_util_debug("get from data or timeout");
 
                if (pop_data == NULL) {
@@ -452,7 +449,7 @@ static int __mm_util_create_thread(mm_util_s *handle)
        return ret;
 }
 
-static int __mm_util_transform(mm_util_imgp_h imgp_handle, mm_util_color_image_h image)
+static int __mm_util_transform(mm_util_imgp_h imgp_handle, mm_image_info_s *image)
 {
        int ret = IMAGE_UTIL_ERROR_NONE;
        mm_util_s *handle = (mm_util_s *) imgp_handle;
@@ -481,7 +478,7 @@ static int __mm_util_transform(mm_util_imgp_h imgp_handle, mm_util_color_image_h
        return ret;
 }
 
-static int _image_util_packet_to_image(media_packet_h packet, mm_util_color_image_h *color_image)
+static int _image_util_packet_to_image(media_packet_h packet, mm_image_info_s **color_image)
 {
        int err = IMAGE_UTIL_ERROR_NONE;
        media_format_mimetype_e mimetype = 0;
@@ -750,6 +747,7 @@ int image_util_transform_run(transformation_h handle, media_packet_h src, image_
 {
        int err = IMAGE_UTIL_ERROR_NONE;
        transformation_s *_handle = (transformation_s *) handle;
+       mm_image_info_s *color_image = NULL;
 
        image_util_fenter();
 
@@ -759,8 +757,6 @@ int image_util_transform_run(transformation_h handle, media_packet_h src, image_
        image_util_retvm_if((src == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid source");
        image_util_retvm_if((!_handle->image_h->set_convert && !_handle->image_h->set_resize && !_handle->image_h->set_rotate && !_handle->image_h->set_crop), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid transform");
 
-       mm_util_color_image_h color_image = NULL;
-
        err = _image_util_packet_to_image(src, &color_image);
        image_util_retvm_if((err != IMAGE_UTIL_ERROR_NONE), err, "_image_util_packet_to_image failed");