Change decode_encode_s to encode_s and remove useless code of checking encode mode

Change-Id: I5863cb020e17200efc40329f5c519a51b5f9cdef

diff --git a/include/image_util_private.h b/include/image_util_private.h
index 8f6eeb8..015062b 100755 (executable)
--- a/include/image_util_private.h
+++ b/include/image_util_private.h
@@ -83,7 +83,6 @@ extern "C"
 #define MODE_DECODE            1
 #define MODE_ENCODE            2
 
-#define DECODE_ENCODE_CAST(obj)        ((decode_encode_s *)(obj))
 #define IS_DECODE_MODE(x)              (x == MODE_DECODE)
 #define IS_ENCODE_MODE(x)              (x == MODE_ENCODE)
 
@@ -164,7 +163,7 @@ typedef struct {
 
        /* for async */
        GThread *thread;
-} decode_encode_s;
+} encode_s;
 
 typedef struct {
        image_util_type_e image_type;
@@ -198,11 +197,6 @@ typedef enum {
 #define IMAGE_UTIL_SUPPORT_TYPE_CHECK(value, support) \
        image_util_retvm_if((value != support), IMAGE_UTIL_ERROR_NOT_SUPPORTED_FORMAT, "Not supported format")
 
-#define IMAGE_UTIL_ENCODE_HANDLE_CHECK(obj) do { \
-               image_util_retvm_if(obj == NULL, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid encode handle"); \
-               image_util_retvm_if(!IS_ENCODE_MODE(DECODE_ENCODE_CAST(obj)->mode), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid encode handle"); \
-       } while(0)
-
 gboolean is_valid_colorspace(image_util_colorspace_e colorspace);
 gboolean is_supported_colorspace(image_util_colorspace_e colorspace, image_util_type_e type);
 

diff --git a/src/image_util_encode.c b/src/image_util_encode.c
index 6fb995a..0724ee9 100755 (executable)
--- a/src/image_util_encode.c
+++ b/src/image_util_encode.c
@@ -46,7 +46,7 @@ static int _image_util_encode_get_gif_frame(mm_gif_file_h gif_data, unsigned int
        return _image_error_capi(ERR_TYPE_ENCODE, err);
 }
 
-static void _image_util_encode_destroy_image_handle(decode_encode_s * handle)
+static void _image_util_encode_destroy_image_handle(encode_s * handle)
 {
        image_util_retm_if((handle == NULL), "Invalid Handle");
        void *image_handle = (void *)(handle->image_h);
@@ -58,7 +58,7 @@ static void _image_util_encode_destroy_image_handle(decode_encode_s * handle)
        IMAGE_UTIL_SAFE_FREE(image_handle);
 }
 
-static int __image_util_create_img_handle(image_util_type_e image_type, decode_encode_s * handle)
+static int __image_util_create_img_handle(image_util_type_e image_type, encode_s * handle)
 {
        int err = IMAGE_UTIL_ERROR_NONE;
        mm_image_info_s *_image_handle = NULL;
@@ -105,7 +105,7 @@ int image_util_encode_create(image_util_type_e image_type, image_util_encode_h *
        image_util_fenter();
        image_util_retvm_if(handle == NULL, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
-       decode_encode_s *_handle = (decode_encode_s *) calloc(1, sizeof(decode_encode_s));
+       encode_s *_handle = (encode_s *) calloc(1, sizeof(encode_s));
        image_util_retvm_if((_handle == NULL), IMAGE_UTIL_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
        _handle->image_type = image_type;
@@ -133,9 +133,8 @@ int image_util_encode_create(image_util_type_e image_type, image_util_encode_h *
 int image_util_encode_set_resolution(image_util_encode_h handle, unsigned long width, unsigned long height)
 {
        int err = IMAGE_UTIL_ERROR_NONE;
-       decode_encode_s *_handle = (decode_encode_s *) handle;
+       encode_s *_handle = (encode_s *) handle;
 
-       IMAGE_UTIL_ENCODE_HANDLE_CHECK(_handle);
        image_util_retvm_if(_handle->image_h == NULL, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid parameter");
        image_util_retvm_if((width == 0 || height == 0), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid resolution");
 
@@ -186,9 +185,8 @@ int image_util_encode_set_resolution(image_util_encode_h handle, unsigned long w
 int image_util_encode_set_colorspace(image_util_encode_h handle, image_util_colorspace_e colorspace)
 {
        int err = IMAGE_UTIL_ERROR_NONE;
-       decode_encode_s *_handle = (decode_encode_s *) handle;
+       encode_s *_handle = (encode_s *) handle;
 
-       IMAGE_UTIL_ENCODE_HANDLE_CHECK(_handle);
        IMAGE_UTIL_TYPE_CHECK(_handle->image_type);
 
        image_util_retvm_if((is_valid_colorspace(colorspace) == FALSE), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid colorspace");
@@ -202,9 +200,8 @@ int image_util_encode_set_colorspace(image_util_encode_h handle, image_util_colo
 int image_util_encode_set_quality(image_util_encode_h handle, int quality)
 {
        int err = IMAGE_UTIL_ERROR_NONE;
-       decode_encode_s *_handle = (decode_encode_s *) handle;
+       encode_s *_handle = (encode_s *) handle;
 
-       IMAGE_UTIL_ENCODE_HANDLE_CHECK(_handle);
        IMAGE_UTIL_SUPPORT_TYPE_CHECK(_handle->image_type, IMAGE_UTIL_JPEG);
 
        image_util_retvm_if((quality <= 0 || quality > 100), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid quality");
@@ -217,9 +214,8 @@ int image_util_encode_set_quality(image_util_encode_h handle, int quality)
 int image_util_encode_set_png_compression(image_util_encode_h handle, image_util_png_compression_e compression)
 {
        int err = IMAGE_UTIL_ERROR_NONE;
-       decode_encode_s *_handle = (decode_encode_s *) handle;
+       encode_s *_handle = (encode_s *) handle;
 
-       IMAGE_UTIL_ENCODE_HANDLE_CHECK(_handle);
        IMAGE_UTIL_SUPPORT_TYPE_CHECK(_handle->image_type, IMAGE_UTIL_PNG);
 
        image_util_retvm_if((compression < IMAGE_UTIL_PNG_COMPRESSION_0 || compression > IMAGE_UTIL_PNG_COMPRESSION_9), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid compression value");
@@ -232,10 +228,9 @@ int image_util_encode_set_png_compression(image_util_encode_h handle, image_util
 int image_util_encode_set_gif_frame_delay_time(image_util_encode_h handle, unsigned long long delay_time)
 {
        int err = IMAGE_UTIL_ERROR_NONE;
-       decode_encode_s *_handle = (decode_encode_s *) handle;
+       encode_s *_handle = (encode_s *) handle;
        mm_gif_file_h gif_data = NULL;
 
-       IMAGE_UTIL_ENCODE_HANDLE_CHECK(_handle);
        IMAGE_UTIL_SUPPORT_TYPE_CHECK(_handle->image_type, IMAGE_UTIL_GIF);
 
        gif_data = (mm_gif_file_h) _handle->image_h;
@@ -258,9 +253,7 @@ int image_util_encode_set_gif_frame_delay_time(image_util_encode_h handle, unsig
 int image_util_encode_set_input_buffer(image_util_encode_h handle, const unsigned char *src_buffer)
 {
        int err = IMAGE_UTIL_ERROR_NONE;
-       decode_encode_s *_handle = (decode_encode_s *) handle;
-
-       IMAGE_UTIL_ENCODE_HANDLE_CHECK(_handle);
+       encode_s *_handle = (encode_s *) handle;
 
        if (src_buffer == NULL) {
                image_util_error("Invalid input buffer");
@@ -294,9 +287,7 @@ int image_util_encode_set_input_buffer(image_util_encode_h handle, const unsigne
 int image_util_encode_set_output_path(image_util_encode_h handle, const char *path)
 {
        int err = IMAGE_UTIL_ERROR_NONE;
-       decode_encode_s *_handle = (decode_encode_s *) handle;
-
-       IMAGE_UTIL_ENCODE_HANDLE_CHECK(_handle);
+       encode_s *_handle = (encode_s *) handle;
 
        image_util_retvm_if(!IMAGE_UTIL_STRING_VALID(path), IMAGE_UTIL_ERROR_NO_SUCH_FILE, "Invalid path");
 
@@ -314,9 +305,7 @@ int image_util_encode_set_output_path(image_util_encode_h handle, const char *pa
 int image_util_encode_set_output_buffer(image_util_encode_h handle, unsigned char **dst_buffer)
 {
        int err = IMAGE_UTIL_ERROR_NONE;
-       decode_encode_s *_handle = (decode_encode_s *) handle;
-
-       IMAGE_UTIL_ENCODE_HANDLE_CHECK(_handle);
+       encode_s *_handle = (encode_s *) handle;
 
        image_util_retvm_if(dst_buffer == NULL, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid output buffer");
 
@@ -327,7 +316,7 @@ int image_util_encode_set_output_buffer(image_util_encode_h handle, unsigned cha
        return err;
 }
 
-static int _image_util_encode_internal(decode_encode_s * _handle)
+static int _image_util_encode_internal(encode_s * _handle)
 {
        int err = MM_UTIL_ERROR_NONE;
 
@@ -420,9 +409,8 @@ static int _image_util_encode_internal(decode_encode_s * _handle)
 int image_util_encode_run(image_util_encode_h handle, unsigned long long *size)
 {
        int err = IMAGE_UTIL_ERROR_NONE;
-       decode_encode_s *_handle = (decode_encode_s *) handle;
+       encode_s *_handle = (encode_s *) handle;
 
-       IMAGE_UTIL_ENCODE_HANDLE_CHECK(_handle);
        image_util_retvm_if((_handle->path == NULL && _handle->dst_buffer == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid output");
        image_util_retvm_if(_handle->image_type != IMAGE_UTIL_GIF && _handle->src_buffer == NULL, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid input");
        image_util_retvm_if((_image_util_check_resolution(_handle->width, _handle->height) == false), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid resolution");
@@ -438,7 +426,7 @@ int image_util_encode_run(image_util_encode_h handle, unsigned long long *size)
 
 gpointer _image_util_encode_thread(gpointer data)
 {
-       decode_encode_s *_handle = (decode_encode_s *) data;
+       encode_s *_handle = (encode_s *) data;
        int err = IMAGE_UTIL_ERROR_NONE;
 
        image_util_retvm_if((_handle == NULL), NULL, "Invalid Handle");
@@ -461,7 +449,7 @@ gpointer _image_util_encode_thread(gpointer data)
        return NULL;
 }
 
-static int _image_util_encode_create_thread(decode_encode_s * handle)
+static int _image_util_encode_create_thread(encode_s * handle)
 {
        image_util_retvm_if((handle == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
        image_util_retvm_if((handle->thread != NULL), IMAGE_UTIL_ERROR_INVALID_OPERATION, "The thread is alread running");
@@ -480,9 +468,8 @@ static int _image_util_encode_create_thread(decode_encode_s * handle)
 int image_util_encode_run_async(image_util_encode_h handle, image_util_encode_completed_cb completed_cb, void *user_data)
 {
        int err = IMAGE_UTIL_ERROR_NONE;
-       decode_encode_s *_handle = (decode_encode_s *) handle;
+       encode_s *_handle = (encode_s *) handle;
 
-       IMAGE_UTIL_ENCODE_HANDLE_CHECK(_handle);
        image_util_retvm_if((_handle->path == NULL && _handle->dst_buffer == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid output");
        image_util_retvm_if(_handle->image_type != IMAGE_UTIL_GIF && _handle->src_buffer == NULL, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid input");
        image_util_retvm_if((_image_util_check_resolution(_handle->width, _handle->height) == false), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid resolution");
@@ -511,12 +498,10 @@ int image_util_encode_run_async(image_util_encode_h handle, image_util_encode_co
 int image_util_encode_destroy(image_util_encode_h handle)
 {
        int err = IMAGE_UTIL_ERROR_NONE;
-       decode_encode_s *_handle = (decode_encode_s *) handle;
+       encode_s *_handle = (encode_s *) handle;
 
        image_util_debug("image_util_encode_destroy");
 
-       IMAGE_UTIL_ENCODE_HANDLE_CHECK(_handle);
-
        _image_util_encode_destroy_image_handle(_handle);
 
        /* g_thread_exit(handle->thread); */

diff --git a/src/image_util_internal.c b/src/image_util_internal.c
index b466d7a..bf6d317 100755 (executable)
--- a/src/image_util_internal.c
+++ b/src/image_util_internal.c
@@ -123,7 +123,7 @@ int image_util_frame_create(void *decode_encode_h, image_util_frame_h *frame_h)
        image_util_retvm_if((decode_encode_h == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
        image_util_retvm_if((frame_h == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
 
-       decode_encode_s *image = (decode_encode_s *)decode_encode_h;
+       encode_s *image = (encode_s *)decode_encode_h;
        image_util_retvm_if((image->image_h == NULL), IMAGE_UTIL_ERROR_INVALID_OPERATION, "The image handle is wrong");
 
        frame_s *frame = calloc(1, sizeof(frame_s));
@@ -225,7 +225,7 @@ int image_util_encode_add_frame(image_util_encode_h encode_h, image_util_frame_h
        image_util_retvm_if((encode_h == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
        image_util_retvm_if((frame_h == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
 
-       decode_encode_s *encode = (decode_encode_s *)encode_h;
+       encode_s *encode = (encode_s *)encode_h;
        frame_s *frame = (frame_s *)frame_h;
        image_util_retvm_if((encode->image_h == NULL), IMAGE_UTIL_ERROR_INVALID_OPERATION, "The image handle is wrong");
        image_util_retvm_if((encode->image_type != IMAGE_UTIL_GIF), IMAGE_UTIL_ERROR_NOT_SUPPORTED_FORMAT, "The image type(%d) is not supported.", encode->image_type);
@@ -260,7 +260,7 @@ int image_util_encode_save(image_util_encode_h encode_h, unsigned long long *siz
 
        image_util_retvm_if((encode_h == NULL), IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid Handle");
 
-       decode_encode_s *encode = (decode_encode_s *)encode_h;
+       encode_s *encode = (encode_s *)encode_h;
        image_util_retvm_if((encode->image_h == NULL), IMAGE_UTIL_ERROR_INVALID_OPERATION, "The image handle is wrong");
        image_util_retvm_if((encode->image_type != IMAGE_UTIL_GIF), IMAGE_UTIL_ERROR_NOT_SUPPORTED_FORMAT, "The image type(%d) is not supported.", encode->image_type);