diff options
| author | jiyong.min <jiyong.min@samsung.com> | 2023-02-03 07:57:24 +0900 |
|---|---|---|
| committer | jiyong.min <jiyong.min@samsung.com> | 2023-02-03 10:01:46 +0900 |
| commit | 01606a067b26334aa17751aba1f29d6e78a66f82 (patch) | |
| tree | 3b1001936ce4780aec59d3098388b1112f379a0c | |
| parent | ed88ae5e86ceff6f801c3e33e201b0cf343de6b2 (diff) | |
| download | libmedia-thumbnail-01606a067b26334aa17751aba1f29d6e78a66f82.tar.gz libmedia-thumbnail-01606a067b26334aa17751aba1f29d6e78a66f82.tar.bz2 libmedia-thumbnail-01606a067b26334aa17751aba1f29d6e78a66f82.zip | |
Thumbnail creation does not allow a large size imagesubmit/tizen_6.0/20230203.011241
- When applications use a lot of memory for thumbail creation,
it was killed by memory management.
So it is added that thumbnail creation does not allow a large size iamge.
Change-Id: I9ded08e7460aed3a18f190d1ae3cf0e44bf7e320
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | packaging/libmedia-thumbnail.spec | 6 | ||||
| -rwxr-xr-x | src/media-thumbnail.c | 8 |
3 files changed, 11 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3313844..4d6a304 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,6 +56,9 @@ ADD_DEFINITIONS("-DPACKAGE=\"${PACKAGE}\"") ADD_DEFINITIONS("-DPACKAGE_NAME=\"${PKGNAME}\"") ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"") ADD_DEFINITIONS("-D_GNU_SOURCE") +IF(WITH_DA_PROFILE) + ADD_DEFINITIONS("-DWITH_DA_PROFILE") +ENDIF(WITH_DA_PROFILE) SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--hash-style=both") CONFIGURE_FILE(media-thumbnail.pc.in media-thumbnail.pc @ONLY) diff --git a/packaging/libmedia-thumbnail.spec b/packaging/libmedia-thumbnail.spec index c218607..7bc4dfe 100644 --- a/packaging/libmedia-thumbnail.spec +++ b/packaging/libmedia-thumbnail.spec @@ -1,6 +1,6 @@ Name: libmedia-thumbnail Summary: Media thumbnail service library for multimedia applications -Version: 0.3.3 +Version: 0.3.4 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 and PD @@ -50,7 +50,9 @@ cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} . %build -%cmake . -DBUILD_GTESTS=%{?gtests:1}%{!?gtests:0} +%cmake . -DBUILD_GTESTS=%{?gtests:1}%{!?gtests:0} \ + -DWITH_DA_PROFILE=%{?_with_da_profile:1}%{!?_with_da_profile:0} + make %{?_smp_mflags} %install diff --git a/src/media-thumbnail.c b/src/media-thumbnail.c index d51a280..01dad84 100755 --- a/src/media-thumbnail.c +++ b/src/media-thumbnail.c @@ -517,12 +517,12 @@ static int __get_image_info(const char *path, unsigned int *width, unsigned int thumb_retvm_if(err != MS_MEDIA_ERR_NONE, MS_MEDIA_ERR_INTERNAL, "Getting image info is failed err: %d", err); thumb_retvm_if(image_type == IMG_CODEC_UNKNOWN_TYPE, MS_MEDIA_ERR_UNSUPPORTED_CONTENT, "Unsupported image codec"); - /* - if ((image_type != IMG_CODEC_JPEG) && (image_w * image_h > THUMB_MAX_ALLOWED_MEM_FOR_THUMB)) { +#if defined(WITH_DA_PROFILE) + if (image_w * image_h > THUMB_MAX_ALLOWED_MEM_FOR_THUMB) { thumb_warn("This original image is too big. w[%d] h[%d] size limit[%d]", image_w, image_h, THUMB_MAX_ALLOWED_MEM_FOR_THUMB); - return MS_MEDIA_ERR_THUMB_TOO_BIG; + return MS_MEDIA_ERR_UNSUPPORTED_CONTENT; } - */ +#endif *width = image_w; *height = image_h; |