From 2a4d07208187c738977d4d1ea71e4f2fdf96cdda Mon Sep 17 00:00:00 2001 From: Haejeong Kim Date: Tue, 22 Aug 2017 14:54:15 +0900 Subject: [PATCH] 1. Code sync to product code 2. Change some define name Change-Id: I080b031b450c6d66dd340095cf36ca4e25d7ea69 --- include/media_info_private.h | 2 +- include_product/media_info.h | 3 ++- include_product/media_info_private.h | 5 ++++- packaging/capi-content-media-content.spec | 2 +- src/media_face.c | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/media_info_private.h b/include/media_info_private.h index d25df4f..552a574 100755 --- a/include/media_info_private.h +++ b/include/media_info_private.h @@ -670,7 +670,7 @@ typedef struct _media_content_cb_data { #define SELECT_FACE_LIST_BY_MEDIA_ID "SELECT fa.face_uuid, fa.media_uuid, fa.face_rect_x, fa.face_rect_y, fa.face_rect_w, fa.face_rect_h, fa.orientation, fa.face_tag FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'" #define SELECT_FACE_PATH_FROM_MEDIA "SELECT path FROM "DB_TABLE_MEDIA_VIEW" media_uuid='%s'" #define SELECT_MEDIA_FROM_FACE "SELECT media_uuid FROM "DB_TABLE_FACE" WHERE face_uuid='%q' AND user_marked = 0" -#define UPDATE_MEDIA_INFO "UPDATE "DB_TABLE_FACE_SCAN_LIST" SET modified_time = 0 WHERE media_uuid='%q'" +#define UPDATE_MEDIA_INFO_IN_FACE_SCAN_LIST "UPDATE "DB_TABLE_FACE_SCAN_LIST" SET modified_time = 0 WHERE media_uuid='%q'" #define DEFAULT_MEDIA_STORAGE_ID "media" diff --git a/include_product/media_info.h b/include_product/media_info.h index c4a17a3..20af652 100755 --- a/include_product/media_info.h +++ b/include_product/media_info.h @@ -1572,7 +1572,8 @@ int media_info_set_added_time(media_info_h media, time_t added_time) TIZEN_DEPRE * @remarks You must add privilege http://tizen.org/privilege/content.write. And You add more privilege depending on your choice of contents path. \n * If you want to access only internal storage by using this API, you should add privilege http://tizen.org/privilege/mediastorage. \n * Or if you want to access only external storage by using this API, you should add privilege http://tizen.org/privilege/externalstorage. \n - * If you can access both storage, you should add all privilege. + * If you can access both storage, you should add all privilege. \n + * This API does not support USB storage. * * @param[in] media The media info handle * @param[in] dst_path The path of destination diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h index 5e2b8e7..b7d8813 100755 --- a/include_product/media_info_private.h +++ b/include_product/media_info_private.h @@ -831,7 +831,7 @@ typedef struct _media_content_scan_cb_data_v2 { /* Face */ #define DELETE_FACE_FROM_FACE "DELETE FROM "DB_TABLE_FACE" WHERE face_uuid='%q'" -#define INSERT_FACE_TO_FACE "INSERT INTO "DB_TABLE_FACE" (face_uuid, media_uuid, face_rect_x , face_rect_y, face_rect_w, face_rect_h, orientation, face_tag) VALUES ('%q', '%q', %d, %d, %d, %d, %d, %Q);" +#define INSERT_FACE_TO_FACE "INSERT INTO "DB_TABLE_FACE" (face_uuid, media_uuid, face_rect_x , face_rect_y, face_rect_w, face_rect_h, orientation, face_tag, user_marked) VALUES ('%q', '%q', %d, %d, %d, %d, %d, %Q, 1);" #define UPDATE_FACE_TO_FACE "UPDATE "DB_TABLE_FACE" SET face_rect_x=%d, face_rect_y=%d, face_rect_w=%d, face_rect_h=%d, orientation=%d, face_tag=%Q WHERE face_uuid='%q'" #define SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID "SELECT COUNT(*) FROM "DB_TABLE_MEDIA_VIEW" WHERE media_uuid='%q' AND validity=1" #define SELECT_FACE_COUNT "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN @@ -839,6 +839,9 @@ typedef struct _media_content_scan_cb_data_v2 { #define SELECT_FACE_LIST "SELECT fa.face_uuid, fa.media_uuid, fa.face_rect_x, fa.face_rect_y, fa.face_rect_w, fa.face_rect_h, fa.orientation, fa.face_tag FROM "FACE_MEDIA_JOIN #define SELECT_FACE_LIST_BY_MEDIA_ID "SELECT fa.face_uuid, fa.media_uuid, fa.face_rect_x, fa.face_rect_y, fa.face_rect_w, fa.face_rect_h, fa.orientation, fa.face_tag FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'" #define SELECT_FACE_PATH_FROM_MEDIA "SELECT path FROM "DB_TABLE_MEDIA_VIEW" media_uuid='%s'" +#define SELECT_MEDIA_FROM_FACE "SELECT media_uuid FROM "DB_TABLE_FACE" WHERE face_uuid='%q' AND user_marked = 0" +#define UPDATE_MEDIA_INFO_IN_FACE_SCAN_LIST "UPDATE "DB_TABLE_FACE_SCAN_LIST" SET modified_time = 0 WHERE media_uuid='%q'" + #define DEFAULT_MEDIA_STORAGE_ID "media" diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec index 99aa9a3..97c0a2d 100755 --- a/packaging/capi-content-media-content.spec +++ b/packaging/capi-content-media-content.spec @@ -1,6 +1,6 @@ Name: capi-content-media-content Summary: A Media content library in Tizen Native API -Version: 0.3.23 +Version: 0.3.24 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/media_face.c b/src/media_face.c index 745dcf0..d061112 100755 --- a/src/media_face.c +++ b/src/media_face.c @@ -308,7 +308,7 @@ int media_face_delete_from_db(const char *face_id) SQLITE3_FINALIZE(stmt); if (STRING_VALID(media_id)) { - query_str = sqlite3_mprintf(UPDATE_MEDIA_INFO, media_id); + query_str = sqlite3_mprintf(UPDATE_MEDIA_INFO_IN_FACE_SCAN_LIST, media_id); ret = _content_query_sql(query_str); SQLITE3_SAFE_FREE(query_str); } -- 2.7.4