From fbea258a8607322938f8e9defb4de941f2de049a Mon Sep 17 00:00:00 2001 From: "jiyong.min" Date: Mon, 4 May 2020 07:25:41 +0900 Subject: [PATCH] Unify rotate type enum Change-Id: I0f7d2af35d83ce75e777fbc90148cae4c2c52014 --- src/media-thumbnail.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/media-thumbnail.c b/src/media-thumbnail.c index 03bbda9..d51a280 100755 --- a/src/media-thumbnail.c +++ b/src/media-thumbnail.c @@ -126,14 +126,14 @@ int thumbnail_request_cancel_raw_data(int request_id) return err; } -static void __get_rotation_and_cdis(const char *path, mm_util_magick_rotate_type *rot_type, int *cdis_value) +static void __get_rotation_and_cdis(const char *path, mm_util_rotate_type_e *rot_type, int *cdis_value) { int err = MS_MEDIA_ERR_NONE; MMHandleType tag = (MMHandleType) NULL; char *p = NULL; int size = 0; int _cdis_value = 0; - mm_util_magick_rotate_type _rot_type = MM_UTIL_ROTATE_0; + mm_util_rotate_type_e _rot_type = MM_UTIL_ROTATE_0; /* Get Content Tag attribute for orientation */ err = mm_file_create_tag_attrs(&tag, path); @@ -219,11 +219,11 @@ static int __get_video_meta(int cdis_value, const char *path, int *video_track_n } -static int __get_video_info(const char *path, int *video_track_num, unsigned int *width, unsigned int *height, void **frame, size_t *frame_size, mm_util_magick_rotate_type *rot_type) +static int __get_video_info(const char *path, int *video_track_num, unsigned int *width, unsigned int *height, void **frame, size_t *frame_size, mm_util_rotate_type_e *rot_type) { int err = MS_MEDIA_ERR_NONE; int _cdis_value = 0; - mm_util_magick_rotate_type _rot_type = MM_UTIL_ROTATE_0; + mm_util_rotate_type_e _rot_type = MM_UTIL_ROTATE_0; __get_rotation_and_cdis(path, &_rot_type, &_cdis_value); err = __get_video_meta(_cdis_value, path, video_track_num, width, height, frame, frame_size); @@ -260,7 +260,7 @@ static void __media_thumb_get_proper_thumb_size(unsigned int origin_width, unsig thumb_dbg("proper thumb w: %d h: %d", *thumb_width, *thumb_height); } -static int __get_video_thumb_to_file(unsigned int width, unsigned int height, void *frame, size_t frame_size, mm_util_magick_rotate_type rot_type, const char *thumb_path, unsigned int thumb_width, unsigned int thumb_height) +static int __get_video_thumb_to_file(unsigned int width, unsigned int height, void *frame, size_t frame_size, mm_util_rotate_type_e rot_type, const char *thumb_path, unsigned int thumb_width, unsigned int thumb_height) { int err = MS_MEDIA_ERR_NONE; mm_util_image_h img = NULL; @@ -306,7 +306,7 @@ ERROR: return MS_MEDIA_ERR_INTERNAL; } -static int __get_video_thumb_to_buffer(unsigned int width, unsigned int height, void *frame, size_t frame_size, mm_util_magick_rotate_type rot_type, unsigned int thumb_width, unsigned int thumb_height, mm_util_image_h *dst_img) +static int __get_video_thumb_to_buffer(unsigned int width, unsigned int height, void *frame, size_t frame_size, mm_util_rotate_type_e rot_type, unsigned int thumb_width, unsigned int thumb_height, mm_util_image_h *dst_img) { int err = MS_MEDIA_ERR_NONE; mm_util_image_h img = NULL; @@ -427,7 +427,7 @@ int create_video_thumbnail_to_file(const char *path, unsigned int width, unsigne unsigned int video_height = 0; void *frame = NULL; size_t frame_size = 0; - mm_util_magick_rotate_type rot_type = MM_UTIL_ROTATE_NUM; + mm_util_rotate_type_e rot_type = MM_UTIL_ROTATE_NUM; err = __check_parameter_validity_for_file(path, width, height, thumb_path); thumb_retvm_if(err != MS_MEDIA_ERR_NONE, err, "Invalid parameter"); @@ -464,7 +464,7 @@ int create_video_thumbnail_to_buffer(const char *path, void *frame = NULL; size_t frame_size = 0; mm_util_image_h img = NULL; - mm_util_magick_rotate_type rot_type = MM_UTIL_ROTATE_NUM; + mm_util_rotate_type_e rot_type = MM_UTIL_ROTATE_NUM; mm_util_image_h convert_img = NULL; err = __check_parameter_validity_for_buffer(path, width, height, thumb_buffer, thumb_size, thumb_width, thumb_height); -- 2.7.4