Remove mm_util_s. because this is same as transformation_s

Change-Id: Ia9a52dabf646f60116164d1bf4f1bbcceeaabde9

diff --git a/include/image_util_private.h b/include/image_util_private.h
index dfeffd9..c7db3fc 100755 (executable)
--- a/include/image_util_private.h
+++ b/include/image_util_private.h
@@ -51,12 +51,12 @@ extern "C"
        } while (0)
 
 #define image_util_fenter() do { \
-                       LOGD(FONT_COLOR_YELLOW"<ENTER>"FONT_COLOR_RESET); \
-               } while (0)
+               LOGD(FONT_COLOR_YELLOW"<ENTER>"FONT_COLOR_RESET); \
+       } while (0)
 
 #define image_util_fleave() do { \
-                       LOGD(FONT_COLOR_YELLOW"<LEAVE>"FONT_COLOR_RESET); \
-               } while (0)
+               LOGD(FONT_COLOR_YELLOW"<LEAVE>"FONT_COLOR_RESET); \
+       } while (0)
 
 #define image_util_retm_if(expr, fmt, arg...) do { \
                if (expr) { \
@@ -129,11 +129,6 @@ typedef struct {
        bool is_finish;
        GThread* thread;
        GAsyncQueue *queue;
-} mm_util_s;
-
-typedef struct {
-       mm_util_s *image_h;
-//     image_util_cb_s *_util_cb;
 } transformation_s;
 
 typedef struct {

diff --git a/src/image_util.c b/src/image_util.c
index d722d91..1c360c8 100755 (executable)
--- a/src/image_util.c
+++ b/src/image_util.c
@@ -190,7 +190,7 @@ static void __mm_destroy_temp_buffer(unsigned char *buffer[])
                IMAGE_UTIL_SAFE_FREE(buffer[i]);
 }
 
-static int __mm_util_processing(mm_util_s *handle)
+static int __mm_util_processing(transformation_s *handle)
 {
        int ret = IMAGE_UTIL_ERROR_NONE;
        unsigned char *dst_buf[4] = {NULL,};
@@ -296,7 +296,7 @@ static int __mm_util_processing(mm_util_s *handle)
        return ret;
 }
 
-static int __mm_util_transform_exec(mm_util_s *handle, mm_image_info_s *source_image)
+static int __mm_util_transform_exec(transformation_s *handle, mm_image_info_s *source_image)
 {
        int ret = IMAGE_UTIL_ERROR_NONE;
 
@@ -387,7 +387,7 @@ static int __image_util_image_to_packet(mm_image_info_s *image, media_packet_h *
 
 gpointer __mm_util_thread_repeate(gpointer data)
 {
-       mm_util_s *handle = (mm_util_s *) data;
+       transformation_s *handle = (transformation_s *) data;
        int ret = IMAGE_UTIL_ERROR_NONE;
        mm_image_info_s *pop_data = NULL;
        media_packet_h packet = NULL;
@@ -433,7 +433,7 @@ gpointer __mm_util_thread_repeate(gpointer data)
        return NULL;
 }
 
-static int __mm_util_create_thread(mm_util_s *handle)
+static int __mm_util_create_thread(transformation_s *handle)
 {
        int ret = IMAGE_UTIL_ERROR_NONE;
 
@@ -449,7 +449,7 @@ static int __mm_util_create_thread(mm_util_s *handle)
        return ret;
 }
 
-static int __mm_util_transform(mm_util_s *handle, mm_image_info_s *image)
+static int __mm_util_transform(transformation_s *handle, mm_image_info_s *image)
 {
        int ret = IMAGE_UTIL_ERROR_NONE;
 
@@ -518,14 +518,13 @@ static int _image_util_packet_to_image(media_packet_h packet, mm_image_info_s **
        return IMAGE_UTIL_ERROR_NONE;
 }
 
-static int _image_util_create_transform_handle(transformation_s *handle)
+int image_util_transform_create(transformation_h * handle)
 {
-       int ret = IMAGE_UTIL_ERROR_NONE;
-       mm_util_s *_handle = NULL;
+       image_util_fenter();
 
-       image_util_retvm_if((handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "invalid handle");
+       image_util_retvm_if((handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
 
-       _handle = calloc(1, sizeof(mm_util_s));
+       transformation_s *_handle = (transformation_s *) calloc(1, sizeof(transformation_s));
        image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
        /* private values init */
@@ -555,31 +554,6 @@ static int _image_util_create_transform_handle(transformation_s *handle)
                return IMAGE_UTIL_ERROR_INVALID_OPERATION;
        }
 
-       handle->image_h = _handle;
-
-       return ret;
-}
-
-int image_util_transform_create(transformation_h * handle)
-{
-       int err = IMAGE_UTIL_ERROR_NONE;
-
-       image_util_fenter();
-
-       image_util_retvm_if((handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
-
-       transformation_s *_handle = (transformation_s *) calloc(1, sizeof(transformation_s));
-       image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-
-       _handle->image_h = NULL;
-
-       err = _image_util_create_transform_handle(_handle);
-       if (err != IMAGE_UTIL_ERROR_NONE) {
-               image_util_error("Error - create transform handle");
-               IMAGE_UTIL_SAFE_FREE(_handle);
-               return IMAGE_UTIL_ERROR_INVALID_OPERATION;
-       }
-
        *handle = (transformation_h) _handle;
 
        return IMAGE_UTIL_ERROR_NONE;
@@ -609,10 +583,9 @@ int image_util_transform_set_colorspace(transformation_h handle, image_util_colo
        image_util_debug("Set colorspace_convert_info [%d]", colorspace);
 
        image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
-       image_util_retvm_if((_handle->image_h == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Image Handle");
 
-       _handle->image_h->dst_format = colorspace;
-       _handle->image_h->set_convert = true;
+       _handle->dst_format = colorspace;
+       _handle->set_convert = true;
 
        return IMAGE_UTIL_ERROR_NONE;
 }
@@ -624,13 +597,12 @@ int image_util_transform_set_resolution(transformation_h handle, unsigned int wi
        image_util_debug("Set resize_info w[%d] h[%d]", width, height);
 
        image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
-       image_util_retvm_if((_handle->image_h == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Image Handle");
-       image_util_retvm_if((_handle->image_h->set_crop), IMAGE_UTIL_ERROR_INVALID_OPERATION, "Crop and Resize can't do at the same time");
+       image_util_retvm_if((_handle->set_crop), IMAGE_UTIL_ERROR_INVALID_OPERATION, "Crop and Resize can't do at the same time");
        image_util_retvm_if((_image_util_check_resolution(width, height) == false), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid resolution");
 
-       _handle->image_h->dst_width = width;
-       _handle->image_h->dst_height = height;
-       _handle->image_h->set_resize = true;
+       _handle->dst_width = width;
+       _handle->dst_height = height;
+       _handle->set_resize = true;
 
        return IMAGE_UTIL_ERROR_NONE;
 }
@@ -642,10 +614,9 @@ int image_util_transform_set_rotation(transformation_h handle, image_util_rotati
        image_util_debug("Set rotate_info [%d]", rotation);
 
        image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
-       image_util_retvm_if((_handle->image_h == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Image Handle");
 
-       _handle->image_h->rotation = rotation;
-       _handle->image_h->set_rotate = true;
+       _handle->rotation = rotation;
+       _handle->set_rotate = true;
 
        return IMAGE_UTIL_ERROR_NONE;
 }
@@ -657,8 +628,7 @@ int image_util_transform_set_crop_area(transformation_h handle, unsigned int sta
        int dest_height = 0;
 
        image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
-       image_util_retvm_if((_handle->image_h == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Image Handle");
-       image_util_retvm_if((_handle->image_h->set_resize), IMAGE_UTIL_ERROR_INVALID_OPERATION, "Crop and Resize can't do at the same time");
+       image_util_retvm_if((_handle->set_resize), IMAGE_UTIL_ERROR_INVALID_OPERATION, "Crop and Resize can't do at the same time");
 
        dest_width = end_x - start_x;
        dest_height = end_y - start_y;
@@ -667,11 +637,11 @@ int image_util_transform_set_crop_area(transformation_h handle, unsigned int sta
 
        image_util_retvm_if((_image_util_check_resolution(dest_width, dest_height) == false), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid dest resolution");
 
-       _handle->image_h->start_x = start_x;
-       _handle->image_h->start_y = start_y;
-       _handle->image_h->dst_width = dest_width;
-       _handle->image_h->dst_height = dest_height;
-       _handle->image_h->set_crop = true;
+       _handle->start_x = start_x;
+       _handle->start_y = start_y;
+       _handle->dst_width = dest_width;
+       _handle->dst_height = dest_height;
+       _handle->set_crop = true;
 
        return IMAGE_UTIL_ERROR_NONE;
 }
@@ -681,13 +651,12 @@ int image_util_transform_get_colorspace(transformation_h handle, image_util_colo
        transformation_s *_handle = (transformation_s *) handle;
 
        image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
-       image_util_retvm_if((_handle->image_h == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Image Handle");
        image_util_retvm_if((colorspace == NULL), IMAGE_UTIL_ERROR_INVALID_OPERATION, "colorspace parameter error");
-       image_util_retvm_if((!_handle->image_h->set_convert), IMAGE_UTIL_ERROR_INVALID_OPERATION, "Did not set colorspace before");
+       image_util_retvm_if((!_handle->set_convert), IMAGE_UTIL_ERROR_INVALID_OPERATION, "Did not set colorspace before");
 
-       image_util_debug("Get colorspace_convert_info [%d]", _handle->image_h->dst_format);
+       image_util_debug("Get colorspace_convert_info [%d]", _handle->dst_format);
 
-       *colorspace = _handle->image_h->dst_format;
+       *colorspace = _handle->dst_format;
 
        return IMAGE_UTIL_ERROR_NONE;
 }
@@ -697,14 +666,13 @@ int image_util_transform_get_resolution(transformation_h handle, unsigned int *w
        transformation_s *_handle = (transformation_s *) handle;
 
        image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
-       image_util_retvm_if((_handle->image_h == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Image Handle");
        image_util_retvm_if((width == NULL || height == NULL), IMAGE_UTIL_ERROR_INVALID_OPERATION, "width or height parameter error");
-       image_util_retvm_if((!_handle->image_h->set_resize), IMAGE_UTIL_ERROR_INVALID_OPERATION, "Did not set resolution before");
+       image_util_retvm_if((!_handle->set_resize), IMAGE_UTIL_ERROR_INVALID_OPERATION, "Did not set resolution before");
 
-       image_util_debug("Get resize_info w[%ui] h[%ui]", _handle->image_h->dst_width, _handle->image_h->dst_height);
+       image_util_debug("Get resize_info w[%ui] h[%ui]", _handle->dst_width, _handle->dst_height);
 
-       *width = _handle->image_h->dst_width;
-       *height = _handle->image_h->dst_height;
+       *width = _handle->dst_width;
+       *height = _handle->dst_height;
 
        return IMAGE_UTIL_ERROR_NONE;
 }
@@ -714,13 +682,12 @@ int image_util_transform_get_rotation(transformation_h handle, image_util_rotati
        transformation_s *_handle = (transformation_s *) handle;
 
        image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
-       image_util_retvm_if((_handle->image_h == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Image Handle");
        image_util_retvm_if((rotation == NULL), IMAGE_UTIL_ERROR_INVALID_OPERATION, "rotation parameter error");
-       image_util_retvm_if((!_handle->image_h->set_rotate), IMAGE_UTIL_ERROR_INVALID_OPERATION, "Did not set rotation before");
+       image_util_retvm_if((!_handle->set_rotate), IMAGE_UTIL_ERROR_INVALID_OPERATION, "Did not set rotation before");
 
-       image_util_debug("Get rotate_info [%d]", _handle->image_h->rotation);
+       image_util_debug("Get rotate_info [%d]", _handle->rotation);
 
-       *rotation = _handle->image_h->rotation;
+       *rotation = _handle->rotation;
 
        return IMAGE_UTIL_ERROR_NONE;
 }
@@ -730,14 +697,13 @@ int image_util_transform_get_crop_area(transformation_h handle, unsigned int *st
        transformation_s *_handle = (transformation_s *) handle;
 
        image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
-       image_util_retvm_if((_handle->image_h == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Image Handle");
        image_util_retvm_if((start_x == NULL || start_y == NULL || end_x == NULL || end_y == NULL), IMAGE_UTIL_ERROR_INVALID_OPERATION, "crop area parameter error");
-       image_util_retvm_if((!_handle->image_h->set_crop), IMAGE_UTIL_ERROR_INVALID_OPERATION, "Did not set crop area before");
+       image_util_retvm_if((!_handle->set_crop), IMAGE_UTIL_ERROR_INVALID_OPERATION, "Did not set crop area before");
 
-       *start_x = _handle->image_h->start_x;
-       *start_y = _handle->image_h->start_y;
-       *end_x = _handle->image_h->start_x + _handle->image_h->dst_width;
-       *end_y = _handle->image_h->start_x + _handle->image_h->dst_height;
+       *start_x = _handle->start_x;
+       *start_y = _handle->start_y;
+       *end_x = _handle->start_x + _handle->dst_width;
+       *end_y = _handle->start_x + _handle->dst_height;
 
        return IMAGE_UTIL_ERROR_NONE;
 }
@@ -751,25 +717,24 @@ int image_util_transform_run(transformation_h handle, media_packet_h src, image_
        image_util_fenter();
 
        image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
-       image_util_retvm_if((_handle->image_h == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Image Handle");
        image_util_retvm_if((completed_cb == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid callback");
        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");
+       image_util_retvm_if((!_handle->set_convert && !_handle->set_resize && !_handle->set_rotate && !_handle->set_crop), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid transform");
 
        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");
 
-       _handle->image_h->_util_cb = (image_util_cb_s *) calloc(1, sizeof(image_util_cb_s));
-       if (_handle->image_h->_util_cb == NULL) {
+       _handle->_util_cb = (image_util_cb_s *) calloc(1, sizeof(image_util_cb_s));
+       if (_handle->_util_cb == NULL) {
                image_util_error("Memory allocation failed");
                __mm_util_destroy_color_image(color_image);
                return IMAGE_UTIL_ERROR_OUT_OF_MEMORY;
        }
 
-       _handle->image_h->_util_cb->user_data = user_data;
-       _handle->image_h->_util_cb->completed_cb = completed_cb;
+       _handle->_util_cb->user_data = user_data;
+       _handle->_util_cb->completed_cb = completed_cb;
 
-       err = __mm_util_transform(_handle->image_h, color_image);
+       err = __mm_util_transform(_handle, color_image);
        if (err != IMAGE_UTIL_ERROR_NONE) {
                image_util_error("Error - Run transform (%d)", err);
                __mm_util_destroy_color_image(color_image);
@@ -786,21 +751,18 @@ int image_util_transform_destroy(transformation_h handle)
        image_util_fenter();
 
        image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
-       image_util_retvm_if((_handle->image_h == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Image Handle");
 
-       if (_handle->image_h->thread) {
-               _handle->image_h->is_finish = TRUE;
-               g_thread_join(_handle->image_h->thread);
+       if (_handle->thread) {
+               _handle->is_finish = TRUE;
+               g_thread_join(_handle->thread);
        }
 
-       if (_handle->image_h->queue) {
-               g_async_queue_unref(_handle->image_h->queue);
-               _handle->image_h->queue = NULL;
+       if (_handle->queue) {
+               g_async_queue_unref(_handle->queue);
+               _handle->queue = NULL;
        }
 
-       IMAGE_UTIL_SAFE_FREE(_handle->image_h->_util_cb);
-       IMAGE_UTIL_SAFE_FREE(_handle->image_h);
-
+       IMAGE_UTIL_SAFE_FREE(_handle->_util_cb);
        IMAGE_UTIL_SAFE_FREE(_handle);
 
        image_util_fleave();