Modify parameters in encoding APIs have been changed from mm_image_info_s to mm_util_...

[platform/core/multimedia/libmm-utility.git] / gif / mm_util_gif.c

diff --git a/gif/mm_util_gif.c b/gif/mm_util_gif.c
index 1bb6f30..d2c6c48 100755 (executable)
--- a/gif/mm_util_gif.c
+++ b/gif/mm_util_gif.c
@@ -610,7 +610,7 @@ int mm_util_gif_encode_set_mem(mm_gif_file_h gif_file_h, void **data, size_t *da
        return MM_UTIL_ERROR_NONE;
 }
 
-static int _mm_util_gif_encode_start(mm_gif_file_h gif_file_h, unsigned long width, unsigned long height)
+static int __mm_util_gif_encode_start(mm_gif_file_h gif_file_h, unsigned int width, unsigned int height)
 {
        int ret = MM_UTIL_ERROR_NONE;
        gif_file_s *gif_file = (gif_file_s *)gif_file_h;
@@ -656,11 +656,12 @@ int mm_util_gif_encode_add_image(mm_gif_file_h gif_file_h, mm_image_info_s *gif_
        mm_util_retvm_if(gif_image == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid parameter");
        mm_util_retvm_if((gif_image->width == 0) || (gif_image->height == 0), MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid parameter");
        mm_util_retvm_if(gif_image->data == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid parameter");
+       mm_util_retvm_if(gif_image->color != MM_UTIL_COLOR_RGBA, MM_UTIL_ERROR_NOT_SUPPORTED_FORMAT, "not supported color [%d]", gif_image->color);
 
        if (gif_file->GifFile == NULL) {
-               mm_util_warn("first added image, _mm_util_gif_encode_start is needed");
-               ret = _mm_util_gif_encode_start(gif_file_h, gif_image->width, gif_image->height);
-               mm_util_retvm_if(ret != MM_UTIL_ERROR_NONE, ret, "_mm_util_gif_encode_start failed");
+               mm_util_warn("first added image, __mm_util_gif_encode_start is needed");
+               ret = __mm_util_gif_encode_start(gif_file_h, gif_image->width, gif_image->height);
+               mm_util_retvm_if(ret != MM_UTIL_ERROR_NONE, ret, "__mm_util_gif_encode_start failed");
        }
 
        /* Write graphic control block */
@@ -705,37 +706,38 @@ int mm_util_gif_encode_save(mm_gif_file_h gif_file_h)
        return MM_UTIL_ERROR_NONE;
 }
 
-int mm_util_encode_to_gif_file(mm_image_info_s **images, const unsigned int image_count, const char *path)
+int mm_util_encode_to_gif_file(mm_util_image_h *images, const unsigned int image_count, const char *file_path)
 {
        int ret = MM_UTIL_ERROR_NONE;
+       mm_image_info_s **_images = (mm_image_info_s **)images;
        int i = 0;
        mm_gif_file_h gif_file_h = NULL;
 
        mm_util_fenter();
 
-       mm_util_retvm_if(images == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid parameter");
-       mm_util_retvm_if(image_count == 0, MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid parameter");
-       mm_util_retvm_if(path == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid parameter");
+       mm_util_retvm_if(images == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid images");
+       mm_util_retvm_if(image_count == 0, MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid image_count");
+       mm_util_retvm_if(!MMUTIL_STRING_VALID(file_path), MM_UTIL_ERROR_INVALID_PARAMETER, "invalid file_path");
 
        ret = mm_util_gif_encode_create(&gif_file_h);
        mm_util_retvm_if(ret != MM_UTIL_ERROR_NONE, ret, "mm_util_gif_encode_create failed %d", ret);
 
-       ret = mm_util_gif_encode_set_file(gif_file_h, path);
+       ret = mm_util_gif_encode_set_file(gif_file_h, file_path);
        if (ret != MM_UTIL_ERROR_NONE) {
                mm_util_error("mm_util_gif_encode_set_file failed");
                mm_util_gif_encode_destroy(gif_file_h);
                return ret;
        }
 
-       ret = _mm_util_gif_encode_start(gif_file_h, images[0]->width, images[0]->height);
+       ret = __mm_util_gif_encode_start(gif_file_h, _images[0]->width, _images[0]->height);
        if (ret != MM_UTIL_ERROR_NONE) {
-               mm_util_error("_mm_util_gif_encode_start failed");
+               mm_util_error("__mm_util_gif_encode_start failed");
                mm_util_gif_encode_destroy(gif_file_h);
                return ret;
        }
 
        for (i = 0; i < image_count; i++) {
-               ret = mm_util_gif_encode_add_image(gif_file_h, images[i]);
+               ret = mm_util_gif_encode_add_image(gif_file_h, _images[i]);
                if (ret != MM_UTIL_ERROR_NONE) {
                        mm_util_error("mm_util_gif_encode_add_image failed");
                        mm_util_gif_encode_destroy(gif_file_h);
@@ -755,16 +757,17 @@ int mm_util_encode_to_gif_file(mm_image_info_s **images, const unsigned int imag
        return MM_UTIL_ERROR_NONE;
 }
 
-int mm_util_encode_to_gif_memory(mm_image_info_s **images, const unsigned int image_count, void **buffer, size_t *size)
+int mm_util_encode_to_gif_memory(mm_util_image_h *images, const unsigned int image_count, void **buffer, size_t *size)
 {
        int ret = MM_UTIL_ERROR_NONE;
+       mm_image_info_s **_images = (mm_image_info_s **)images;
        int i = 0;
        mm_gif_file_h gif_file_h = NULL;
 
        mm_util_fenter();
 
-       mm_util_retvm_if(images == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid parameter");
-       mm_util_retvm_if(image_count == 0, MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid parameter");
+       mm_util_retvm_if(images == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid images");
+       mm_util_retvm_if(image_count == 0, MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid image_count");
        mm_util_retvm_if(buffer == NULL || size == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid parameter");
 
        ret = mm_util_gif_encode_create(&gif_file_h);
@@ -777,15 +780,15 @@ int mm_util_encode_to_gif_memory(mm_image_info_s **images, const unsigned int im
                return ret;
        }
 
-       ret = _mm_util_gif_encode_start(gif_file_h, images[0]->width, images[0]->height);
+       ret = __mm_util_gif_encode_start(gif_file_h, _images[0]->width, _images[0]->height);
        if (ret != MM_UTIL_ERROR_NONE) {
-               mm_util_error("_mm_util_gif_encode_start failed");
+               mm_util_error("__mm_util_gif_encode_start failed");
                mm_util_gif_encode_destroy(gif_file_h);
                return ret;
        }
 
        for (i = 0; i < image_count; i++) {
-               ret = mm_util_gif_encode_add_image(gif_file_h, images[i]);
+               ret = mm_util_gif_encode_add_image(gif_file_h, _images[i]);
                if (ret != MM_UTIL_ERROR_NONE) {
                        mm_util_error("mm_util_gif_encode_add_image failed");
                        mm_util_gif_encode_destroy(gif_file_h);