Use MS_STRING_VALID instead

[platform/core/multimedia/libmedia-service.git] / src / common / media-svc-util.c

diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c
index 8fbb2a8..8e28312 100644 (file)
--- a/src/common/media-svc-util.c
+++ b/src/common/media-svc-util.c
@@ -42,18 +42,15 @@
 #include <libxml/HTMLparser.h>
 #include <dlfcn.h>
 
-#define MEDIA_SVC_FILE_EXT_LEN_MAX                             6                       /**< Maximum file ext lenth*/
+#define MEDIA_SVC_FILE_EXT_LEN_MAX 6
 
 #define MUSIC_MIME_NUM 29
 #define SOUND_MIME_NUM 2
 #define MIME_LENGTH 50
-#define MEDIA_SVC_DEFAULT_FORMAT_LEN 19
 #define IMAGE_PREFIX "image/"
-#define IMAGE_PREFIX_LEN 6
 #define AUDIO_PREFIX "audio/"
-#define AUDIO_PREFIX_LEN 6
 #define VIDEO_PREFIX "video/"
-#define VIDEO_PREFIX_LEN 6
+#define PREFIX_LEN 6
 
 #define MEDIA_SVC_PDF_TAG_TAIL_LEN 12
 #define MEDIA_SVC_PDF_BUF_SIZE 256
@@ -100,7 +97,6 @@ static const char music_mime_table[MUSIC_MIME_NUM][MIME_LENGTH] = {
        "x-ape",
        "x-ms-asx",
        "vnd.rn-realaudio",
-
        "x-vorbis", /*alias of audio/x-vorbis+ogg*/
        "vorbis", /*alias of audio/x-vorbis+ogg*/
        "x-oggflac",
@@ -173,36 +169,36 @@ static int __media_svc_get_media_type(const char *path, const char *mime_type, m
        media_svc_retvm_if(!media_type, MS_MEDIA_ERR_INVALID_PARAMETER, "media_type is null");
 
        /* Image */
-       if (strncmp(mime_type, IMAGE_PREFIX, IMAGE_PREFIX_LEN) == 0) {
+       if (strncmp(mime_type, IMAGE_PREFIX, PREFIX_LEN) == 0) {
                *media_type = MEDIA_SVC_MEDIA_TYPE_IMAGE;
                return MS_MEDIA_ERR_NONE;
        }
 
        /* Audio */
-       if (strncmp(mime_type, AUDIO_PREFIX, AUDIO_PREFIX_LEN) == 0) {
+       if (strncmp(mime_type, AUDIO_PREFIX, PREFIX_LEN) == 0) {
                *media_type = MEDIA_SVC_MEDIA_TYPE_SOUND;
 
                for (idx = 0; idx < MUSIC_MIME_NUM; idx++) {
-                       if (strcmp(mime_type + AUDIO_PREFIX_LEN, music_mime_table[idx]) == 0) {
+                       if (strcmp(mime_type + PREFIX_LEN, music_mime_table[idx]) == 0) {
                                *media_type = MEDIA_SVC_MEDIA_TYPE_MUSIC;
                                break;
                        }
                }
 
                /* audio/x-mpegurl : .m3u file (playlist file) */
-               if (strcmp(mime_type + AUDIO_PREFIX_LEN, "x-mpegurl") == 0)
+               if (strcmp(mime_type + PREFIX_LEN, "x-mpegurl") == 0)
                        *media_type = MEDIA_SVC_MEDIA_TYPE_OTHER;
 
                return MS_MEDIA_ERR_NONE;
        }
 
        /* Video */
-       if (strncmp(mime_type, VIDEO_PREFIX, VIDEO_PREFIX_LEN) == 0) {
+       if (strncmp(mime_type, VIDEO_PREFIX, PREFIX_LEN) == 0) {
                *media_type = MEDIA_SVC_MEDIA_TYPE_VIDEO;
 
                /*some video files don't have video stream. in this case it is categorize as music. */
-               if (strcmp(mime_type + VIDEO_PREFIX_LEN, "3gpp") == 0 ||
-                       strcmp(mime_type + VIDEO_PREFIX_LEN, "mp4") == 0) {
+               if (strcmp(mime_type + PREFIX_LEN, "3gpp") == 0 ||
+                       strcmp(mime_type + PREFIX_LEN, "mp4") == 0) {
                        if (mm_file_get_stream_info(path, &audio, &video) == FILEINFO_ERROR_NONE) {
                                if (audio > 0 && video == 0)
                                        *media_type = MEDIA_SVC_MEDIA_TYPE_MUSIC;
@@ -322,7 +318,7 @@ static char *__media_svc_get_title_from_filename(const char *filename)
        char *title = NULL;
        char *last_dot = NULL;
 
-       media_svc_retvm_if(!STRING_VALID(filename), g_strdup(MEDIA_SVC_TAG_UNKNOWN), "Invalid path");
+       media_svc_retvm_if(!MS_STRING_VALID(filename), g_strdup(MEDIA_SVC_TAG_UNKNOWN), "Invalid path");
 
        last_dot = strrchr(filename, '.');
        if (last_dot) {
@@ -338,7 +334,7 @@ static char *__media_svc_get_title_from_filename(const char *filename)
 
 void _media_svc_remove_file(const char *path)
 {
-       if (!STRING_VALID(path))
+       if (!MS_STRING_VALID(path))
                return;
 
        if (remove(path) != 0)
@@ -353,7 +349,7 @@ static int __media_svc_get_thumbnail_path(char *thumb_path, const char *pathname
        g_autofree gchar *thumb_dir = NULL;
 
        ret = ms_user_get_root_thumb_store_path(uid, &thumb_dir);
-       media_svc_retvm_if(!STRING_VALID(thumb_dir), ret, "ms_user_get_root_thumb_store_path failed");
+       media_svc_retvm_if(!MS_STRING_VALID(thumb_dir), ret, "ms_user_get_root_thumb_store_path failed");
        media_svc_retvm_if(!g_file_test(thumb_dir, G_FILE_TEST_IS_DIR), MS_MEDIA_ERR_INTERNAL, "Not a directory");
 
        memset(file_ext, 0, sizeof(file_ext));
@@ -365,12 +361,12 @@ static int __media_svc_get_thumbnail_path(char *thumb_path, const char *pathname
 
        if (img_format) {
                /* 'img_format' is mime-type */
-               if (!g_str_has_prefix(img_format, IMAGE_PREFIX) || strlen(img_format) == IMAGE_PREFIX_LEN) {
+               if (!g_str_has_prefix(img_format, IMAGE_PREFIX) || strlen(img_format) == PREFIX_LEN) {
                        media_svc_error("Not proper img format");
                        return MS_MEDIA_ERR_INTERNAL;
                }
 
-               snprintf(thumb_path, MEDIA_SVC_PATHNAME_SIZE, "%s/.%s-%s.%s", thumb_dir, file_ext, hash, img_format + IMAGE_PREFIX_LEN);
+               snprintf(thumb_path, MEDIA_SVC_PATHNAME_SIZE, "%s/.%s-%s.%s", thumb_dir, file_ext, hash, img_format + PREFIX_LEN);
        } else {
                if (strcasecmp(file_ext, "PNG") == 0)
                        snprintf(thumb_path, MEDIA_SVC_PATHNAME_SIZE, "%s/.%s-%s.png", thumb_dir, file_ext, hash);
@@ -399,7 +395,7 @@ int _media_svc_set_media_info(media_svc_content_info_s *content_info, const char
        char mime_type[256] = {0, };
        media_svc_media_type_e media_type;
 
-       media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
+       media_svc_retvm_if(!MS_STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
 
        content_info->path = g_strdup(path);
        media_svc_retv_del_if(content_info->path == NULL, MS_MEDIA_ERR_INTERNAL, content_info);
@@ -487,7 +483,7 @@ int _media_svc_extract_image_metadata(media_svc_content_info_s *content_info)
 
        media_svc_retvm_if(!content_info, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid content_info");
        media_svc_retvm_if(content_info->media_type != MEDIA_SVC_MEDIA_TYPE_IMAGE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid media_type [%d]", content_info->media_type);
-       media_svc_retvm_if(!STRING_VALID(content_info->path), MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid path");
+       media_svc_retvm_if(!MS_STRING_VALID(content_info->path), MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid path");
 
        path = content_info->path;
        content_info->media_meta.title = __media_svc_get_title_from_filename(content_info->file_name);