From ec450c6f599884bc71bd56e21827adc13564786d Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Wed, 11 Mar 2020 14:08:00 +0900 Subject: [PATCH] Changed default thumbnail format to png Change to save thumbnails as png, regardless of the format of the original image. Change-Id: I828a21f72b8c4a836c3f55c23b3966cfbc20819b Signed-off-by: Minje Ahn (cherry picked from commit 838ab99691457ae0790b5fbe7d30f09810d1a94e) --- src/common/media-svc-util.c | 7 ++----- src/include/common/media-svc-env.h | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c index cac4209..d8ccf27 100644 --- a/src/common/media-svc-util.c +++ b/src/common/media-svc-util.c @@ -706,10 +706,7 @@ int _media_svc_get_thumbnail_path(media_svc_media_type_e media_type, char *thumb snprintf(thumb_path, MEDIA_SVC_PATHNAME_SIZE, "%s/.%s-%s.%s", thumb_dir, file_ext, hash, thumbfile_ext); } else { - if (strcasecmp(file_ext, "PNG") == 0) - snprintf(thumb_path, MEDIA_SVC_PATHNAME_SIZE, "%s/.%s-%s.png", thumb_dir, file_ext, hash); - else - snprintf(thumb_path, MEDIA_SVC_PATHNAME_SIZE, "%s/.%s-%s.jpg", thumb_dir, file_ext, hash); + snprintf(thumb_path, MEDIA_SVC_PATHNAME_SIZE, "%s/.%s-%s.png", thumb_dir, file_ext, hash); } SAFE_FREE(thumb_dir); @@ -1718,7 +1715,7 @@ int _media_svc_create_thumbnail(const char *path, char *thumb_path, media_svc_me media_svc_sec_debug("Path[%s] Type[%d]", path, media_type); //1. make hash path - ret = _media_svc_get_thumbnail_path(media_type, thumb_path, path, THUMB_EXT, uid); + ret = _media_svc_get_thumbnail_path(media_type, thumb_path, path, NULL, uid); if (ret != MS_MEDIA_ERR_NONE) { media_svc_error("_media_svc_get_thumbnail_path failed - %d", ret); SAFE_STRLCPY(thumb_path, "", MAX_FILEPATH_LEN); diff --git a/src/include/common/media-svc-env.h b/src/include/common/media-svc-env.h index f5a9be4..3ca4374 100755 --- a/src/include/common/media-svc-env.h +++ b/src/include/common/media-svc-env.h @@ -133,7 +133,6 @@ extern "C" { #define MEDIA_SVC_TAG_UNKNOWN "" -#define THUMB_EXT "jpg" #define THUMB_MAX_ALLOWED_MEM 9000000 #define THUMB_WIDTH 320 #define THUMB_HEIGHT 240 -- 2.7.4