fix crash and build error from tv profile
[platform/core/api/media-content.git] / src / media_info.c
index a3c57de..ca7d0b1 100755 (executable)
 
 #include <media_info.h>
 #include <media-thumbnail.h>
+#include <media-util-dcm.h>
 #include <media_info_private.h>
 #include <media_util_private.h>
+#include <system_info.h>
+#ifdef _USE_TV_PROFILE
+#include <media_content_internal.h>
+#endif
 
 static void __media_info_insert_completed_cb(media_request_result_s *result, void *user_data);
 static void __media_info_thumbnail_completed_cb(int error, const char *path, void *user_data);
+static void __media_info_face_completed_cb(int error, const int face_count, void *user_data);
 static bool __media_info_delete_batch_cb(media_info_h media, void *user_data);
 static int __media_info_insert_batch(media_batch_insert_e insert_type, const char **path_array, unsigned int array_length, media_insert_completed_cb completed_cb, void *user_data);
 
@@ -85,8 +91,8 @@ static void __media_info_thumbnail_completed_cb(int error, const char *path, voi
        if (_thumb_cb != NULL) {
                media = _thumb_cb->handle;
                if ((media != NULL) && STRING_VALID(path)) {
-                       SAFE_FREE(media->thumbnail_path);
-                       media->thumbnail_path = strdup(path);
+                       media->thumbnail_path = NULL;
+                       media->thumbnail_path = g_strdup(path);
                }
 
                media_content_debug("error [%d], thumbnail_path [%s]", error, path);
@@ -100,6 +106,38 @@ static void __media_info_thumbnail_completed_cb(int error, const char *path, voi
        return;
 }
 
+static bool __media_info_isFaceRecognition_feature_supported()
+{
+       bool isFaceRecognitionSupported = false;
+
+       const int nRetVal = system_info_get_platform_bool("http://tizen.org/feature/vision.face_recognition", &isFaceRecognitionSupported);
+
+       if (nRetVal != SYSTEM_INFO_ERROR_NONE) {
+               media_content_debug("SYSTEM_INFO_ERROR: vision.face_recognition [%d]", nRetVal);
+               return false;
+       }
+
+       return isFaceRecognitionSupported;
+}
+
+static void __media_info_face_completed_cb(int error, const int face_count, void *user_data)
+{
+       int error_value = MEDIA_CONTENT_ERROR_NONE;
+
+       media_face_cb_s *_face_cb = (media_face_cb_s *)user_data;
+
+       if (_face_cb != NULL) {
+               media_content_debug("error [%d], face_count [%d]", error, face_count);
+               error_value = _content_error_capi(MEDIA_THUMBNAIL_TYPE, error);
+               if (_face_cb->face_completed_cb)
+                       _face_cb->face_completed_cb(error_value, face_count, _face_cb->user_data);
+       }
+
+       SAFE_FREE(_face_cb);
+
+       return;
+}
+
 static bool __media_info_delete_batch_cb(media_info_h media, void *user_data)
 {
        int err = MEDIA_CONTENT_ERROR_NONE;
@@ -226,9 +264,20 @@ static int __media_info_insert_batch(media_batch_insert_e insert_type, const cha
 void _media_info_item_get_detail(sqlite3_stmt* stmt, media_info_h media)
 {
        media_info_s *_media = (media_info_s*)media;
+#ifndef _USE_TV_PROFILE
+       char *tmp_path = NULL;
+       char repl_path[MAX_QUERY_SIZE] = {0, };
+#endif
 
        _media->media_id = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_UUID));
+#ifdef _USE_TV_PROFILE
        _media->file_path = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_PATH));
+#else
+       tmp_path = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_PATH));
+       _media_content_rollback_path(tmp_path, repl_path);
+       _media->file_path = g_strdup(repl_path);
+       SAFE_FREE(tmp_path);
+#endif
        _media->display_name = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_FILE_NAME));
        _media->media_type = (int)sqlite3_column_int(stmt, MEDIA_INFO_TYPE);
        _media->mime_type = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_MIME_TYPE));
@@ -259,6 +308,7 @@ void _media_info_item_get_detail(sqlite3_stmt* stmt, media_info_h media)
        _media->weather = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_WEATHER));
        _media->sync_status = (int)sqlite3_column_int(stmt, MEDIA_INFO_SYNC_STATUS);
        _media->storage_uuid = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_STORAGE_UUID));
+       _media->is_360 = (int)sqlite3_column_int(stmt, MEDIA_INFO_IS_360);
 
        if (_media->media_type == MEDIA_CONTENT_TYPE_IMAGE) {
                _media->image_meta = (image_meta_s *)calloc(1, sizeof(image_meta_s));
@@ -358,63 +408,70 @@ int media_info_insert_to_db(const char *path, media_info_h *info)
        bool ignore_dir = FALSE;
        char *folder_path = NULL;
        char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, };
+       char repl_path[MAX_QUERY_SIZE] = {0, };
        int ret = MEDIA_CONTENT_ERROR_NONE;
 
        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");
+       memset(repl_path, 0, sizeof(repl_path));
+       ret = _media_content_replace_path(path, repl_path);
+       media_content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
 
-       ret = _media_util_check_ignore_file(path, &ignore_file);
+       ret = _media_util_check_ignore_file(repl_path, &ignore_file);
        media_content_retvm_if(ignore_file == TRUE, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path");
 
-       ret = _media_util_check_file_exist(path);
+       ret = _media_util_check_file_exist(repl_path);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
-       folder_path = g_path_get_dirname(path);
+       folder_path = g_path_get_dirname(repl_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");
 
        memset(storage_id, 0x00, sizeof(storage_id));
-       ret = media_svc_get_storage_id(_content_get_db_handle(), path, storage_id);
+       ret = media_svc_get_storage_id(_content_get_db_handle(), repl_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(), storage_id, path);
+       ret = media_svc_check_item_exist_by_path(_content_get_db_handle(), storage_id, repl_path);
        if (ret == MS_MEDIA_ERR_DB_NO_RECORD) {
-               media_content_sec_debug("media_svc_check_item_exist_by_path : no record : %s", path);
+               media_content_sec_debug("media_svc_check_item_exist_by_path : no record : %s", repl_path);
 
                media_svc_storage_type_e storage_type = 0;
 
-               ret = media_svc_get_storage_type(path, &storage_type, tzplatform_getuid(TZ_USER_NAME));
+               ret = media_svc_get_storage_type(repl_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);
                }
 
-               ret = media_svc_insert_item_immediately(_content_get_db_handle(), storage_id, storage_type, path, tzplatform_getuid(TZ_USER_NAME));
+               ret = media_svc_insert_item_immediately(_content_get_db_handle(), storage_id, storage_type, repl_path, tzplatform_getuid(TZ_USER_NAME));
 
                if (ret != MS_MEDIA_ERR_NONE) {
                        if (ret == MS_MEDIA_ERR_DB_CONSTRAINT_FAIL) {
-                               media_content_sec_error("This item is already inserted. This may be normal operation because other process already did this (%s)", path);
+                               media_content_sec_error("This item is already inserted. This may be normal operation because other process already did this (%s)", repl_path);
                                ret = MEDIA_CONTENT_ERROR_NONE;
                        } else {
-                               media_content_sec_error("media_svc_insert_item_immediately failed : %d (%s)", ret, path);
+                               media_content_sec_error("media_svc_insert_item_immediately failed : %d (%s)", ret, repl_path);
                        }
 
                        return _content_error_capi(MEDIA_CONTENT_TYPE, ret);
                }
        } else if (ret != MS_MEDIA_ERR_NONE) {
-               media_content_sec_error("media_svc_check_item_exist_by_path failed : %d (%s)", ret, path);
+               media_content_sec_error("media_svc_check_item_exist_by_path failed : %d (%s)", ret, repl_path);
                return _content_error_capi(MEDIA_CONTENT_TYPE, ret);
        }
 
        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");
 
-       ret = _media_info_get_media_info_from_db(path, DEFAULT_MEDIA_STORAGE_ID, (media_info_h)_media);
+       if (STRING_VALID(storage_id))
+               ret = _media_info_get_media_info_from_db(repl_path, storage_id, (media_info_h)_media);
+       else
+               ret = _media_info_get_media_info_from_db(repl_path, DEFAULT_MEDIA_STORAGE_ID, (media_info_h)_media);
 
        *info = (media_info_h)_media;
        return ret;
@@ -426,20 +483,180 @@ int media_info_insert_batch_to_db(
                                        media_insert_completed_cb completed_cb,
                                        void *user_data)
 {
+       char **repl_path_array = NULL;
+       int idx = 0;
+       int ret = MS_MEDIA_ERR_NONE;
+       char repl_path[MAX_QUERY_SIZE] = {0, };
+
        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);
+       repl_path_array = calloc(1, sizeof(char *) * array_length);
+
+       for (idx = 0; idx < array_length; idx++) {
+               if (STRING_VALID(path_array[idx])) {
+                       memset(repl_path, 0, sizeof(repl_path));
+                       _media_content_replace_path(path_array[idx], repl_path);
+                       repl_path_array[idx] = strndup(repl_path, strlen(repl_path));
+               } else {
+                       media_content_error("path[%d] is invalid string", idx);
+               }
+       }
+
+       ret = __media_info_insert_batch(MEDIA_BATCH_INSERT_NORMAL, (const char **)repl_path_array, array_length, completed_cb, user_data);
+       for (idx = 0; idx < array_length; idx++)
+               SAFE_FREE(repl_path_array[idx]);
+
+       SAFE_FREE(repl_path_array);
+
+       return ret;
 }
 
 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)
 {
+       char **repl_path_array = NULL;
+       int idx = 0;
+       int ret = MS_MEDIA_ERR_NONE;
+       char repl_path[MAX_QUERY_SIZE] = {0, };
+
        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);
+       repl_path_array = calloc(1, sizeof(char *) * array_length);
+
+       for (idx = 0; idx < array_length; idx++) {
+               if (STRING_VALID(path_array[idx])) {
+                       memset(repl_path, 0, sizeof(repl_path));
+                       _media_content_replace_path(path_array[idx], repl_path);
+                       repl_path_array[idx] = strndup(repl_path, strlen(repl_path));
+               } else {
+                       media_content_error("path[%d] is invalid string", idx);
+               }
+       }
+
+       ret = __media_info_insert_batch(MEDIA_BATCH_INSERT_BURSTSHOT, (const char **)repl_path_array, array_length, callback, user_data);
+       for (idx = 0; idx < array_length; idx++)
+               SAFE_FREE(repl_path_array[idx]);
+
+       SAFE_FREE(repl_path_array);
+
+       return ret;
 }
 
+#ifdef _USE_SENIOR_MODE
+int media_info_insert_to_db_with_contact_data(const char *path, const char* contact, const char* app_data, media_info_h *info)
+{
+       int ret = media_info_insert_to_db(path, info);
+       media_content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "media_info_insert_to_db [%s] failed", path);
+
+       ret = media_info_set_contact(*info, contact);
+       if (ret != MEDIA_CONTENT_ERROR_NONE) {
+               media_content_error("media_info_set_contact [%s] failed", contact);
+
+               media_info_s* _media_info = (media_info_s*)*info;
+               ret = media_info_delete_from_db(_media_info->media_id);
+               media_content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "media_info_delete_from_db [%s] failed", _media_info->media_id);
+
+               media_info_destroy(*info);
+               return ret;
+       }
+
+       ret = media_info_set_app_data(*info, app_data);
+       if (ret != MEDIA_CONTENT_ERROR_NONE) {
+               media_content_error("media_info_set_app_data [%s] failed", app_data);
+
+               media_info_s* _media_info = (media_info_s*)*info;
+               ret = media_info_delete_from_db(_media_info->media_id);
+               media_content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "media_info_delete_from_db [%s] failed", _media_info->media_id);
+
+               media_info_destroy(*info);
+               return ret;
+       }
+
+       ret = media_info_update_to_db(*info);
+       if (ret != MEDIA_CONTENT_ERROR_NONE) {
+               media_content_error("media_info_update_to_db [] failed");
+
+               media_info_s* _media_info = (media_info_s*)*info;
+               ret = media_info_delete_from_db(_media_info->media_id);
+               media_content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "media_info_delete_from_db [%s] failed", _media_info->media_id);
+
+               media_info_destroy(*info);
+               return ret;
+       }
+
+       return ret;
+}
+
+int media_info_delete_contact_from_db(const char* contact, const char* storage_id)
+{
+       return -1;
+}
+
+int media_info_get_media_info_by_path_from_db(const char* path, media_info_h* media)
+{
+       char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0,};
+       int ret = MEDIA_CONTENT_ERROR_NONE;
+       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 info");
+
+       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);
+       }
+
+       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");
+
+       ret =  _media_info_get_media_info_from_db(path, storage_id, (media_info_h)_media);
+       *media = (media_info_h)_media;
+
+       return ret;
+}
+
+int media_info_delete_item(const char *media_id)
+{
+       int ret = MEDIA_CONTENT_ERROR_NONE;
+       char *path = NULL;
+       char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0,};
+
+       if (!STRING_VALID(media_id)) {
+               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+       }
+
+       memset(storage_id, 0x00, sizeof(storage_id));
+
+       ret = __media_info_get_media_path_by_id_from_db(media_id, &path);
+       if (ret != MEDIA_CONTENT_ERROR_NONE) {
+               media_content_error("__media_info_get_media_path_by_id_from_db failed : %d", ret);
+               SAFE_FREE(path);
+               return ret;
+       }
+
+       ret = _media_db_get_storage_id_by_media_id(media_id, storage_id);
+       if (ret != MEDIA_CONTENT_ERROR_NONE) {
+               media_content_error("_media_db_get_storage_id_by_media_id failed : %d", ret);
+               SAFE_FREE(path);
+               return ret;
+       }
+
+       ret = media_svc_delete_item_by_path(_content_get_db_handle(), storage_id, path, tzplatform_getuid(TZ_USER_NAME));
+       if (ret != MEDIA_CONTENT_ERROR_NONE) {
+               media_content_error("remove from DB failed : %d", ret);
+               SAFE_FREE(path);
+               return ret;
+       }
+
+       ret = media_svc_remove_file(path);
+       SAFE_FREE(path);
+       return _content_error_capi(MEDIA_CONTENT_TYPE, ret);
+}
+
+#endif
+
 int media_info_delete_from_db(const char *media_id)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
@@ -563,13 +780,13 @@ int media_info_delete_batch_from_db(filter_h filter)
                        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);
+                               media_svc_publish_noti(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_svc_publish_noti(MS_MEDIA_ITEM_DIRECTORY, MS_MEDIA_ITEM_UPDATE, MEDIA_ROOT_PATH_INTERNAL, -1, NULL, NULL);
+                       media_svc_publish_noti(MS_MEDIA_ITEM_DIRECTORY, MS_MEDIA_ITEM_UPDATE, MEDIA_ROOT_PATH_SDCARD, -1, NULL, NULL);
                }
 
                __media_info_delete_thumb_from_list(thumb_list);
@@ -602,8 +819,15 @@ int media_info_destroy(media_info_h media)
                SAFE_FREE(_media->age_rating);
                SAFE_FREE(_media->keyword);
                SAFE_FREE(_media->title);
+#ifdef _USE_TV_PROFILE
+               SAFE_FREE(_media->modified_month);
+#endif
                SAFE_FREE(_media->weather);
                SAFE_FREE(_media->storage_uuid);
+#ifdef _USE_SENIOR_MODE
+               SAFE_FREE(_media->contact);
+               SAFE_FREE(_media->app_data);
+#endif
 
                if (_media->image_meta) {
                        SAFE_FREE(_media->image_meta->media_id);
@@ -669,48 +893,48 @@ int media_info_clone(media_info_h *dst, media_info_h src)
                media_info_s *_dst = (media_info_s*)calloc(1, sizeof(media_info_s));
                media_content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
-               if (STRING_VALID(_src->media_id)) {
-                       _dst->media_id = strdup(_src->media_id);
+               if (_src->media_id) {
+                       _dst->media_id = g_strdup(_src->media_id);
                        if (_dst->media_id == NULL) {
                                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                media_info_destroy((media_info_h)_dst);
                                return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                        }
                }
-               if (STRING_VALID(_src->file_path)) {
-                       _dst->file_path = strdup(_src->file_path);
+               if (_src->file_path) {
+                       _dst->file_path = g_strdup(_src->file_path);
                        if (_dst->file_path == NULL) {
                                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                media_info_destroy((media_info_h)_dst);
                                return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                        }
                }
-               if (STRING_VALID(_src->display_name)) {
-                       _dst->display_name = strdup(_src->display_name);
+               if (_src->display_name != NULL) {
+                       _dst->display_name = g_strdup(_src->display_name);
                        if (_dst->display_name == NULL) {
                                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                media_info_destroy((media_info_h)_dst);
                                return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                        }
                }
-               if (STRING_VALID(_src->mime_type)) {
-                       _dst->mime_type = strdup(_src->mime_type);
+               if (_src->mime_type) {
+                       _dst->mime_type = g_strdup(_src->mime_type);
                        if (_dst->mime_type == NULL) {
                                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                media_info_destroy((media_info_h)_dst);
                                return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                        }
                }
-               if (STRING_VALID(_src->thumbnail_path)) {
-                       _dst->thumbnail_path = strdup(_src->thumbnail_path);
+               if (_src->thumbnail_path != NULL) {
+                       _dst->thumbnail_path = g_strdup(_src->thumbnail_path);
                        if (_dst->thumbnail_path == NULL) {
                                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                media_info_destroy((media_info_h)_dst);
                                return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                        }
                }
-               if (STRING_VALID(_src->description)) {
-                       _dst->description = strdup(_src->description);
+               if (_src->description != NULL) {
+                       _dst->description = g_strdup(_src->description);
                        if (_dst->description == NULL) {
                                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                media_info_destroy((media_info_h)_dst);
@@ -718,8 +942,8 @@ int media_info_clone(media_info_h *dst, media_info_h src)
                        }
                }
 
-               if (STRING_VALID(_src->weather)) {
-                       _dst->weather = strdup(_src->weather);
+               if (_src->weather != NULL) {
+                       _dst->weather = g_strdup(_src->weather);
                        if (_dst->weather == NULL) {
                                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                media_info_destroy((media_info_h)_dst);
@@ -727,64 +951,64 @@ int media_info_clone(media_info_h *dst, media_info_h src)
                        }
                }
 
-               if (STRING_VALID(_src->title)) {
-                       _dst->title = strdup(_src->title);
+               if (_src->title != NULL) {
+                       _dst->title = g_strdup(_src->title);
                        if (_dst->title == NULL) {
                                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                media_info_destroy((media_info_h)_dst);
                                return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                        }
                }
-               if (STRING_VALID(_src->author)) {
-                       _dst->author = strdup(_src->author);
+               if (_src->author != NULL) {
+                       _dst->author = g_strdup(_src->author);
                        if (_dst->author == NULL) {
                                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                media_info_destroy((media_info_h)_dst);
                                return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                        }
                }
-               if (STRING_VALID(_src->provider)) {
-                       _dst->provider = strdup(_src->provider);
+               if (_src->provider != NULL) {
+                       _dst->provider = g_strdup(_src->provider);
                        if (_dst->provider == NULL) {
                                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                media_info_destroy((media_info_h)_dst);
                                return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                        }
                }
-               if (STRING_VALID(_src->content_name)) {
-                       _dst->content_name = strdup(_src->content_name);
+               if (_src->content_name != NULL) {
+                       _dst->content_name = g_strdup(_src->content_name);
                        if (_dst->content_name == NULL) {
                                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                media_info_destroy((media_info_h)_dst);
                                return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                        }
                }
-               if (STRING_VALID(_src->category)) {
-                       _dst->category = strdup(_src->category);
+               if (_src->category != NULL) {
+                       _dst->category = g_strdup(_src->category);
                        if (_dst->category == NULL) {
                                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                media_info_destroy((media_info_h)_dst);
                                return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                        }
                }
-               if (STRING_VALID(_src->location_tag)) {
-                       _dst->location_tag = strdup(_src->location_tag);
+               if (_src->location_tag != NULL) {
+                       _dst->location_tag = g_strdup(_src->location_tag);
                        if (_dst->location_tag == NULL) {
                                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                media_info_destroy((media_info_h)_dst);
                                return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                        }
                }
-               if (STRING_VALID(_src->age_rating)) {
-                       _dst->age_rating = strdup(_src->age_rating);
+               if (_src->age_rating != NULL) {
+                       _dst->age_rating = g_strdup(_src->age_rating);
                        if (_dst->age_rating == NULL) {
                                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                media_info_destroy((media_info_h)_dst);
                                return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                        }
                }
-               if (STRING_VALID(_src->keyword)) {
-                       _dst->keyword = strdup(_src->keyword);
+               if (_src->keyword != NULL) {
+                       _dst->keyword = g_strdup(_src->keyword);
                        if (_dst->keyword == NULL) {
                                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                media_info_destroy((media_info_h)_dst);
@@ -792,14 +1016,43 @@ int media_info_clone(media_info_h *dst, media_info_h src)
                        }
                }
 
-               if (STRING_VALID(_src->storage_uuid)) {
-                       _dst->storage_uuid = strdup(_src->storage_uuid);
+               if (_src->storage_uuid != NULL) {
+                       _dst->storage_uuid = g_strdup(_src->storage_uuid);
                        if (_dst->storage_uuid == NULL) {
                                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                media_info_destroy((media_info_h)_dst);
                                return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                        }
                }
+#ifdef _USE_TV_PROFILE
+               if (STRING_VALID(_src->modified_month)) {
+                       _dst->modified_month = strdup(_src->modified_month);
+                       if (_dst->modified_month == NULL) {
+                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
+                               media_info_destroy((media_info_h)_dst);
+                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
+                       }
+               }
+#endif
+#ifdef _USE_SENIOR_MODE
+               if (STRING_VALID(_src->contact)) {
+                       _dst->contact = strdup(_src->contact);
+                       if (_dst->contact == NULL) {
+                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
+                               media_info_destroy((media_info_h)_dst);
+                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
+                       }
+               }
+
+               if (STRING_VALID(_src->app_data)) {
+                       _dst->app_data = strdup(_src->app_data);
+                       if (_dst->app_data == NULL) {
+                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
+                               media_info_destroy((media_info_h)_dst);
+                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
+                       }
+               }
+#endif
 
                _dst->media_type = _src->media_type;
                _dst->size = _src->size;
@@ -817,6 +1070,12 @@ int media_info_clone(media_info_h *dst, media_info_h src)
                _dst->played_time = _src->played_time;
                _dst->played_position = _src->played_position;
                _dst->sync_status = _src->sync_status;
+               _dst->request_id = _src->request_id;
+               _dst->face_request_id = _src->face_request_id;
+               _dst->is_360 = _src->is_360;
+#ifdef _USE_TV_PROFILE
+               _dst->extract_flag = _src->extract_flag;
+#endif
 
                if (_src->media_type == MEDIA_CONTENT_TYPE_IMAGE && _src->image_meta) {
                        _dst->image_meta = (image_meta_s *)calloc(1, sizeof(image_meta_s));
@@ -826,8 +1085,8 @@ int media_info_clone(media_info_h *dst, media_info_h src)
                                return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                        }
 
-                       if (STRING_VALID(_src->image_meta->media_id)) {
-                               _dst->image_meta->media_id = strdup(_src->image_meta->media_id);
+                       if (_src->image_meta->media_id != NULL) {
+                               _dst->image_meta->media_id = g_strdup(_src->image_meta->media_id);
                                if (_dst->image_meta->media_id == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
@@ -835,8 +1094,8 @@ int media_info_clone(media_info_h *dst, media_info_h src)
                                }
                        }
 
-                       if (STRING_VALID(_src->image_meta->date_taken)) {
-                               _dst->image_meta->date_taken = strdup(_src->image_meta->date_taken);
+                       if (_src->image_meta->date_taken != NULL) {
+                               _dst->image_meta->date_taken = g_strdup(_src->image_meta->date_taken);
                                if (_dst->image_meta->date_taken == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
@@ -844,8 +1103,8 @@ int media_info_clone(media_info_h *dst, media_info_h src)
                                }
                        }
 
-                       if (STRING_VALID(_src->image_meta->burst_id)) {
-                               _dst->image_meta->burst_id = strdup(_src->image_meta->burst_id);
+                       if (_src->image_meta->burst_id != NULL) {
+                               _dst->image_meta->burst_id = g_strdup(_src->image_meta->burst_id);
                                if (_dst->image_meta->burst_id == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
@@ -853,8 +1112,8 @@ int media_info_clone(media_info_h *dst, media_info_h src)
                                }
                        }
 
-                       if (STRING_VALID(_src->image_meta->weather)) {
-                               _dst->image_meta->weather = strdup(_src->image_meta->weather);
+                       if (_src->image_meta->weather != NULL) {
+                               _dst->image_meta->weather = g_strdup(_src->image_meta->weather);
                                if (_dst->image_meta->weather == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
@@ -862,8 +1121,8 @@ int media_info_clone(media_info_h *dst, media_info_h src)
                                }
                        }
 
-                       if (STRING_VALID(_src->image_meta->exposure_time)) {
-                               _dst->image_meta->exposure_time = strdup(_src->image_meta->exposure_time);
+                       if (_src->image_meta->exposure_time != NULL) {
+                               _dst->image_meta->exposure_time = g_strdup(_src->image_meta->exposure_time);
                                if (_dst->image_meta->exposure_time == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
@@ -871,8 +1130,8 @@ int media_info_clone(media_info_h *dst, media_info_h src)
                                }
                        }
 
-                       if (STRING_VALID(_src->image_meta->model)) {
-                               _dst->image_meta->model = strdup(_src->image_meta->model);
+                       if (_src->image_meta->model != NULL) {
+                               _dst->image_meta->model = g_strdup(_src->image_meta->model);
                                if (_dst->image_meta->model == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
@@ -894,88 +1153,88 @@ int media_info_clone(media_info_h *dst, media_info_h src)
                                return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                        }
 
-                       if (STRING_VALID(_src->video_meta->media_id)) {
-                               _dst->video_meta->media_id = strdup(_src->video_meta->media_id);
+                       if (_src->video_meta->media_id != NULL) {
+                               _dst->video_meta->media_id = g_strdup(_src->video_meta->media_id);
                                if (_dst->video_meta->media_id == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->video_meta->title)) {
-                               _dst->video_meta->title = strdup(_src->video_meta->title);
+                       if (_src->video_meta->title != NULL) {
+                               _dst->video_meta->title = g_strdup(_src->video_meta->title);
                                if (_dst->video_meta->title == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->video_meta->album)) {
-                               _dst->video_meta->album = strdup(_src->video_meta->album);
+                       if (_src->video_meta->album != NULL) {
+                               _dst->video_meta->album = g_strdup(_src->video_meta->album);
                                if (_dst->video_meta->album == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->video_meta->artist)) {
-                               _dst->video_meta->artist = strdup(_src->video_meta->artist);
+                       if (_src->video_meta->artist != NULL) {
+                               _dst->video_meta->artist = g_strdup(_src->video_meta->artist);
                                if (_dst->video_meta->artist == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->video_meta->album_artist)) {
-                               _dst->video_meta->album_artist = strdup(_src->video_meta->album_artist);
+                       if (_src->video_meta->album_artist != NULL) {
+                               _dst->video_meta->album_artist = g_strdup(_src->video_meta->album_artist);
                                if (_dst->video_meta->album_artist == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->video_meta->genre)) {
-                               _dst->video_meta->genre = strdup(_src->video_meta->genre);
+                       if (_src->video_meta->genre != NULL) {
+                               _dst->video_meta->genre = g_strdup(_src->video_meta->genre);
                                if (_dst->video_meta->genre == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->video_meta->composer)) {
-                               _dst->video_meta->composer = strdup(_src->video_meta->composer);
+                       if (_src->video_meta->composer != NULL) {
+                               _dst->video_meta->composer = g_strdup(_src->video_meta->composer);
                                if (_dst->video_meta->composer == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->video_meta->year)) {
-                               _dst->video_meta->year = strdup(_src->video_meta->year);
+                       if (_src->video_meta->year != NULL) {
+                               _dst->video_meta->year = g_strdup(_src->video_meta->year);
                                if (_dst->video_meta->year == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->video_meta->recorded_date)) {
-                               _dst->video_meta->recorded_date = strdup(_src->video_meta->recorded_date);
+                       if (_src->video_meta->recorded_date != NULL) {
+                               _dst->video_meta->recorded_date = g_strdup(_src->video_meta->recorded_date);
                                if (_dst->video_meta->recorded_date == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->video_meta->copyright)) {
-                               _dst->video_meta->copyright = strdup(_src->video_meta->copyright);
+                       if (_src->video_meta->copyright != NULL) {
+                               _dst->video_meta->copyright = g_strdup(_src->video_meta->copyright);
                                if (_dst->video_meta->copyright == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->video_meta->track_num)) {
-                               _dst->video_meta->track_num = strdup(_src->video_meta->track_num);
+                       if (_src->video_meta->track_num != NULL) {
+                               _dst->video_meta->track_num = g_strdup(_src->video_meta->track_num);
                                if (_dst->video_meta->track_num == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
@@ -999,88 +1258,88 @@ int media_info_clone(media_info_h *dst, media_info_h src)
                                return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                        }
 
-                       if (STRING_VALID(_src->audio_meta->media_id)) {
-                               _dst->audio_meta->media_id = strdup(_src->audio_meta->media_id);
+                       if (_src->audio_meta->media_id != NULL) {
+                               _dst->audio_meta->media_id = g_strdup(_src->audio_meta->media_id);
                                if (_dst->audio_meta->media_id == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->audio_meta->title)) {
-                               _dst->audio_meta->title = strdup(_src->audio_meta->title);
+                       if (_src->audio_meta->title != NULL) {
+                               _dst->audio_meta->title = g_strdup(_src->audio_meta->title);
                                if (_dst->audio_meta->title == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->audio_meta->album)) {
-                               _dst->audio_meta->album = strdup(_src->audio_meta->album);
+                       if (_src->audio_meta->album != NULL) {
+                               _dst->audio_meta->album = g_strdup(_src->audio_meta->album);
                                if (_dst->audio_meta->album == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->audio_meta->artist)) {
-                               _dst->audio_meta->artist = strdup(_src->audio_meta->artist);
+                       if (_src->audio_meta->artist != NULL) {
+                               _dst->audio_meta->artist = g_strdup(_src->audio_meta->artist);
                                if (_dst->audio_meta->artist == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->audio_meta->album_artist)) {
-                               _dst->audio_meta->album_artist = strdup(_src->audio_meta->album_artist);
+                       if (_src->audio_meta->album_artist != NULL) {
+                               _dst->audio_meta->album_artist = g_strdup(_src->audio_meta->album_artist);
                                if (_dst->audio_meta->album_artist == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->audio_meta->genre)) {
-                               _dst->audio_meta->genre = strdup(_src->audio_meta->genre);
+                       if (_src->audio_meta->genre != NULL) {
+                               _dst->audio_meta->genre = g_strdup(_src->audio_meta->genre);
                                if (_dst->audio_meta->genre == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->audio_meta->composer)) {
-                               _dst->audio_meta->composer = strdup(_src->audio_meta->composer);
+                       if (_src->audio_meta->composer != NULL) {
+                               _dst->audio_meta->composer = g_strdup(_src->audio_meta->composer);
                                if (_dst->audio_meta->composer == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->audio_meta->year)) {
-                               _dst->audio_meta->year = strdup(_src->audio_meta->year);
+                       if (_src->audio_meta->year != NULL) {
+                               _dst->audio_meta->year = g_strdup(_src->audio_meta->year);
                                if (_dst->audio_meta->year == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->audio_meta->recorded_date)) {
-                               _dst->audio_meta->recorded_date = strdup(_src->audio_meta->recorded_date);
+                       if (_src->audio_meta->recorded_date != NULL) {
+                               _dst->audio_meta->recorded_date = g_strdup(_src->audio_meta->recorded_date);
                                if (_dst->audio_meta->recorded_date == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->audio_meta->copyright)) {
-                               _dst->audio_meta->copyright = strdup(_src->audio_meta->copyright);
+                       if (_src->audio_meta->copyright != NULL) {
+                               _dst->audio_meta->copyright = g_strdup(_src->audio_meta->copyright);
                                if (_dst->audio_meta->copyright == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
                                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                                }
                        }
-                       if (STRING_VALID(_src->audio_meta->track_num)) {
-                               _dst->audio_meta->track_num = strdup(_src->audio_meta->track_num);
+                       if (_src->audio_meta->track_num != NULL) {
+                               _dst->audio_meta->track_num = g_strdup(_src->audio_meta->track_num);
                                if (_dst->audio_meta->track_num == NULL) {
                                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                        media_info_destroy((media_info_h)_dst);
@@ -1096,7 +1355,6 @@ int media_info_clone(media_info_h *dst, media_info_h src)
                        _dst->audio_meta->played_count = _src->audio_meta->played_count;
                        _dst->audio_meta->played_time = _src->audio_meta->played_time;
                        _dst->audio_meta->played_position = _src->audio_meta->played_position;
-
                }
                *dst = (media_info_h)_dst;
 
@@ -1376,8 +1634,8 @@ int media_info_get_display_name(media_info_h media, char **name)
        int ret = MEDIA_CONTENT_ERROR_NONE;
        media_info_s *_media = (media_info_s*)media;
        if (_media && name) {
-               if (STRING_VALID(_media->display_name)) {
-                       *name = strdup(_media->display_name);
+               if (_media->display_name != NULL) {
+                       *name = g_strdup(_media->display_name);
                        media_content_retvm_if(*name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                } else {
                        *name = NULL;
@@ -1494,8 +1752,8 @@ int media_info_get_thumbnail_path(media_info_h media, char **path)
        int ret = MEDIA_CONTENT_ERROR_NONE;
        media_info_s *_media = (media_info_s*)media;
        if (_media && path) {
-               if (STRING_VALID(_media->thumbnail_path)) {
-                       *path = strdup(_media->thumbnail_path);
+               if (_media->thumbnail_path != NULL) {
+                       *path = g_strdup(_media->thumbnail_path);
                        media_content_retvm_if(*path == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                } else {
                        *path = NULL;
@@ -1516,8 +1774,8 @@ int media_info_get_title(media_info_h media, char **title)
        media_info_s *_media = (media_info_s*)media;
 
        if (_media && title)    { /*title can be empty string*/
-               if (STRING_VALID(_media->title)) {
-                       *title = strdup(_media->title);
+               if (_media->title != NULL) {
+                       *title = g_strdup(_media->title);
                        media_content_retvm_if(*title == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                } else {
                        *title = NULL;
@@ -1530,6 +1788,23 @@ int media_info_get_title(media_info_h media, char **title)
 
        return ret;
 }
+#ifdef _USE_TV_PROFILE
+int media_info_get_extract_flag(media_info_h media, int *extract_flag)
+{
+       int ret = MEDIA_CONTENT_ERROR_NONE;
+       media_info_s *_media = (media_info_s *)media;
+
+       if (_media && extract_flag) {
+               *extract_flag = _media->extract_flag;
+               ret = MEDIA_CONTENT_ERROR_NONE;
+       } else {
+               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+       }
+
+       return ret;
+}
+#endif
 
 int media_info_get_description(media_info_h media, char **description)
 {
@@ -1537,8 +1812,8 @@ int media_info_get_description(media_info_h media, char **description)
        media_info_s *_media = (media_info_s*)media;
 
        if (_media && description) {
-               if (STRING_VALID(_media->description)) {
-                       *description = strdup(_media->description);
+               if (_media->description != NULL) {      /*description can be empty string*/
+                       *description = g_strdup(_media->description);
                        media_content_retvm_if(*description == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                } else {
                        *description = NULL;
@@ -1605,7 +1880,7 @@ int media_info_get_weather(media_info_h media, char **weather)
        media_info_s *_media = (media_info_s*)media;
 
        if (_media && weather) {
-               if (STRING_VALID(_media->weather)) {
+               if (_media->weather != NULL) {
                        *weather = strdup(_media->weather);
                        media_content_retvm_if(*weather == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                } else {
@@ -1658,7 +1933,7 @@ int media_info_get_author(media_info_h media, char **author)
        media_info_s *_media = (media_info_s*)media;
 
        if (_media && author) {
-               if (STRING_VALID(_media->author)) {
+               if (_media->author != NULL) {
                        *author = strdup(_media->author);
                        media_content_retvm_if(*author == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                } else {
@@ -1679,7 +1954,7 @@ int media_info_get_provider(media_info_h media, char **provider)
        media_info_s *_media = (media_info_s*)media;
 
        if (_media && provider) {
-               if (STRING_VALID(_media->provider)) {
+               if (_media->provider != NULL) {
                        *provider = strdup(_media->provider);
                        media_content_retvm_if(*provider == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                } else {
@@ -1700,7 +1975,7 @@ int media_info_get_content_name(media_info_h media, char **content_name)
        media_info_s *_media = (media_info_s*)media;
 
        if (_media && content_name) {
-               if (STRING_VALID(_media->content_name)) {
+               if (_media->content_name != NULL) {
                        *content_name = strdup(_media->content_name);
                        media_content_retvm_if(*content_name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                } else {
@@ -1721,7 +1996,7 @@ int media_info_get_category(media_info_h media, char **category)
        media_info_s *_media = (media_info_s*)media;
 
        if (_media && category) {
-               if (STRING_VALID(_media->category)) {
+               if (_media->category != NULL) {
                        *category = strdup(_media->category);
                        media_content_retvm_if(*category == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                } else {
@@ -1742,7 +2017,7 @@ int media_info_get_location_tag(media_info_h media, char **location_tag)
        media_info_s *_media = (media_info_s*)media;
 
        if (_media && location_tag) {
-               if (STRING_VALID(_media->location_tag)) {
+               if (_media->location_tag != NULL) {
                        *location_tag = strdup(_media->location_tag);
                        media_content_retvm_if(*location_tag == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                } else {
@@ -1763,7 +2038,7 @@ int media_info_get_age_rating(media_info_h media, char **age_rating)
        media_info_s *_media = (media_info_s*)media;
 
        if (_media && age_rating) {
-               if (STRING_VALID(_media->age_rating)) {
+               if (_media->age_rating != NULL) {
                        *age_rating = strdup(_media->age_rating);
                        media_content_retvm_if(*age_rating == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                } else {
@@ -1784,7 +2059,7 @@ int media_info_get_keyword(media_info_h media, char **keyword)
        media_info_s *_media = (media_info_s*)media;
 
        if (_media && keyword) {
-               if (STRING_VALID(_media->keyword)) {
+               if (_media->keyword != NULL) {
                        *keyword = strdup(_media->keyword);
                        media_content_retvm_if(*keyword == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                } else {
@@ -1810,6 +2085,7 @@ int media_info_get_storage_id(media_info_h media, char **storage_id)
                        media_content_retvm_if(*storage_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                } else {
                        *storage_id = NULL;
+                       ret = MEDIA_CONTENT_ERROR_DB_FAILED;
                }
                ret = MEDIA_CONTENT_ERROR_NONE;
        } else {
@@ -1836,6 +2112,22 @@ int media_info_is_drm(media_info_h media, bool *is_drm)
        return ret;
 }
 
+int media_info_is_360_content(media_info_h media, bool *is_360)
+{
+       int ret = MEDIA_CONTENT_ERROR_NONE;
+       media_info_s *_media = (media_info_s*)media;
+
+       if (_media) {
+               *is_360 = _media->is_360;
+               ret = MEDIA_CONTENT_ERROR_NONE;
+       } else {
+               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+       }
+
+       return ret;
+}
+
 int media_info_get_storage_type(media_info_h media, media_content_storage_e *storage_type)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
@@ -1852,6 +2144,24 @@ int media_info_get_storage_type(media_info_h media, media_content_storage_e *sto
        return ret;
 }
 
+#ifdef _USE_TV_PROFILE
+int media_info_get_played_position(media_info_h media, int *played_position)
+{
+       int ret = MEDIA_CONTENT_ERROR_NONE;
+       media_info_s *_media = (media_info_s*)media;
+
+       if (_media) {
+               *played_position = _media->played_position;
+               ret = MEDIA_CONTENT_ERROR_NONE;
+       } else {
+               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+       }
+
+       return ret;
+}
+#endif
+
 int media_info_get_played_count(media_info_h media, int *played_count)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
@@ -1900,6 +2210,98 @@ int media_info_increase_played_count(media_info_h media)
        return ret;
 }
 
+#ifdef _USE_TV_PROFILE
+int media_info_get_modified_month(media_info_h media, char **modified_month)
+{
+       int ret = MEDIA_CONTENT_ERROR_NONE;
+       media_info_s *_media = (media_info_s*)media;
+
+       if (_media && modified_month) {
+               if (STRING_VALID(_media->modified_month)) {
+                       *modified_month = strdup(_media->modified_month);
+                       if (*modified_month == NULL) {
+                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
+                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
+                       }
+               } else {
+                       *modified_month = NULL;
+               }
+               ret = MEDIA_CONTENT_ERROR_NONE;
+       } else {
+               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+       }
+
+       return ret;
+}
+#endif
+#ifdef _USE_SENIOR_MODE
+int media_info_get_contact(media_info_h media, char **contact)
+{
+       int ret = MEDIA_CONTENT_ERROR_NONE;
+       media_info_s *_media = (media_info_s*)media;
+
+       if (_media && contact) {
+               if (STRING_VALID(_media->contact)) {
+                       *contact = strdup(_media->contact);
+                       if (*contact == NULL) {
+                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
+                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
+                       }
+               } else {
+                       *contact = NULL;
+               }
+               ret = MEDIA_CONTENT_ERROR_NONE;
+       } else {
+               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+       }
+
+       return ret;
+}
+
+int media_info_get_app_data(media_info_h media, char **app_data)
+{
+       int ret = MEDIA_CONTENT_ERROR_NONE;
+       media_info_s *_media = (media_info_s*)media;
+
+       if (_media && app_data) {
+               if (STRING_VALID(_media->app_data)) {
+                       *app_data = strdup(_media->app_data);
+                       if (*app_data == NULL) {
+                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
+                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
+                       }
+               } else {
+                       *app_data = NULL;
+               }
+               ret = MEDIA_CONTENT_ERROR_NONE;
+       } else {
+               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+       }
+
+       return ret;
+}
+#endif
+#ifdef _USE_TV_PROFILE
+int media_info_set_played_count(media_info_h media, int played_count)
+{
+       int ret = MEDIA_CONTENT_ERROR_NONE;
+
+       media_info_s *_media = (media_info_s*)media;
+
+       if (_media) {
+               _media->played_count = played_count;
+       } else {
+               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+       }
+
+       return ret;
+}
+#endif
+
 int media_info_set_played_time(media_info_h media)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
@@ -1917,6 +2319,22 @@ int media_info_set_played_time(media_info_h media)
 
        return ret;
 }
+#ifdef _USE_TV_PROFILE
+int media_info_set_played_position(media_info_h media, int played_position)
+{
+       int ret = MEDIA_CONTENT_ERROR_NONE;
+       media_info_s *_media = (media_info_s*)media;
+
+       if ((_media != NULL) && (played_position >= 0)) {
+               _media->played_position = played_position;
+       } else {
+               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+       }
+
+       return ret;
+}
+#endif
 
 int media_info_get_media_from_db(const char *media_id, media_info_h *media)
 {
@@ -2302,33 +2720,73 @@ int media_info_update_to_db(media_info_h media)
                media_svc_check_pinyin_support(&pinyin_support);
                if (pinyin_support) {
                        if (STRING_VALID(_media->display_name))
-                               media_svc_get_pinyin(_content_get_db_handle(), _media->display_name, &file_name_pinyin);
+                               media_svc_get_pinyin(_media->display_name, &file_name_pinyin);
                        if (STRING_VALID(_media->description))
-                               media_svc_get_pinyin(_content_get_db_handle(), _media->description, &description_pinyin);
+                               media_svc_get_pinyin(_media->description, &description_pinyin);
                        if (STRING_VALID(_media->author))
-                               media_svc_get_pinyin(_content_get_db_handle(), _media->author, &author_pinyin);
+                               media_svc_get_pinyin(_media->author, &author_pinyin);
                        if (STRING_VALID(_media->provider))
-                               media_svc_get_pinyin(_content_get_db_handle(), _media->provider, &provider_pinyin);
+                               media_svc_get_pinyin(_media->provider, &provider_pinyin);
                        if (STRING_VALID(_media->content_name))
-                               media_svc_get_pinyin(_content_get_db_handle(), _media->content_name, &content_name_pinyin);
+                               media_svc_get_pinyin(_media->content_name, &content_name_pinyin);
                        if (STRING_VALID(_media->category))
-                               media_svc_get_pinyin(_content_get_db_handle(), _media->category, &category_pinyin);
+                               media_svc_get_pinyin(_media->category, &category_pinyin);
                        if (STRING_VALID(_media->location_tag))
-                               media_svc_get_pinyin(_content_get_db_handle(), _media->location_tag, &location_tag_pinyin);
+                               media_svc_get_pinyin(_media->location_tag, &location_tag_pinyin);
                        if (STRING_VALID(_media->age_rating))
-                               media_svc_get_pinyin(_content_get_db_handle(), _media->age_rating, &age_rating_pinyin);
+                               media_svc_get_pinyin(_media->age_rating, &age_rating_pinyin);
                        if (STRING_VALID(_media->keyword))
-                               media_svc_get_pinyin(_content_get_db_handle(), _media->keyword, &keyword_pinyin);
+                               media_svc_get_pinyin(_media->keyword, &keyword_pinyin);
+               }
+
+               char *album = NULL;
+               char *artist = NULL;
+               char *genre = NULL;
+               char *recorded_date = NULL;
+
+               if (_media->media_type == MEDIA_CONTENT_TYPE_VIDEO) {
+                       if (_media->video_meta->album != NULL)
+                               album = strdup(_media->video_meta->album);
+                       if (_media->video_meta->artist != NULL)
+                               artist = strdup(_media->video_meta->artist);
+                       if (_media->video_meta->genre != NULL)
+                               genre = strdup(_media->video_meta->genre);
+                       if (_media->video_meta->recorded_date != NULL)
+                               recorded_date = strdup(_media->video_meta->recorded_date);
+               } else if ((_media->media_type == MEDIA_CONTENT_TYPE_MUSIC) || (_media->media_type == MEDIA_CONTENT_TYPE_SOUND)) {
+                       if (_media->audio_meta->album != NULL)
+                               album = strdup(_media->audio_meta->album);
+                       if (_media->audio_meta->artist != NULL)
+                               artist = strdup(_media->audio_meta->artist);
+                       if (_media->audio_meta->genre != NULL)
+                               genre = strdup(_media->audio_meta->genre);
+                       if (_media->audio_meta->recorded_date != NULL)
+                               recorded_date = strdup(_media->audio_meta->recorded_date);
+               }
+
+#ifdef _USE_SENIOR_MODE
+               if (_media_content_is_support_senior_mode()) {
+                       set_sql = sqlite3_mprintf("file_name=%Q, added_time=%d, description=%Q, longitude=%f, latitude=%f, altitude=%f, \
+                               played_count=%d, last_played_time=%d, last_played_position=%d, \
+                               rating=%d, favourite=%d, author=%Q, provider=%Q, content_name=%Q, category=%Q, location_tag=%Q, age_rating=%Q, keyword=%Q, weather=%Q, sync_status=%d, \
+                               file_name_pinyin=%Q, description_pinyin=%Q, author_pinyin=%Q, provider_pinyin=%Q, content_name_pinyin=%Q, category_pinyin=%Q, location_tag_pinyin=%Q, age_rating_pinyin=%Q, keyword_pinyin=%Q, title=%Q, contact=%Q, app_data=%Q",
+                               _media->display_name, _media->added_time, _media->description, _media->longitude, _media->latitude, _media->altitude, _media->played_count, _media->played_time, _media->played_position, _media->rating, _media->favourite,
+                               _media->author, _media->provider, _media->content_name, _media->category, _media->location_tag, _media->age_rating, _media->keyword, _media->weather, _media->sync_status,
+                               file_name_pinyin, description_pinyin, author_pinyin, provider_pinyin, content_name_pinyin, category_pinyin, location_tag_pinyin, age_rating_pinyin, keyword_pinyin, _media->title, _media->contact, _media->app_data);
+               } else
+#endif
+               {
+                       set_sql = sqlite3_mprintf("file_name=%Q, added_time=%d, description=%Q, longitude=%f, latitude=%f, altitude=%f, \
+                               played_count=%d, last_played_time=%d, last_played_position=%d, \
+                               rating=%d, favourite=%d, author=%Q, provider=%Q, content_name=%Q, category=%Q, location_tag=%Q, age_rating=%Q, keyword=%Q, weather=%Q, sync_status=%d, \
+                               file_name_pinyin=%Q, description_pinyin=%Q, author_pinyin=%Q, provider_pinyin=%Q, content_name_pinyin=%Q, category_pinyin=%Q, location_tag_pinyin=%Q, age_rating_pinyin=%Q, keyword_pinyin=%Q, title=%Q, \
+                               album=%Q, artist=%Q, genre=%Q, recorded_date=%Q",
+                               _media->display_name, _media->added_time, _media->description, _media->longitude, _media->latitude, _media->altitude, _media->played_count, _media->played_time, _media->played_position, _media->rating, _media->favourite,
+                               _media->author, _media->provider, _media->content_name, _media->category, _media->location_tag, _media->age_rating, _media->keyword, _media->weather, _media->sync_status,
+                               file_name_pinyin, description_pinyin, author_pinyin, provider_pinyin, content_name_pinyin, category_pinyin, location_tag_pinyin, age_rating_pinyin, keyword_pinyin, _media->title,
+                               album, artist, genre, recorded_date);
                }
 
-               set_sql = sqlite3_mprintf("file_name=%Q, added_time=%d, description=%Q, longitude=%f, latitude=%f, altitude=%f, \
-                       played_count=%d, last_played_time=%d, last_played_position=%d, \
-                       rating=%d, favourite=%d, author=%Q, provider=%Q, content_name=%Q, category=%Q, location_tag=%Q, age_rating=%Q, keyword=%Q, weather=%Q, sync_status=%d, \
-                       file_name_pinyin=%Q, description_pinyin=%Q, author_pinyin=%Q, provider_pinyin=%Q, content_name_pinyin=%Q, category_pinyin=%Q, location_tag_pinyin=%Q, age_rating_pinyin=%Q, keyword_pinyin=%Q, title=%Q",
-                       _media->display_name, _media->added_time, _media->description, _media->longitude, _media->latitude, _media->altitude, _media->played_count, _media->played_time, _media->played_position, _media->rating, _media->favourite,
-                       _media->author, _media->provider, _media->content_name, _media->category, _media->location_tag, _media->age_rating, _media->keyword, _media->weather, _media->sync_status,
-                       file_name_pinyin, description_pinyin, author_pinyin, provider_pinyin, content_name_pinyin, category_pinyin, location_tag_pinyin, age_rating_pinyin, keyword_pinyin, _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);
@@ -2344,6 +2802,11 @@ int media_info_update_to_db(media_info_h media)
                SAFE_FREE(age_rating_pinyin);
                SAFE_FREE(keyword_pinyin);
 
+               SAFE_FREE(album);
+               SAFE_FREE(artist);
+               SAFE_FREE(genre);
+               SAFE_FREE(recorded_date);
+
                if (_media->storage_type == MEDIA_CONTENT_STORAGE_CLOUD) {
                        set_sql = NULL;
                        sql = NULL;
@@ -2372,7 +2835,7 @@ int media_info_update_to_db(media_info_h media)
                        /* Send notification for this update */
                        media_content_debug("Update is successfull. Send notification for this");
                        if (_media->file_path && _media->mime_type)
-                               media_svc_publish_noti(_content_get_db_handle(), MS_MEDIA_ITEM_FILE, MS_MEDIA_ITEM_UPDATE, _media->file_path, _media->media_type, _media->media_id, _media->mime_type);
+                               media_svc_publish_noti(MS_MEDIA_ITEM_FILE, MS_MEDIA_ITEM_UPDATE, _media->file_path, _media->media_type, _media->media_id, _media->mime_type);
                        else
                                media_content_error("Can't Send Noti : path or mime type is NULL");
                }
@@ -2391,6 +2854,7 @@ int media_info_refresh_metadata_to_db(const char *media_id)
        char *file_path = NULL;
        media_content_storage_e storage_type = 0;
        char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, };
+       char repl_path[MAX_QUERY_SIZE] = {0, };
 
        if (!STRING_VALID(media_id)) {
                media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
@@ -2420,8 +2884,10 @@ int media_info_refresh_metadata_to_db(const char *media_id)
                media_info_destroy(media);
                return ret;
        }
+       memset(repl_path, 0, sizeof(repl_path));
+       ret = _media_content_replace_path(file_path, repl_path);
 
-       ret = _media_util_check_file_exist(file_path);
+       ret = _media_util_check_file_exist(repl_path);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                SAFE_FREE(file_path);
                media_info_destroy(media);
@@ -2429,7 +2895,7 @@ int media_info_refresh_metadata_to_db(const char *media_id)
        }
 
        memset(storage_id, 0x00, sizeof(storage_id));
-       ret = media_svc_get_storage_id(_content_get_db_handle(), file_path, storage_id);
+       ret = media_svc_get_storage_id(_content_get_db_handle(), repl_path, storage_id);
        if (ret != MS_MEDIA_ERR_NONE) {
                media_content_error("media_svc_get_storage_id failed : %d", ret);
                SAFE_FREE(file_path);
@@ -2437,7 +2903,7 @@ int media_info_refresh_metadata_to_db(const char *media_id)
                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));
+       ret = media_svc_refresh_item(_content_get_db_handle(), storage_id, storage_type, repl_path, tzplatform_getuid(TZ_USER_NAME));
        if (ret != MS_MEDIA_ERR_NONE)
                ret = _content_error_capi(MEDIA_CONTENT_TYPE, ret);
 
@@ -2456,61 +2922,77 @@ int media_info_move_to_db(media_info_h media, const char* dst_path)
        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, };
+       char repl_path[MAX_QUERY_SIZE] = {0, };
+       char org_repl_path[MAX_QUERY_SIZE] = {0, };
 
        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");
+       memset(repl_path, 0, sizeof(repl_path));
+       memset(org_repl_path, 0, sizeof(org_repl_path));
+       ret = _media_content_replace_path(dst_path, repl_path);
+       media_content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
 
        media_info_s *_media = (media_info_s*)media;
 
-       ret = _media_util_check_ignore_file(dst_path, &ignore_file);
+       ret = _media_util_check_ignore_file(repl_path, &ignore_file);
        media_content_retvm_if(ignore_file == TRUE, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path");
+       ret = _media_content_replace_path(_media->file_path, org_repl_path);
+       media_content_retvm_if(!STRING_VALID(org_repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
 
-       ret = _media_util_check_file_exist(dst_path);
+       ret = _media_util_check_file_exist(repl_path);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
-       folder_path = g_path_get_dirname(dst_path);
+       folder_path = g_path_get_dirname(repl_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));
+       ret = media_svc_get_storage_type(org_repl_path, &src_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);
        }
 
-       ret = media_svc_get_storage_type(dst_path, &dst_storage_type, tzplatform_getuid(TZ_USER_NAME));
+       ret = media_svc_get_storage_type(repl_path, &dst_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);
        }
 
        memset(storage_id, 0x00, sizeof(storage_id));
-       ret = media_svc_get_storage_id(_content_get_db_handle(), _media->file_path, storage_id);
+       ret = media_svc_get_storage_id(_content_get_db_handle(), org_repl_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));
+       ret = media_svc_move_item(_content_get_db_handle(), storage_id, src_storage_type, org_repl_path, dst_storage_type, repl_path, tzplatform_getuid(TZ_USER_NAME));
        return _content_error_capi(MEDIA_CONTENT_TYPE, ret);
 }
 
 int media_info_create_thumbnail(media_info_h media, media_thumbnail_completed_cb callback, void *user_data)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
+       static unsigned int req_id = 0;
+       char repl_path[MAX_QUERY_SIZE] = {0, };
        media_info_s *_media = (media_info_s*)media;
 
        if (_media != NULL && STRING_VALID(_media->media_id) && STRING_VALID(_media->file_path)) {
+               memset(repl_path, 0, sizeof(repl_path));
+               ret = _media_content_replace_path(_media->file_path, repl_path);
+               media_content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
+
                media_thumbnail_cb_s *_thumb_cb = (media_thumbnail_cb_s*)calloc(1, sizeof(media_thumbnail_cb_s));
                media_content_retvm_if(_thumb_cb == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+               req_id++;
+               _media->request_id = req_id;
 
                _thumb_cb->handle = _media;
                _thumb_cb->user_data = user_data;
                _thumb_cb->thumbnail_completed_cb = callback;
 
-               ret = thumbnail_request_from_db_async(_media->file_path, (ThumbFunc)__media_info_thumbnail_completed_cb, (void *)_thumb_cb, tzplatform_getuid(TZ_USER_NAME));
+               ret = thumbnail_request_from_db_async(_media->request_id, repl_path, (ThumbFunc)__media_info_thumbnail_completed_cb, (void *)_thumb_cb, tzplatform_getuid(TZ_USER_NAME));
                ret = _content_error_capi(MEDIA_THUMBNAIL_TYPE, ret);
        } else {
                media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
@@ -2524,9 +3006,74 @@ int media_info_cancel_thumbnail(media_info_h media)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
        media_info_s *_media = (media_info_s*)media;
+       char repl_path[MAX_QUERY_SIZE] = {0, };
+
+       if (_media != NULL && STRING_VALID(_media->media_id) && STRING_VALID(_media->file_path) && _media->request_id > 0) {
+               memset(repl_path, 0, sizeof(repl_path));
+               ret = _media_content_replace_path(_media->file_path, repl_path);
+               media_content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
+
+               ret = thumbnail_request_cancel_media(_media->request_id, repl_path);
+               ret = _content_error_capi(MEDIA_THUMBNAIL_TYPE, ret);
+       } else {
+               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+       }
+
+       return ret;
+}
+
+int media_info_start_face_detection(media_info_h media, media_face_detection_completed_cb callback, void *user_data)
+{
+       int ret = MEDIA_CONTENT_ERROR_NONE;
+       static unsigned int req_id = 0;
+       media_info_s *_media = (media_info_s*)media;
+       char repl_path[MAX_QUERY_SIZE] = {0, };
+
+       if (!__media_info_isFaceRecognition_feature_supported()) {
+               media_content_error("NOT_SUPPORTED(0x%08x)", MEDIA_CONTENT_ERROR_NOT_SUPPORTED);
+               return MEDIA_CONTENT_ERROR_NOT_SUPPORTED;
+       }
 
        if (_media != NULL && STRING_VALID(_media->media_id) && STRING_VALID(_media->file_path)) {
-               ret = thumbnail_request_cancel_media(_media->file_path);
+               memset(repl_path, 0, sizeof(repl_path));
+               ret = _media_content_replace_path(_media->file_path, repl_path);
+               media_content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
+               media_face_cb_s *_face_cb = (media_face_cb_s*)calloc(1, sizeof(media_face_cb_s));
+               media_content_retvm_if(_face_cb == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+               req_id++;
+               _media->face_request_id = req_id;
+
+               _face_cb->handle = _media;
+               _face_cb->user_data = user_data;
+               _face_cb->face_completed_cb = callback;
+
+               ret = dcm_request_extract_face_async(_media->face_request_id, repl_path, (FaceFunc)__media_info_face_completed_cb, (void *)_face_cb, tzplatform_getuid(TZ_USER_NAME));
+               ret = _content_error_capi(MEDIA_THUMBNAIL_TYPE, ret);
+       } else {
+               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+       }
+
+       return ret;
+}
+
+int media_info_cancel_face_detection(media_info_h media)
+{
+       int ret = MEDIA_CONTENT_ERROR_NONE;
+       media_info_s *_media = (media_info_s*)media;
+       char repl_path[MAX_QUERY_SIZE] = {0, };
+
+       if (!__media_info_isFaceRecognition_feature_supported()) {
+               media_content_error("NOT_SUPPORTED(0x%08x)", MEDIA_CONTENT_ERROR_NOT_SUPPORTED);
+               return MEDIA_CONTENT_ERROR_NOT_SUPPORTED;
+       }
+
+       if (_media != NULL && STRING_VALID(_media->media_id) && STRING_VALID(_media->file_path) && _media->face_request_id > 0) {
+               memset(repl_path, 0, sizeof(repl_path));
+               ret = _media_content_replace_path(_media->file_path, repl_path);
+               media_content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
+               ret = dcm_request_cancel_face(_media->face_request_id, repl_path);
                ret = _content_error_capi(MEDIA_THUMBNAIL_TYPE, ret);
        } else {
                media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
@@ -2539,11 +3086,23 @@ 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)
 {
        media_content_retvm_if(media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
+#ifndef _USE_TV_PROFILE
+       char repl_path[MAX_QUERY_SIZE] = {0, };
+       char *tmp_path = NULL;
+#endif
 
        media_svc_content_info_s *svc_content_info = calloc(1, sizeof(media_svc_content_info_s));
        media_content_retvm_if(svc_content_info == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
+#ifdef _USE_TV_PROFILE
        svc_content_info->path = g_strdup(media->file_path);
+#else
+       memset(repl_path, 0, sizeof(repl_path));
+       tmp_path = g_strdup(media->file_path);
+       _media_content_replace_path(tmp_path, repl_path);
+       svc_content_info->path = g_strdup(repl_path);
+       SAFE_FREE(tmp_path);
+#endif
        svc_content_info->file_name = g_strdup(media->display_name);
        svc_content_info->media_type = media->media_type;
        svc_content_info->mime_type = g_strdup(media->mime_type);
@@ -2559,6 +3118,13 @@ static int __media_info_map_data_usr_to_svc(media_info_s *media, media_svc_conte
        svc_content_info->played_count = media->played_count;
        svc_content_info->favourate = media->favourite;
 
+#ifdef _USE_SENIOR_MODE
+       if (_media_content_is_support_senior_mode()) {
+               svc_content_info->contact = g_strdup(media->contact);
+               svc_content_info->app_data = g_strdup(media->app_data);
+       }
+#endif
+
        svc_content_info->media_meta.title = g_strdup(media->title);
        svc_content_info->media_meta.rating = media->rating;
        svc_content_info->media_meta.description = g_strdup(media->description);
@@ -2674,90 +3240,118 @@ static int __media_info_set_str_data(media_info_h media, media_info_item_e data_
                }
                break;
        case MEDIA_INFO_ALBUM:
-               /* if (_media->media_type == MEDIA_CONTENT_TYPE_VIDEO) */
-               {
+               if (STRING_VALID(_media->media_id)) {
+                       if (_media->media_type == MEDIA_CONTENT_TYPE_VIDEO) {
+                               SAFE_FREE(_media->video_meta->album);
+                               if (str_data != NULL) {
+                                       _media->video_meta->album = strdup(str_data);
+                                       media_content_retvm_if(_media->video_meta->album == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+                               }
+                       } else if ((_media->media_type == MEDIA_CONTENT_TYPE_MUSIC) || (_media->media_type == MEDIA_CONTENT_TYPE_SOUND)) {
+                               SAFE_FREE(_media->audio_meta->album);
+                               if (str_data != NULL) {
+                                       _media->audio_meta->album = strdup(str_data);
+                                       media_content_retvm_if(_media->audio_meta->album == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+                               }
+                       }
+               } else {
                        SAFE_FREE(_media->video_meta->album);
-                       if (STRING_VALID(str_data)) {
+                       if (str_data != NULL) {
                                _media->video_meta->album = strdup(str_data);
                                media_content_retvm_if(_media->video_meta->album == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-                       } else {
-                               _media->video_meta->album = NULL;
                        }
-               }
-               /* else if ((_media->media_type == MEDIA_CONTENT_TYPE_MUSIC) || (_media->media_type == MEDIA_CONTENT_TYPE_SOUND)) */
-               {
+
                        SAFE_FREE(_media->audio_meta->album);
-                       if (STRING_VALID(str_data)) {
+                       if (str_data != NULL) {
                                _media->audio_meta->album = strdup(str_data);
                                media_content_retvm_if(_media->audio_meta->album == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-                       } else {
-                               _media->audio_meta->album = NULL;
                        }
                }
                break;
        case MEDIA_INFO_ARTIST:
-               /* if (_media->media_type == MEDIA_CONTENT_TYPE_VIDEO) */
-               {
+               if (STRING_VALID(_media->media_id)) {
+                       if (_media->media_type == MEDIA_CONTENT_TYPE_VIDEO) {
+                               SAFE_FREE(_media->video_meta->artist);
+                               if (str_data != NULL) {
+                                       _media->video_meta->artist = strdup(str_data);
+                                       media_content_retvm_if(_media->video_meta->artist == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+                               }
+                       } else if ((_media->media_type == MEDIA_CONTENT_TYPE_MUSIC) || (_media->media_type == MEDIA_CONTENT_TYPE_SOUND)) {
+                               SAFE_FREE(_media->audio_meta->artist);
+                               if (str_data != NULL) {
+                                       _media->audio_meta->artist = strdup(str_data);
+                                       media_content_retvm_if(_media->audio_meta->artist == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+                               }
+                       }
+               } else {
                        SAFE_FREE(_media->video_meta->artist);
-                       if (STRING_VALID(str_data)) {
+                       if (str_data != NULL) {
                                _media->video_meta->artist = strdup(str_data);
                                media_content_retvm_if(_media->video_meta->artist == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-                       } else {
-                               _media->video_meta->artist = NULL;
                        }
-               }
-               /* else if ((_media->media_type == MEDIA_CONTENT_TYPE_MUSIC) || (_media->media_type == MEDIA_CONTENT_TYPE_SOUND)) */
-               {
+
                        SAFE_FREE(_media->audio_meta->artist);
-                       if (STRING_VALID(str_data)) {
+                       if (str_data != NULL) {
                                _media->audio_meta->artist = strdup(str_data);
                                media_content_retvm_if(_media->audio_meta->artist == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-                       } else {
-                               _media->audio_meta->artist = NULL;
                        }
                }
                break;
        case MEDIA_INFO_GENRE:
-               /* if (_media->media_type == MEDIA_CONTENT_TYPE_VIDEO) */
-               {
+               if (STRING_VALID(_media->media_id)) {
+                       if (_media->media_type == MEDIA_CONTENT_TYPE_VIDEO) {
+                               SAFE_FREE(_media->video_meta->genre);
+                               if (str_data != NULL) {
+                                       _media->video_meta->genre = strdup(str_data);
+                                       media_content_retvm_if(_media->video_meta->genre == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+                               }
+                       } else if ((_media->media_type == MEDIA_CONTENT_TYPE_MUSIC) || (_media->media_type == MEDIA_CONTENT_TYPE_SOUND)) {
+                               SAFE_FREE(_media->audio_meta->genre);
+                               if (str_data != NULL) {
+                                       _media->audio_meta->genre = strdup(str_data);
+                                       media_content_retvm_if(_media->audio_meta->genre == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+                               }
+                       }
+               } else {
                        SAFE_FREE(_media->video_meta->genre);
-                       if (STRING_VALID(str_data)) {
+                       if (str_data != NULL) {
                                _media->video_meta->genre = strdup(str_data);
                                media_content_retvm_if(_media->video_meta->genre == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-                       } else {
-                               _media->video_meta->genre = NULL;
                        }
-               }
-               /* else if ((_media->media_type == MEDIA_CONTENT_TYPE_MUSIC) || (_media->media_type == MEDIA_CONTENT_TYPE_SOUND)) */
-               {
+
                        SAFE_FREE(_media->audio_meta->genre);
-                       if (STRING_VALID(str_data)) {
+                       if (str_data != NULL) {
                                _media->audio_meta->genre = strdup(str_data);
                                media_content_retvm_if(_media->audio_meta->genre == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-                       } else {
-                               _media->audio_meta->genre = NULL;
                        }
                }
                break;
        case MEDIA_INFO_RECORDED_DATE:
-               /* if (_media->media_type == MEDIA_CONTENT_TYPE_VIDEO) */
-               {
+               if (STRING_VALID(_media->media_id)) {
+                       if (_media->media_type == MEDIA_CONTENT_TYPE_VIDEO) {
+                               SAFE_FREE(_media->video_meta->recorded_date);
+                               if (str_data != NULL) {
+                                       _media->video_meta->recorded_date = strdup(str_data);
+                                       media_content_retvm_if(_media->video_meta->recorded_date == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+                               }
+                       } else if ((_media->media_type == MEDIA_CONTENT_TYPE_MUSIC) || (_media->media_type == MEDIA_CONTENT_TYPE_SOUND)) {
+                               SAFE_FREE(_media->audio_meta->recorded_date);
+                               if (str_data != NULL) {
+                                       _media->audio_meta->recorded_date = strdup(str_data);
+                                       media_content_retvm_if(_media->audio_meta->recorded_date == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+                               }
+                       }
+               } else {
                        SAFE_FREE(_media->video_meta->recorded_date);
-                       if (STRING_VALID(str_data)) {
+                       if (str_data != NULL) {
                                _media->video_meta->recorded_date = strdup(str_data);
                                media_content_retvm_if(_media->video_meta->recorded_date == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-                       } else {
-                               _media->video_meta->recorded_date = NULL;
                        }
-               }
-               /* else if ((_media->media_type == MEDIA_CONTENT_TYPE_MUSIC) || (_media->media_type == MEDIA_CONTENT_TYPE_SOUND)) */
-               {
+
                        SAFE_FREE(_media->audio_meta->recorded_date);
-                       if (STRING_VALID(str_data)) {
+                       if (str_data != NULL) {
                                _media->audio_meta->recorded_date = strdup(str_data);
                                media_content_retvm_if(_media->audio_meta->recorded_date == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-                       } else {
-                               _media->audio_meta->recorded_date = NULL;
                        }
                }
                break;
@@ -2848,6 +3442,7 @@ static int __media_info_destroy(media_info_h media)
 int media_info_insert_to_db_with_data(media_info_h media)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
+       char repl_path[MAX_QUERY_SIZE] = {0, };
 
        media_info_s *_media = (media_info_s*)media;
 
@@ -2888,7 +3483,10 @@ int media_info_insert_to_db_with_data(media_info_h media)
        SAFE_FREE(svc_content_info);
 
        /*Fill out the handle*/
-       char *media_file_path = g_strdup(_media->file_path);
+       memset(repl_path, 0, sizeof(repl_path));
+       ret = _media_content_replace_path(_media->file_path, repl_path);
+       char *media_file_path = g_strdup(repl_path);
+
        char *media_string_uuid = g_strdup(_media->storage_uuid);
 
        __media_info_destroy(media);
@@ -2907,35 +3505,39 @@ 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;
+       bool ignore_file = FALSE;
+       char repl_path[MAX_QUERY_SIZE] = {0, };
 
        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(repl_path, 0, sizeof(repl_path));
+       ret = _media_content_replace_path(path, repl_path);
+       media_content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
+
+       ret = _media_util_check_ignore_file(repl_path, &ignore_file);
+       media_content_retvm_if(ignore_file == TRUE, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path");
 
        memset(storage_id, 0x00, sizeof(storage_id));
 
-       if (STRING_VALID(MEDIA_ROOT_PATH_CLOUD) && (strstr(MEDIA_ROOT_PATH_CLOUD, path) == NULL)) {
-               bool ignore_file = FALSE;
+       if (STRING_VALID(MEDIA_ROOT_PATH_CLOUD) && (strstr(repl_path, MEDIA_ROOT_PATH_CLOUD) == NULL)) {
                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);
+               ret = _media_util_check_file_exist(repl_path);
                media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
-               folder_path = g_path_get_dirname(path);
+               folder_path = g_path_get_dirname(repl_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);
+               ret = media_svc_get_storage_id(_content_get_db_handle(), repl_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));
+               ret = media_svc_get_storage_type(repl_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);
@@ -2974,6 +3576,7 @@ int media_info_create(const char *path, media_info_h *media)
        _media->media_type = 0;
        _media->modified_time = 0;
        _media->size = 0;
+       _media->request_id = 0;
        _media->longitude = MEDIA_SVC_DEFAULT_GPS_VALUE;
        _media->latitude = MEDIA_SVC_DEFAULT_GPS_VALUE;
        _media->altitude = MEDIA_SVC_DEFAULT_GPS_VALUE;
@@ -2988,11 +3591,6 @@ int media_info_create(const char *path, media_info_h *media)
        return ret;
 }
 
-int media_info_set_path(media_info_h media, const char *path)
-{
-       return __media_info_set_str_data(media, MEDIA_INFO_PATH, path);
-}
-
 int media_info_set_mime_type(media_info_h media, const char *mime_type)
 {
        return __media_info_set_str_data(media, MEDIA_INFO_MIME_TYPE, mime_type);
@@ -3130,3 +3728,16 @@ int media_info_set_storage_type(media_info_h media, media_content_storage_e stor
 
        return MEDIA_CONTENT_ERROR_NONE;
 }
+
+#ifdef _USE_SENIOR_MODE
+int media_info_set_contact(media_info_h media, const char *contact)
+{
+       return __media_info_set_str_data(media, MEDIA_INFO_CONTACT, contact);
+}
+
+int media_info_set_app_data(media_info_h media, const char *app_data)
+{
+       return __media_info_set_str_data(media, MEDIA_INFO_APP_DATA, app_data);
+}
+#endif
+