From 94535bf3889e7aac7795dd005191dfec77caad9d Mon Sep 17 00:00:00 2001 From: hj kim Date: Wed, 29 Nov 2017 17:51:16 +0900 Subject: [PATCH] Change hard coded path to get by using tzplatform API Change-Id: I786b53b07e41e44696f912aff556ff3d583332f4 --- bmp/test/CMakeLists.txt | 2 +- bmp/test/mm_util_bmp_testsuite.c | 3 ++- gif/test/mm_util_gif_testsuite.c | 7 ++++--- packaging/libmm-utility.spec | 2 +- png/test/CMakeLists.txt | 2 +- png/test/mm_util_png_testsuite.c | 4 +++- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/bmp/test/CMakeLists.txt b/bmp/test/CMakeLists.txt index 4e3f1f7..60c7b27 100755 --- a/bmp/test/CMakeLists.txt +++ b/bmp/test/CMakeLists.txt @@ -2,7 +2,7 @@ SET(fw_name "mmutil_bmp") SET(fw_test "${fw_name}-test") INCLUDE(FindPkgConfig) -pkg_check_modules(${fw_test} REQUIRED glib-2.0 gmodule-2.0 dlog) +pkg_check_modules(${fw_test} REQUIRED glib-2.0 gmodule-2.0 dlog libtzplatform-config) FOREACH(flag ${${fw_test}_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) diff --git a/bmp/test/mm_util_bmp_testsuite.c b/bmp/test/mm_util_bmp_testsuite.c index 4fd70fb..ff31718 100755 --- a/bmp/test/mm_util_bmp_testsuite.c +++ b/bmp/test/mm_util_bmp_testsuite.c @@ -24,8 +24,9 @@ #include #include #include +#include -#define DECODE_RESULT_PATH "/opt/usr/media/decode_test." +#define DECODE_RESULT_PATH tzplatform_mkpath(TZ_USER_CONTENT, "decode_test.") #define BUFFER_SIZE 128 static inline void flush_stdin() diff --git a/gif/test/mm_util_gif_testsuite.c b/gif/test/mm_util_gif_testsuite.c index ff20f44..33ffc3d 100755 --- a/gif/test/mm_util_gif_testsuite.c +++ b/gif/test/mm_util_gif_testsuite.c @@ -25,8 +25,9 @@ #include #include #include +#include -#define ENCODED_FILEPATH "/opt/usr/home/owner/media/mm_util_test.gif" +#define ENCODE_RESULT_PATH tzplatform_mkpath(TZ_USER_CONTENT, "encode_test.gif") #define ANIMATED_FRAME_MAX 100 static gboolean g_encode_mem = FALSE; @@ -156,7 +157,7 @@ int main(int argc, char *argv[]) ret = mm_util_gif_encode_set_mem(gif_file, (void **)&encoded_gif_mem, &encoded_gif_size); fprintf(stderr, "\t mm_util_gif_encode_set_mem [%d]\n", ret); } else { - ret = mm_util_gif_encode_set_file(gif_file, ENCODED_FILEPATH); + ret = mm_util_gif_encode_set_file(gif_file, ENCODE_RESULT_PATH); fprintf(stderr, "\t mm_util_gif_enc_set_file [%d]\n", ret); } @@ -194,7 +195,7 @@ int main(int argc, char *argv[]) ret = mm_util_gif_encode_save(gif_file); fprintf(stderr, "\t mm_util_gif_enc_save [%d]\n", ret); if (g_encode_mem) - _write_file(ENCODED_FILEPATH, (void *)encoded_gif_mem, (size_t)encoded_gif_size); + _write_file(ENCODE_RESULT_PATH, (void *)encoded_gif_mem, (size_t)encoded_gif_size); mm_util_gif_encode_destroy(gif_file); return 0; diff --git a/packaging/libmm-utility.spec b/packaging/libmm-utility.spec index cab5b4c..7ac87fd 100755 --- a/packaging/libmm-utility.spec +++ b/packaging/libmm-utility.spec @@ -1,6 +1,6 @@ Name: libmm-utility Summary: Multimedia Framework Utility Library -Version: 0.1.1 +Version: 0.1.2 Release: 0 Group: System/Libraries License: Apache-2.0 diff --git a/png/test/CMakeLists.txt b/png/test/CMakeLists.txt index 662cb32..44aa4a3 100755 --- a/png/test/CMakeLists.txt +++ b/png/test/CMakeLists.txt @@ -2,7 +2,7 @@ SET(fw_name "mmutil_png") SET(fw_test "${fw_name}-test") INCLUDE(FindPkgConfig) -pkg_check_modules(${fw_test} REQUIRED glib-2.0 gmodule-2.0 dlog) +pkg_check_modules(${fw_test} REQUIRED glib-2.0 gmodule-2.0 dlog libtzplatform-config) FOREACH(flag ${${fw_test}_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) diff --git a/png/test/mm_util_png_testsuite.c b/png/test/mm_util_png_testsuite.c index c44310f..fd20817 100755 --- a/png/test/mm_util_png_testsuite.c +++ b/png/test/mm_util_png_testsuite.c @@ -24,8 +24,10 @@ #include #include #include +#include + +#define DECODE_RESULT_PATH tzplatform_mkpath(TZ_USER_CONTENT, "decode_test.") -#define DECODE_RESULT_PATH "/media/decode_test." #define TRUE 1 #define FALSE 0 #define BUFFER_SIZE 128 -- 2.7.4