Add media_info_create(const char *path, media_info_h *media)
[platform/core/api/media-content.git] / src / media_info.c
index 8135acd..dbbb7fa 100755 (executable)
@@ -30,16 +30,12 @@ static int __media_info_get_media_path_by_id_from_db(const char *media_id, char
        sqlite3_stmt *stmt = NULL;
        char *select_query = NULL;
 
-       if(!STRING_VALID(media_id))
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(!STRING_VALID(media_id), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid media_id");
 
        select_query = sqlite3_mprintf(SELECT_MEDIA_PATH_BY_ID, media_id);
 
        ret = _content_query_prepare(&stmt, select_query, NULL, NULL);
-       sqlite3_free(select_query);
+       SQLITE3_SAFE_FREE(select_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        if(sqlite3_step(stmt) == SQLITE_ROW)
@@ -147,8 +143,8 @@ static int __media_info_insert_batch(media_batch_insert_e insert_type, const cha
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
        FILE *fp = NULL;
-       char list_path[255] = {0,};
-       int idx = 0;
+       char list_path[255] = {0, };
+       unsigned int idx = 0;
        int nwrites = 0;
 
        for (idx = 0; idx < BATCH_REQUEST_MAX; idx++) {
@@ -179,7 +175,7 @@ static int __media_info_insert_batch(media_batch_insert_e insert_type, const cha
                if (STRING_VALID(path_array[idx])) {
                        int size = strlen(path_array[idx]);
 
-                       ret = _media_util_check_file(path_array[idx]);
+                       ret = _media_util_check_file_exist(path_array[idx]);
                        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                                fclose(fp);
                                if (unlink(list_path) < 0) {
@@ -215,11 +211,7 @@ static int __media_info_insert_batch(media_batch_insert_e insert_type, const cha
        fclose(fp);
 
        media_insert_cb_s *_cb_data = (media_insert_cb_s *)calloc(1, sizeof(media_insert_cb_s));
-       if(_cb_data == NULL)
-       {
-               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-       }
+       media_content_retvm_if(_cb_data == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
        _cb_data->insert_completed_cb = completed_cb;
        _cb_data->user_data = user_data;
@@ -457,16 +449,12 @@ int _media_info_get_media_info_from_db(const char *path, const char *storage_id,
        char *select_query = NULL;
        media_info_s *_media = (media_info_s*)media;
 
-       if(_media == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(_media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid media");
 
        select_query = sqlite3_mprintf(SELECT_MEDIA_BY_PATH, storage_id, path);
 
        ret = _content_query_prepare(&stmt, select_query, NULL, NULL);
-       sqlite3_free(select_query);
+       SQLITE3_SAFE_FREE(select_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        if(sqlite3_step(stmt) == SQLITE_ROW)
@@ -484,37 +472,36 @@ int _media_info_get_media_info_from_db(const char *path, const char *storage_id,
 
 int media_info_insert_to_db(const char *path, media_info_h *info)
 {
+       bool ignore_file = FALSE;
        bool ignore_dir = FALSE;
        char *folder_path = NULL;
+       char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, };
        int ret = MEDIA_CONTENT_ERROR_NONE;
 
-       if(!STRING_VALID(path))
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(!STRING_VALID(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid path");
+       media_content_retvm_if(info == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid info");
 
-       if(info == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       ret = _media_util_check_ignore_file(path, &ignore_file);
+       media_content_retvm_if(ignore_file == TRUE, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path");
 
-       ret = _media_util_check_file(path);
-       if (ret != MEDIA_CONTENT_ERROR_NONE) {
-               return ret;
-       }
+       ret = _media_util_check_file_exist(path);
+       media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        folder_path = g_path_get_dirname(path);
        ret = _media_util_check_ignore_dir(folder_path, &ignore_dir);
        SAFE_FREE(folder_path);
 
-       if(ignore_dir) {
-               media_content_error("Invalid folder path");
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+       media_content_retvm_if(ignore_dir == TRUE, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid folder path");
+
+       memset(storage_id, 0x00, sizeof(storage_id));
+       ret = media_svc_get_storage_id(_content_get_db_handle(), path, storage_id);
+       if(ret != MS_MEDIA_ERR_NONE)
+       {
+               media_content_error("media_svc_get_storage_id failed : %d", ret);
+               return _content_error_capi(MEDIA_CONTENT_TYPE, ret);
        }
 
-       ret = media_svc_check_item_exist_by_path(_content_get_db_handle(), path);
+       ret = media_svc_check_item_exist_by_path(_content_get_db_handle(), storage_id, path);
        if (ret == MS_MEDIA_ERR_DB_NO_RECORD) {
                media_content_sec_debug("media_svc_check_item_exist_by_path : no record : %s", path);
 
@@ -526,7 +513,7 @@ int media_info_insert_to_db(const char *path, media_info_h *info)
                        return _content_error_capi(MEDIA_CONTENT_TYPE, ret);
                }
 
-               ret = media_svc_insert_item_immediately(_content_get_db_handle(), storage_type, path, tzplatform_getuid(TZ_USER_NAME));
+               ret = media_svc_insert_item_immediately(_content_get_db_handle(), storage_id, storage_type, path, tzplatform_getuid(TZ_USER_NAME));
 
                if(ret != MS_MEDIA_ERR_NONE) {
                        if (ret == MS_MEDIA_ERR_DB_CONSTRAINT_FAIL) {
@@ -544,11 +531,7 @@ int media_info_insert_to_db(const char *path, media_info_h *info)
        }
 
        media_info_s *_media = (media_info_s*)calloc(1, sizeof(media_info_s));
-       if(_media == NULL)
-       {
-               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-       }
+       media_content_retvm_if(_media == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
        ret = _media_info_get_media_info_from_db(path, DEFAULT_MEDIA_STORAGE_ID, (media_info_h)_media);
 
@@ -562,34 +545,16 @@ int media_info_insert_batch_to_db(
                                        media_insert_completed_cb completed_cb,
                                        void *user_data)
 {
-       if (path_array == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-
-       if (array_length <= 0)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(path_array == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path_array");
+       media_content_retvm_if(array_length <= 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid array_length");
 
        return __media_info_insert_batch(MEDIA_BATCH_INSERT_NORMAL, path_array, array_length, completed_cb, user_data);
 }
 
 int media_info_insert_burst_shot_to_db(const char **path_array, unsigned int array_length, media_insert_burst_shot_completed_cb callback, void *user_data)
 {
-       if (path_array == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-
-       if (array_length <= 0)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(path_array == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path_array");
+       media_content_retvm_if(array_length <= 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid array_length");
 
        return __media_info_insert_batch(MEDIA_BATCH_INSERT_BURSTSHOT, path_array, array_length, callback, user_data);
 }
@@ -598,7 +563,7 @@ int media_info_delete_from_db(const char *media_id)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
        char *path = NULL;
-       char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0,};
+       char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, };
 
        if(!STRING_VALID(media_id))
        {
@@ -681,11 +646,7 @@ int media_info_delete_batch_from_db(filter_h filter)
        char *condition_query = NULL;
        GArray *thumb_list = NULL;
 
-       if(filter == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(filter == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid filter");
 
        thumb_list = g_array_new(FALSE, FALSE, sizeof(char*));
 
@@ -727,15 +688,25 @@ int media_info_delete_batch_from_db(filter_h filter)
                        In this case, send noti for internal storage and external storage
                */
                media_content_debug("Batch deletion is successfull. Send notification for this");
-               media_svc_publish_noti(_content_get_db_handle(), MS_MEDIA_ITEM_DIRECTORY, MS_MEDIA_ITEM_UPDATE, MEDIA_CONTENT_PATH_PHONE, -1, NULL, NULL);
-               media_svc_publish_noti(_content_get_db_handle(), MS_MEDIA_ITEM_DIRECTORY, MS_MEDIA_ITEM_UPDATE, MEDIA_CONTENT_PATH_MMC, -1, NULL, NULL);
+               if (_filter->storage_id != NULL) {
+                       char *storage_path = NULL;
+                       media_svc_get_storage_path(_content_get_db_handle(), _filter->storage_id, &storage_path);
+                       if (STRING_VALID(storage_path))
+                               media_svc_publish_noti(_content_get_db_handle(), MS_MEDIA_ITEM_DIRECTORY, MS_MEDIA_ITEM_UPDATE, storage_path, -1, NULL, NULL);
+
+                       SAFE_FREE(storage_path);
+               } else {
+                       /*FIX ME*/
+                       media_svc_publish_noti(_content_get_db_handle(), MS_MEDIA_ITEM_DIRECTORY, MS_MEDIA_ITEM_UPDATE, MEDIA_ROOT_PATH_INTERNAL, -1, NULL, NULL);
+                       media_svc_publish_noti(_content_get_db_handle(), MS_MEDIA_ITEM_DIRECTORY, MS_MEDIA_ITEM_UPDATE, MEDIA_ROOT_PATH_SDCARD, -1, NULL, NULL);
+               }
 
                __media_info_delete_thumb_from_list(thumb_list);
                __media_info_release_thumb_list(thumb_list);
        }
 
        SAFE_FREE(condition_query);
-       sqlite3_free(query_string);
+       SQLITE3_SAFE_FREE(query_string);
 
        return ret;
 }
@@ -830,12 +801,7 @@ int media_info_clone(media_info_h *dst, media_info_h src)
        if(_src != NULL)
        {
                media_info_s *_dst = (media_info_s*)calloc(1, sizeof(media_info_s));
-
-               if(_dst == NULL)
-               {
-                       media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                       return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-               }
+               media_content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
                if(STRING_VALID(_src->media_id))
                {
@@ -1391,11 +1357,7 @@ int media_info_foreach_media_from_db(filter_h filter, media_info_cb callback, vo
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
 
-       if(callback == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(callback == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid callback");
 
        ret = _media_db_get_group_item(NULL, filter, callback, user_data, MEDIA_GROUP_NONE);
 
@@ -1470,37 +1432,52 @@ int media_info_foreach_bookmark_from_db (const char *media_id, filter_h filter,
        return ret;
 }
 
-int media_info_get_image(media_info_h media, image_meta_h *image)
+int media_info_get_face_count_from_db(const char *media_id, filter_h filter, int *face_count)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
 
-       media_info_s *_media = (media_info_s*)media;
-
-       if(_media == NULL)
+       if(STRING_VALID(media_id) && face_count)
        {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+               ret = _media_db_get_group_item_count(media_id, filter, MEDIA_GROUP_FACE_BY_MEDIA_ID, face_count);
        }
-
-       if(_media->media_type != MEDIA_CONTENT_TYPE_IMAGE)
+       else
        {
                media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       if(_media->image_meta == NULL)
+       return ret;
+}
+
+int media_info_foreach_face_from_db (const char *media_id, filter_h filter, media_face_cb callback, void *user_data)
+{
+       int ret = MEDIA_CONTENT_ERROR_NONE;
+
+       if((callback != NULL) && STRING_VALID(media_id))
+       {
+               ret = _media_db_get_face(media_id, filter, callback, user_data);
+       }
+       else
        {
                media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       image_meta_s *_image = (image_meta_s*)calloc(1, sizeof(image_meta_s));
+       return ret;
+}
 
-       if(_image == NULL)
-       {
-               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-       }
+int media_info_get_image(media_info_h media, image_meta_h *image)
+{
+       int ret = MEDIA_CONTENT_ERROR_NONE;
+
+       media_info_s *_media = (media_info_s*)media;
+
+       media_content_retvm_if(_media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media");
+       media_content_retvm_if(_media->media_type != MEDIA_CONTENT_TYPE_IMAGE, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media_type");
+       media_content_retvm_if(_media->image_meta == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid image_meta");
+
+       image_meta_s *_image = (image_meta_s*)calloc(1, sizeof(image_meta_s));
+       media_content_retvm_if(_image == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
        if(STRING_VALID(_media->media_id)) {
                _image->media_id = strdup(_media->media_id);
@@ -1547,31 +1524,12 @@ int media_info_get_video(media_info_h media, video_meta_h *video)
 
        media_info_s *_media = (media_info_s*)media;
 
-       if(_media == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-
-       if(_media->media_type != MEDIA_CONTENT_TYPE_VIDEO)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-
-       if(_media->video_meta == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(_media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media");
+       media_content_retvm_if(_media->media_type != MEDIA_CONTENT_TYPE_VIDEO, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media_type");
+       media_content_retvm_if(_media->video_meta == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid video_meta");
 
        video_meta_s *_video = (video_meta_s*)calloc(1, sizeof(video_meta_s));
-
-       if(_video == NULL)
-       {
-               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-       }
+       media_content_retvm_if(_video == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
        if(STRING_VALID(_media->media_id)) {
                _video->media_id = strdup(_media->media_id);
@@ -1627,31 +1585,13 @@ int media_info_get_audio(media_info_h media, audio_meta_h *audio)
 
        media_info_s *_media = (media_info_s*)media;
 
-       if(_media == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
 
-       if(_media->media_type != MEDIA_CONTENT_TYPE_MUSIC && _media->media_type != MEDIA_CONTENT_TYPE_SOUND)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-
-       if(_media->audio_meta == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(_media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media");
+       media_content_retvm_if(_media->media_type != MEDIA_CONTENT_TYPE_MUSIC && _media->media_type != MEDIA_CONTENT_TYPE_SOUND, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media_type");
+       media_content_retvm_if(_media->audio_meta == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid audio_meta");
 
        audio_meta_s *_audio = (audio_meta_s*)calloc(1, sizeof(audio_meta_s));
-
-       if(_audio == NULL)
-       {
-               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-       }
+       media_content_retvm_if(_audio == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
        if(STRING_VALID(_media->media_id)) {
                _audio->media_id = strdup(_media->media_id);
@@ -1712,11 +1652,7 @@ int media_info_get_media_id(media_info_h media, char **media_id)
                if(STRING_VALID(_media->media_id))
                {
                        *media_id = strdup(_media->media_id);
-                       if(*media_id == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(*media_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -1743,11 +1679,7 @@ int media_info_get_file_path(media_info_h media, char **path)
                if(STRING_VALID(_media->file_path))
                {
                        *path = strdup(_media->file_path);
-                       if(*path == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(*path == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -1774,11 +1706,7 @@ int media_info_get_display_name(media_info_h media, char **name)
                if(STRING_VALID(_media->display_name))
                {
                        *name = strdup(_media->display_name);
-                       if(*name == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(*name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -1824,11 +1752,7 @@ int media_info_get_mime_type(media_info_h media, char **mime_type)
                if(STRING_VALID(_media->mime_type))
                {
                        *mime_type = strdup(_media->mime_type);
-                       if(*mime_type == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(*mime_type == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -1927,11 +1851,7 @@ int media_info_get_thumbnail_path(media_info_h media, char **path)
                if(STRING_VALID(_media->thumbnail_path))
                {
                        *path = strdup(_media->thumbnail_path);
-                       if(*path == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(*path == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -1959,11 +1879,7 @@ int media_info_get_title(media_info_h media, char **title)
                if(STRING_VALID(_media->title))
                {
                        *title = strdup(_media->title);
-                       if(*title == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(*title == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -1990,11 +1906,7 @@ int media_info_get_description(media_info_h media, char **description)
                if(STRING_VALID(_media->description))
                {
                        *description = strdup(_media->description);
-                       if(*description == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(*description == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -2077,11 +1989,7 @@ int media_info_get_weather(media_info_h media, char **weather)
                if(STRING_VALID(_media->weather))
                {
                        *weather = strdup(_media->weather);
-                       if(*weather == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(*weather == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -2147,11 +2055,7 @@ int media_info_get_author(media_info_h media, char **author)
                if(STRING_VALID(_media->author))
                {
                        *author = strdup(_media->author);
-                       if(*author == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(*author == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -2178,11 +2082,7 @@ int media_info_get_provider(media_info_h media, char **provider)
                if(STRING_VALID(_media->provider))
                {
                        *provider = strdup(_media->provider);
-                       if(*provider == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(*provider == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -2209,11 +2109,7 @@ int media_info_get_content_name(media_info_h media, char **content_name)
                if(STRING_VALID(_media->content_name))
                {
                        *content_name = strdup(_media->content_name);
-                       if(*content_name == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(*content_name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -2240,11 +2136,7 @@ int media_info_get_category(media_info_h media, char **category)
                if(STRING_VALID(_media->category))
                {
                        *category = strdup(_media->category);
-                       if(*category == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(*category == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -2271,11 +2163,7 @@ int media_info_get_location_tag(media_info_h media, char **location_tag)
                if(STRING_VALID(_media->location_tag))
                {
                        *location_tag = strdup(_media->location_tag);
-                       if(*location_tag == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(*location_tag == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -2302,11 +2190,7 @@ int media_info_get_age_rating(media_info_h media, char **age_rating)
                if(STRING_VALID(_media->age_rating))
                {
                        *age_rating = strdup(_media->age_rating);
-                       if(*age_rating == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(*age_rating == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -2333,11 +2217,7 @@ int media_info_get_keyword(media_info_h media, char **keyword)
                if(STRING_VALID(_media->keyword))
                {
                        *keyword = strdup(_media->keyword);
-                       if(*keyword == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(*keyword == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -2364,11 +2244,7 @@ int media_info_get_storage_id(media_info_h media, char **storage_id)
                if(STRING_VALID(_media->storage_uuid))
                {
                        *storage_id = strdup(_media->storage_uuid);
-                       if(*storage_id == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(*storage_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -2505,7 +2381,7 @@ int media_info_get_media_from_db(const char *media_id, media_info_h *media)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
        char select_query[DEFAULT_QUERY_SIZE];
-       char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0,};
+       char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, };
        sqlite3_stmt *stmt = NULL;
 
        if(!STRING_VALID(media_id) || (media == NULL))
@@ -2561,11 +2437,7 @@ int media_info_set_display_name(media_info_h media, const char *display_name)
                SAFE_FREE(_media->display_name);
 
                _media->display_name = strdup(display_name);
-               if(_media->display_name == NULL)
-               {
-                       media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                       return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-               }
+               media_content_retvm_if(_media->display_name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
        }
        else
        {
@@ -2588,12 +2460,7 @@ int media_info_set_description(media_info_h media, const char *description)
                if(STRING_VALID(description))
                {
                        _media->description = strdup(description);
-
-                       if(_media->description == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(_media->description == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -2675,12 +2542,7 @@ int media_info_set_weather(media_info_h media, const char *weather)
                if(STRING_VALID(weather))
                {
                        _media->weather = strdup(weather);
-
-                       if(_media->weather == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(_media->weather == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -2768,11 +2630,7 @@ int media_info_set_author(media_info_h media, const char *author)
                if(STRING_VALID(author))
                {
                        _media->author = strdup(author);
-                       if(_media->author == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(_media->author == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -2800,11 +2658,7 @@ int media_info_set_provider(media_info_h media, const char *provider)
                if(STRING_VALID(provider))
                {
                        _media->provider = strdup(provider);
-                       if(_media->provider == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(_media->provider == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -2832,11 +2686,7 @@ int media_info_set_content_name(media_info_h media, const char *content_name)
                if(STRING_VALID(content_name))
                {
                        _media->content_name = strdup(content_name);
-                       if(_media->content_name == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(_media->content_name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -2864,11 +2714,7 @@ int media_info_set_category(media_info_h media, const char *category)
                if(STRING_VALID(category))
                {
                        _media->category = strdup(category);
-                       if(_media->category == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(_media->category == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -2896,11 +2742,7 @@ int media_info_set_location_tag(media_info_h media, const char *location_tag)
                if(STRING_VALID(location_tag))
                {
                        _media->location_tag = strdup(location_tag);
-                       if(_media->location_tag == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(_media->location_tag == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -2928,11 +2770,7 @@ int media_info_set_age_rating(media_info_h media, const char *age_rating)
                if(STRING_VALID(age_rating))
                {
                        _media->age_rating = strdup(age_rating);
-                       if(_media->age_rating == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(_media->age_rating == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -2960,11 +2798,7 @@ int media_info_set_keyword(media_info_h media, const char *keyword)
                if(STRING_VALID(keyword))
                {
                        _media->keyword = strdup(keyword);
-                       if(_media->keyword == NULL)
-                       {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
+                       media_content_retvm_if(_media->keyword == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                }
                else
                {
@@ -2992,7 +2826,7 @@ int media_info_update_to_db(media_info_h media)
                /* This sql is due to sqlite3_mprintf's wrong operation when using floating point in the text format */
                /* This code will be removed when sqlite3_mprintf works clearly */
                char *test_sql = sqlite3_mprintf("%f, %f, %f", _media->longitude, _media->latitude, _media->altitude);
-               sqlite3_free(test_sql);
+               SQLITE3_SAFE_FREE(test_sql);
 
                /*Update Pinyin If Support Pinyin*/
                char *file_name_pinyin = NULL;
@@ -3041,8 +2875,8 @@ int media_info_update_to_db(media_info_h media)
                sql = sqlite3_mprintf("UPDATE %Q SET %s WHERE media_uuid=%Q", _media->storage_uuid, set_sql, _media->media_id);
 
                ret = _content_query_sql(sql);
-               sqlite3_free(set_sql);
-               sqlite3_free(sql);
+               SQLITE3_SAFE_FREE(set_sql);
+               SQLITE3_SAFE_FREE(sql);
 
                SAFE_FREE(description_pinyin);
                SAFE_FREE(author_pinyin);
@@ -3053,6 +2887,38 @@ int media_info_update_to_db(media_info_h media)
                SAFE_FREE(age_rating_pinyin);
                SAFE_FREE(keyword_pinyin);
 
+               if(_media->storage_type == MEDIA_CONTENT_STORAGE_CLOUD)
+               {
+                       set_sql = NULL;
+                       sql = NULL;
+
+                       if(_media->media_type == MEDIA_CONTENT_TYPE_VIDEO)
+                       {
+                               set_sql = sqlite3_mprintf("title=%Q, album=%Q, artist=%Q, genre=%Q, duration=%d, width=%d, height=%d", \
+                               _media->title, _media->video_meta->album, _media->video_meta->artist, _media->video_meta->genre, _media->video_meta->duration, _media->video_meta->width, _media->video_meta->height);
+                       }
+                       else if((_media->media_type == MEDIA_CONTENT_TYPE_MUSIC) || (_media->media_type == MEDIA_CONTENT_TYPE_SOUND))
+                       {
+                               set_sql = sqlite3_mprintf("title=%Q, album=%Q, artist=%Q, genre=%Q, duration=%d", \
+                               _media->title, _media->audio_meta->album, _media->audio_meta->artist, _media->audio_meta->genre, _media->audio_meta->duration);
+                       }
+                       else if(_media->media_type == MEDIA_CONTENT_TYPE_IMAGE)
+                       {
+                               set_sql = sqlite3_mprintf("title=%Q, width=%d, height=%d", _media->title, _media->image_meta->width, _media->image_meta->height);
+                       }
+                       else
+                       {
+                               set_sql = sqlite3_mprintf("title=%Q", _media->title);
+                       }
+
+                       sql = sqlite3_mprintf("UPDATE %Q SET %s WHERE media_uuid=%Q", _media->storage_uuid, set_sql, _media->media_id);
+
+                       ret = _content_query_sql(sql);
+
+                       SQLITE3_SAFE_FREE(set_sql);
+                       SQLITE3_SAFE_FREE(sql);
+               }
+
                if (ret == MEDIA_CONTENT_ERROR_NONE) {
                        /*  Send notification for this update */
                        media_content_debug("Update is successfull. Send notification for this");
@@ -3078,6 +2944,7 @@ int media_info_refresh_metadata_to_db(const char *media_id)
        media_info_h media = NULL;
        char *file_path = NULL;
        media_content_storage_e storage_type = 0;
+       char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, };
 
        if(!STRING_VALID(media_id))
        {
@@ -3099,6 +2966,13 @@ int media_info_refresh_metadata_to_db(const char *media_id)
                return ret;
        }
 
+       if(storage_type == MEDIA_CONTENT_STORAGE_CLOUD)
+       {
+               media_info_destroy(media);
+               media_content_error("Can't refresh cloud content!!");
+               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+       }
+
        ret = media_info_get_file_path(media, &file_path);
        if(ret != MEDIA_CONTENT_ERROR_NONE)
        {
@@ -3106,14 +2980,24 @@ int media_info_refresh_metadata_to_db(const char *media_id)
                return ret;
        }
 
-       ret = _media_util_check_file(file_path);
+       ret = _media_util_check_file_exist(file_path);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                SAFE_FREE(file_path);
                media_info_destroy(media);
                return ret;
        }
 
-       ret = media_svc_refresh_item(_content_get_db_handle(), storage_type, "media", file_path, tzplatform_getuid(TZ_USER_NAME));
+       memset(storage_id, 0x00, sizeof(storage_id));
+       ret = media_svc_get_storage_id(_content_get_db_handle(), file_path, storage_id);
+       if(ret != MS_MEDIA_ERR_NONE)
+       {
+               media_content_error("media_svc_get_storage_id failed : %d", ret);
+               SAFE_FREE(file_path);
+               media_info_destroy(media);
+               return _content_error_capi(MEDIA_CONTENT_TYPE, ret);
+       }
+
+       ret = media_svc_refresh_item(_content_get_db_handle(), storage_id, storage_type, file_path, tzplatform_getuid(TZ_USER_NAME));
        if (ret != MS_MEDIA_ERR_NONE)
        {
                ret = _content_error_capi(MEDIA_CONTENT_TYPE, ret);
@@ -3128,22 +3012,29 @@ int media_info_refresh_metadata_to_db(const char *media_id)
 int media_info_move_to_db(media_info_h media, const char* dst_path)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
-
+       bool ignore_file = FALSE;
+       bool ignore_dir = FALSE;
+       char *folder_path = NULL;
        media_svc_storage_type_e src_storage_type = 0;
        media_svc_storage_type_e dst_storage_type = 0;
+       char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, };
 
-       if(media == NULL || !STRING_VALID(dst_path))
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid media");
+       media_content_retvm_if(!STRING_VALID(dst_path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid dst_path");
 
        media_info_s *_media = (media_info_s*)media;
 
-       ret = _media_util_check_file(dst_path);
-       if (ret != MEDIA_CONTENT_ERROR_NONE) {
-               return ret;
-       }
+       ret = _media_util_check_ignore_file(dst_path, &ignore_file);
+       media_content_retvm_if(ignore_file == TRUE, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path");
+
+       ret = _media_util_check_file_exist(dst_path);
+       media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
+
+       folder_path = g_path_get_dirname(dst_path);
+       ret = _media_util_check_ignore_dir(folder_path, &ignore_dir);
+       SAFE_FREE(folder_path);
+
+       media_content_retvm_if(ignore_dir == TRUE, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid folder path");
 
        ret = media_svc_get_storage_type(_media->file_path, &src_storage_type, tzplatform_getuid(TZ_USER_NAME));
        if(ret != MS_MEDIA_ERR_NONE)
@@ -3159,7 +3050,15 @@ int media_info_move_to_db(media_info_h media, const char* dst_path)
                return _content_error_capi(MEDIA_CONTENT_TYPE, ret);
        }
 
-       ret = media_svc_move_item(_content_get_db_handle(), src_storage_type, _media->file_path, dst_storage_type, dst_path, tzplatform_getuid(TZ_USER_NAME));
+       memset(storage_id, 0x00, sizeof(storage_id));
+       ret = media_svc_get_storage_id(_content_get_db_handle(), _media->file_path, storage_id);
+       if(ret != MS_MEDIA_ERR_NONE)
+       {
+               media_content_error("media_svc_get_storage_id failed : %d", ret);
+               return _content_error_capi(MEDIA_CONTENT_TYPE, ret);
+       }
+
+       ret = media_svc_move_item(_content_get_db_handle(), storage_id, src_storage_type, _media->file_path, dst_storage_type, dst_path, tzplatform_getuid(TZ_USER_NAME));
        return _content_error_capi(MEDIA_CONTENT_TYPE, ret);
 }
 
@@ -3171,11 +3070,7 @@ int media_info_create_thumbnail(media_info_h media, media_thumbnail_completed_cb
        if(_media != NULL && STRING_VALID(_media->media_id) && STRING_VALID(_media->file_path))
        {
                media_thumbnail_cb_s *_thumb_cb = (media_thumbnail_cb_s*)calloc(1, sizeof(media_thumbnail_cb_s));
-               if(_thumb_cb == NULL)
-               {
-                       media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                       return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-               }
+               media_content_retvm_if(_thumb_cb == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
                _thumb_cb->handle = _media;
                _thumb_cb->user_data = user_data;
@@ -3200,7 +3095,7 @@ int media_info_cancel_thumbnail(media_info_h media)
 
        if(_media != NULL && STRING_VALID(_media->media_id) && STRING_VALID(_media->file_path))
        {
-               ret = thumbnail_request_cancel_media(_media->file_path, tzplatform_getuid(TZ_USER_NAME));
+               ret = thumbnail_request_cancel_media(_media->file_path);
                ret = _content_error_capi(MEDIA_THUMBNAIL_TYPE, ret);
        }
        else
@@ -3214,18 +3109,10 @@ int media_info_cancel_thumbnail(media_info_h media)
 
 static int __media_info_map_data_usr_to_svc(media_info_s *media, media_svc_content_info_s **service_content, media_content_storage_e storage_type)
 {
-       if(media == NULL)
-       {
-               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
 
        media_svc_content_info_s *svc_content_info = calloc(1, sizeof(media_svc_content_info_s));
-       if(svc_content_info == NULL)
-       {
-               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-       }
+       media_content_retvm_if(svc_content_info == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
        svc_content_info->path = g_strdup(media->file_path);
        svc_content_info->media_type = media->media_type;
@@ -3292,6 +3179,7 @@ static int __media_info_map_data_usr_to_svc(media_info_s *media, media_svc_conte
        }
 
        *service_content = svc_content_info;
+
        return MEDIA_CONTENT_ERROR_NONE;
 }
 
@@ -3299,11 +3187,7 @@ static int __media_info_set_str_data(media_info_h media, media_info_item_e data_
 {
        media_info_s *_media = (media_info_s*)media;
 
-       if(_media == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(_media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media");
 
        switch(data_type)
        {
@@ -3312,12 +3196,7 @@ static int __media_info_set_str_data(media_info_h media, media_info_item_e data_
                        if(STRING_VALID(str_data))
                        {
                                _media->file_path = strdup(str_data);
-
-                               if(_media->file_path == NULL)
-                               {
-                                       media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                                       return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                               }
+                               media_content_retvm_if(_media->file_path == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                        }
                        else
                        {
@@ -3329,12 +3208,7 @@ static int __media_info_set_str_data(media_info_h media, media_info_item_e data_
                        if(STRING_VALID(str_data))
                        {
                                _media->mime_type = strdup(str_data);
-
-                               if(_media->mime_type == NULL)
-                               {
-                                       media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                                       return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                               }
+                               media_content_retvm_if(_media->mime_type == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                        }
                        else
                        {
@@ -3346,12 +3220,7 @@ static int __media_info_set_str_data(media_info_h media, media_info_item_e data_
                        if(STRING_VALID(str_data))
                        {
                                _media->thumbnail_path = strdup(str_data);
-
-                               if(_media->thumbnail_path == NULL)
-                               {
-                                       media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                                       return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                               }
+                               media_content_retvm_if(_media->thumbnail_path == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                        }
                        else
                        {
@@ -3363,12 +3232,7 @@ static int __media_info_set_str_data(media_info_h media, media_info_item_e data_
                        if(STRING_VALID(str_data))
                        {
                                _media->title = strdup(str_data);
-
-                               if(_media->title == NULL)
-                               {
-                                       media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                                       return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                               }
+                               media_content_retvm_if(_media->title == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                        }
                        else
                        {
@@ -3380,12 +3244,7 @@ static int __media_info_set_str_data(media_info_h media, media_info_item_e data_
                        if(STRING_VALID(str_data))
                        {
                                _media->storage_uuid = strdup(str_data);
-
-                               if(_media->storage_uuid == NULL)
-                               {
-                                       media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                                       return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                               }
+                               media_content_retvm_if(_media->storage_uuid == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                        }
                        else
                        {
@@ -3399,12 +3258,7 @@ static int __media_info_set_str_data(media_info_h media, media_info_item_e data_
                                if(STRING_VALID(str_data))
                                {
                                        _media->video_meta->album = strdup(str_data);
-
-                                       if(_media->video_meta->album == NULL)
-                                       {
-                                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                                       }
+                                       media_content_retvm_if(_media->video_meta->album == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                                }
                                else
                                {
@@ -3417,12 +3271,7 @@ static int __media_info_set_str_data(media_info_h media, media_info_item_e data_
                                if(STRING_VALID(str_data))
                                {
                                        _media->audio_meta->album = strdup(str_data);
-
-                                       if(_media->audio_meta->album == NULL)
-                                       {
-                                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                                       }
+                                       media_content_retvm_if(_media->audio_meta->album == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                                }
                                else
                                {
@@ -3442,12 +3291,7 @@ static int __media_info_set_str_data(media_info_h media, media_info_item_e data_
                                if(STRING_VALID(str_data))
                                {
                                        _media->video_meta->artist = strdup(str_data);
-
-                                       if(_media->video_meta->artist == NULL)
-                                       {
-                                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                                       }
+                                       media_content_retvm_if(_media->video_meta->artist == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                                }
                                else
                                {
@@ -3460,12 +3304,7 @@ static int __media_info_set_str_data(media_info_h media, media_info_item_e data_
                                if(STRING_VALID(str_data))
                                {
                                        _media->audio_meta->artist = strdup(str_data);
-
-                                       if(_media->audio_meta->artist == NULL)
-                                       {
-                                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                                       }
+                                       media_content_retvm_if(_media->audio_meta->artist == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                                }
                                else
                                {
@@ -3485,12 +3324,7 @@ static int __media_info_set_str_data(media_info_h media, media_info_item_e data_
                                if(STRING_VALID(str_data))
                                {
                                        _media->video_meta->genre = strdup(str_data);
-
-                                       if(_media->video_meta->genre == NULL)
-                                       {
-                                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                                       }
+                                       media_content_retvm_if(_media->video_meta->genre == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                                }
                                else
                                {
@@ -3503,12 +3337,7 @@ static int __media_info_set_str_data(media_info_h media, media_info_item_e data_
                                if(STRING_VALID(str_data))
                                {
                                        _media->audio_meta->genre = strdup(str_data);
-
-                                       if(_media->audio_meta->genre == NULL)
-                                       {
-                                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                                       }
+                                       media_content_retvm_if(_media->audio_meta->genre == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                                }
                                else
                                {
@@ -3528,12 +3357,7 @@ static int __media_info_set_str_data(media_info_h media, media_info_item_e data_
                                if(STRING_VALID(str_data))
                                {
                                        _media->video_meta->recorded_date = strdup(str_data);
-
-                                       if(_media->video_meta->recorded_date == NULL)
-                                       {
-                                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                                       }
+                                       media_content_retvm_if(_media->video_meta->recorded_date == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                                }
                                else
                                {
@@ -3546,12 +3370,7 @@ static int __media_info_set_str_data(media_info_h media, media_info_item_e data_
                                if(STRING_VALID(str_data))
                                {
                                        _media->audio_meta->recorded_date = strdup(str_data);
-
-                                       if(_media->audio_meta->recorded_date == NULL)
-                                       {
-                                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                                       }
+                                       media_content_retvm_if(_media->audio_meta->recorded_date == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                                }
                                else
                                {
@@ -3578,41 +3397,14 @@ int media_info_insert_to_db_with_data(media_info_h media, media_info_h *info)
 
        media_info_s *_media = (media_info_s*)media;
 
-       if(_media == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-
-       if (!STRING_VALID(_media->file_path))
-       {
-               media_content_error("invalid media path");
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-
-       if (!STRING_VALID(_media->mime_type))
-       {
-               media_content_error("invalid mime_type");
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-
-       if (!STRING_VALID(_media->storage_uuid))
-       {
-               media_content_error("invalid storage_uuid");
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-
-       if (!STRING_VALID(_media->title))
-       {
-               media_content_error("invalid title");
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-
-       if(_media->storage_type < 0)
-       {
-               media_content_error("invalid storage_type");
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(_media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media");
+       media_content_retvm_if(!STRING_VALID(_media->file_path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid file_path");
+       media_content_retvm_if(!STRING_VALID(_media->mime_type), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid mime_type");
+       media_content_retvm_if(!STRING_VALID(_media->storage_uuid), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid storage_uuid");
+       media_content_retvm_if(!STRING_VALID(_media->title), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid title");
+       media_content_retvm_if(_media->storage_type < 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid storage_type [%d]", _media->storage_type);
+       media_content_retvm_if(_media->size <= 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid size [%d]", _media->size);
+       media_content_retvm_if(_media->modified_time <= 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid modified_time [%d]", _media->modified_time);
 
        if ((_media->media_type < MEDIA_CONTENT_TYPE_IMAGE) || (_media->media_type > MEDIA_CONTENT_TYPE_OTHERS))
        {
@@ -3620,31 +3412,16 @@ int media_info_insert_to_db_with_data(media_info_h media, media_info_h *info)
                return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       if (_media->size <= 0)
-       {
-               media_content_error("invalid size [%d]", _media->size);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-
-       if (_media->modified_time <= 0)
-       {
-               media_content_error("invalid modified_time [%d]", _media->modified_time);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-
        media_content_sec_debug("storage[%d], path[%s], media_type[%d]", _media->storage_type, _media->file_path, _media->media_type);
 
        media_svc_content_info_s *svc_content_info = NULL;
 
-       if(svc_content_info == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-#if 0
-       ret = media_svc_insert_item_immediately_with_data(_content_get_db_handle(), svc_content_info);
+       ret = __media_info_map_data_usr_to_svc(_media, &svc_content_info, _media->storage_type);
+       media_content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "__media_info_map_data_usr_to_svc fail");
+
+       ret = media_svc_insert_item_immediately_with_data(_content_get_db_handle(), svc_content_info, tzplatform_getuid(TZ_USER_NAME));
        if(ret != MS_MEDIA_ERR_NONE) {
-               media_content_sec_error("media_svc_insert_item_immediately failed : %d (%s)", ret, _media->file_path);
+               media_content_sec_error("media_svc_insert_item_immediately_with_data failed : %d (%s)", ret, _media->file_path);
                media_svc_destroy_content_info(svc_content_info);
                SAFE_FREE(svc_content_info);
                return _content_error_capi(MEDIA_CONTENT_TYPE, ret);
@@ -3652,15 +3429,11 @@ int media_info_insert_to_db_with_data(media_info_h media, media_info_h *info)
        /*free the svc_content_info*/
        media_svc_destroy_content_info(svc_content_info);
        SAFE_FREE(svc_content_info);
-#endif
+
        if(info != NULL)
        {
                media_info_s *_get_media = (media_info_s*)calloc(1, sizeof(media_info_s));
-               if(_get_media == NULL)
-               {
-                       media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                       return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-               }
+               media_content_retvm_if(_get_media == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
                ret = _media_info_get_media_info_from_db(_media->file_path, _media->storage_uuid, (media_info_h)_get_media);
 
@@ -3670,23 +3443,102 @@ int media_info_insert_to_db_with_data(media_info_h media, media_info_h *info)
        return ret;
 }
 
-int media_info_create_handle(media_info_h *media)
+int media_info_create(const char *path, media_info_h *media)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
+       char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, };
+       media_svc_storage_type_e storage_type = 0;
 
-       if(media == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+       media_content_retvm_if(!STRING_VALID(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path");
+       media_content_retvm_if(media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media");
+
+       memset(storage_id, 0x00, sizeof(storage_id));
+
+       if (strstr(MEDIA_ROOT_PATH_CLOUD, path) == NULL) {
+               bool ignore_file = FALSE;
+               bool ignore_dir = FALSE;
+               char *folder_path = NULL;
+
+               ret = _media_util_check_ignore_file(path, &ignore_file);
+               media_content_retvm_if(ignore_file == TRUE, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path");
+
+               ret = _media_util_check_file_exist(path);
+               media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
+
+               folder_path = g_path_get_dirname(path);
+               ret = _media_util_check_ignore_dir(folder_path, &ignore_dir);
+               SAFE_FREE(folder_path);
+               media_content_retvm_if(ignore_dir == TRUE, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid folder path");
+
+               ret = media_svc_get_storage_id(_content_get_db_handle(), path, storage_id);
+               if(ret != MS_MEDIA_ERR_NONE)
+               {
+                       media_content_error("media_svc_get_storage_id failed : %d", ret);
+                       return _content_error_capi(MEDIA_CONTENT_TYPE, ret);
+               }
+
+               ret = media_svc_get_storage_type(path, &storage_type, tzplatform_getuid(TZ_USER_NAME));
+               if(ret != MS_MEDIA_ERR_NONE) {
+                       media_content_sec_error("media_svc_get_storage_type failed : %d", ret);
+                       return _content_error_capi(MEDIA_CONTENT_TYPE, ret);
+               }
        }
 
        media_info_s *_media = (media_info_s*)calloc(1,sizeof(media_info_s));
-       if(_media == NULL)
+       media_content_retvm_if(_media == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+
+       _media->audio_meta = (audio_meta_s *)calloc(1, sizeof(audio_meta_s));
+       if(_media->audio_meta == NULL)
+       {
+               SAFE_FREE(_media);
+               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
+               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
+       }
+
+       _media->video_meta = (video_meta_s *)calloc(1, sizeof(video_meta_s));
+       if(_media->video_meta == NULL)
+       {
+               SAFE_FREE(_media->audio_meta);
+               SAFE_FREE(_media);
+               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
+               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
+       }
+
+       _media->image_meta = (image_meta_s *)calloc(1, sizeof(image_meta_s));
+       if(_media->image_meta == NULL)
        {
+               SAFE_FREE(_media->audio_meta);
+               SAFE_FREE(_media->video_meta);
+               SAFE_FREE(_media);
                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
        }
 
+       _media->file_path = g_strdup(path);
+       _media->storage_type = -1;
+       _media->media_type = -1;
+       _media->modified_time = -1;
+       _media->size = -1;
+
+       if(STRING_VALID(storage_id)) {
+               _media->storage_uuid = g_strdup(storage_id);
+               _media->storage_type = storage_type;
+       }
+
+       *media = (media_info_h)_media;
+
+       return ret;
+}
+
+int media_info_create_handle(media_info_h *media)
+{
+       int ret = MEDIA_CONTENT_ERROR_NONE;
+
+       media_content_retvm_if(media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
+
+       media_info_s *_media = (media_info_s*)calloc(1,sizeof(media_info_s));
+       media_content_retvm_if(_media == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+
        _media->audio_meta = (audio_meta_s *)calloc(1, sizeof(audio_meta_s));
        if(_media->audio_meta == NULL)
        {
@@ -3773,11 +3625,7 @@ int media_info_set_size(media_info_h media, unsigned long long size)
 {
        media_info_s *_media = (media_info_s*)media;
 
-       if(_media == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(_media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media");
 
        _media->size = size;
 
@@ -3788,11 +3636,7 @@ int media_info_set_modified_time(media_info_h media, time_t modified_time)
 {
        media_info_s *_media = (media_info_s*)media;
 
-       if(_media == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(_media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media");
 
        _media->modified_time = modified_time;
 
@@ -3803,11 +3647,7 @@ int media_info_set_media_type(media_info_h media, media_content_type_e type)
 {
        media_info_s *_media = (media_info_s*)media;
 
-       if(_media == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(_media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media");
 
        _media->media_type = type;
 
@@ -3818,11 +3658,7 @@ int media_info_set_duration(media_info_h media, int duration)
 {
        media_info_s *_media = (media_info_s*)media;
 
-       if(_media == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(_media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media");
 
        if(_media->media_type == MEDIA_CONTENT_TYPE_VIDEO)
                _media->video_meta->duration = duration;
@@ -3841,11 +3677,7 @@ int media_info_set_width(media_info_h media, int width)
 {
        media_info_s *_media = (media_info_s*)media;
 
-       if(_media == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(_media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media");
 
        if(_media->media_type == MEDIA_CONTENT_TYPE_VIDEO)
                _media->video_meta->width = width;
@@ -3864,11 +3696,7 @@ int media_info_set_height(media_info_h media, int height)
 {
        media_info_s *_media = (media_info_s*)media;
 
-       if(_media == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(_media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media");
 
        if(_media->media_type == MEDIA_CONTENT_TYPE_VIDEO)
                _media->video_meta->height = height;
@@ -3887,11 +3715,7 @@ int media_info_set_storage_type(media_info_h media, media_content_storage_e stor
 {
        media_info_s *_media = (media_info_s*)media;
 
-       if(_media == NULL)
-       {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(_media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media");
 
        _media->storage_type = storage_type;