Add face related tables

Change-Id: I88132259809781dcc31eefd326d84b79d62297dd

diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec
index fb408a2..82ced06 100644 (file)
--- a/packaging/libmedia-service.spec
+++ b/packaging/libmedia-service.spec
@@ -1,6 +1,6 @@
 Name:       libmedia-service
 Summary:    Media information service library for multimedia applications
-Version: 0.2.51
+Version: 0.2.52
 Release:    3
 Group:      System/Libraries
 License:    Apache-2.0 and public domain

diff --git a/src/common/media-svc-db-utils.c b/src/common/media-svc-db-utils.c
index 57bba19..ec1bbc9 100755 (executable)
--- a/src/common/media-svc-db-utils.c
+++ b/src/common/media-svc-db-utils.c
@@ -572,6 +572,8 @@ int _media_svc_init_table_query()
        ret = __media_svc_add_table_info(MEDIA_SVC_DB_TABLE_TAG, MEDIA_SVC_DB_TRIGGER_TAG_MAP1, MEDIA_SVC_DB_TABLE_TAG, MEDIA_SVC_DB_TABLE_TAG_MAP, MEDIA_SVC_DB_VIEW_TAG);
        ret = __media_svc_add_table_info(MEDIA_SVC_DB_TABLE_BOOKMARK, MEDIA_SVC_DB_TRIGGER_BOOKMARK, MEDIA_SVC_DB_TABLE_MEDIA, MEDIA_SVC_DB_TABLE_BOOKMARK, NULL);
        ret = __media_svc_add_table_info(MEDIA_SVC_DB_TABLE_STORAGE, MEDIA_SVC_DB_TRIGGER_STORAGE, MEDIA_SVC_DB_TABLE_STORAGE, MEDIA_SVC_DB_TABLE_FOLDER, NULL);
+       ret = __media_svc_add_table_info(MEDIA_SVC_DB_TABLE_FACE_SCAN_LIST, MEDIA_SVC_DB_TRIGGER_FACE_SCAN_LIST, MEDIA_SVC_DB_TABLE_MEDIA, MEDIA_SVC_DB_TABLE_FACE_SCAN_LIST, NULL);
+       ret = __media_svc_add_table_info(MEDIA_SVC_DB_TABLE_FACE, MEDIA_SVC_DB_TRIGGER_FACE, MEDIA_SVC_DB_TABLE_FACE_SCAN_LIST, MEDIA_SVC_DB_TABLE_FACE, NULL);
        ret = __media_svc_add_table_info(MEDIA_SVC_DB_TABLE_CUSTOM, MEDIA_SVC_DB_TRIGGER_CUSTOM, MEDIA_SVC_DB_TABLE_MEDIA, MEDIA_SVC_DB_TABLE_CUSTOM, NULL);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
@@ -716,6 +718,21 @@ int _media_svc_init_table_query()
        ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_STORAGE], "validity", MEDIA_SVC_DB_TYPE_INT, "DEFAULT 1", 0, NULL, false, false, false);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
+       /*face scan list*/
+       ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_FACE_SCAN_LIST], "media_uuid", MEDIA_SVC_DB_TYPE_TEXT, "NOT NULL", 0, NULL, true, true, false);
+       ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_FACE_SCAN_LIST], "storage_uuid", MEDIA_SVC_DB_TYPE_TEXT, "NOT NULL", 0, NULL, false, false, false);
+       media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
+
+       /*face*/
+       ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_FACE], "face_uuid", MEDIA_SVC_DB_TYPE_TEXT, "PRIMARY KEY", 0, NULL, true, false, false);
+       ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_FACE], "media_uuid", MEDIA_SVC_DB_TYPE_TEXT, "NOT NULL", 0, NULL, false, true, false);
+       ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_FACE], "face_rect_x", MEDIA_SVC_DB_TYPE_INT, "DEFAULT 0", 0, NULL, false, false, false);
+       ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_FACE], "face_rect_y", MEDIA_SVC_DB_TYPE_INT, "DEFAULT 0", 0, NULL, false, false, false);
+       ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_FACE], "face_rect_w", MEDIA_SVC_DB_TYPE_INT, "DEFAULT 0", 0, NULL, false, false, false);
+       ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_FACE], "face_rect_h", MEDIA_SVC_DB_TYPE_INT, "DEFAULT 0", 0, NULL, false, false, false);
+       ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_FACE], "orientation", MEDIA_SVC_DB_TYPE_INT, "DEFAULT 0", 0, NULL, false, false, false);
+       media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
+
        /*custom*/
        ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_CUSTOM], "_id", MEDIA_SVC_DB_TYPE_INT, "PRIMARY KEY AUTOINCREMENT", 0, NULL, false, false, false);
        ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_CUSTOM], "media_uuid", MEDIA_SVC_DB_TYPE_TEXT, NULL, 0, NULL, false, true, false);

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index a243d34..0e43c15 100755 (executable)
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -121,7 +121,7 @@ int media_svc_create_table(MediaSvcHandle *handle, uid_t uid)
        ret = _media_svc_make_table_query(db_handle, MEDIA_SVC_DB_TABLE_BOOKMARK, MEDIA_SVC_DB_LIST_BOOKMARK, uid);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
-       /*create storage table*/
+       /*create storage table. from tizen 2.4*/
        ret = _media_svc_make_table_query(db_handle, MEDIA_SVC_DB_TABLE_STORAGE, MEDIA_SVC_DB_LIST_STORAGE, uid);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
@@ -129,6 +129,13 @@ int media_svc_create_table(MediaSvcHandle *handle, uid_t uid)
        ret = _media_svc_init_storage(db_handle, uid);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
+       /*create face table. from tizen 3.0*/
+       ret = _media_svc_make_table_query(db_handle, MEDIA_SVC_DB_TABLE_FACE_SCAN_LIST, MEDIA_SVC_DB_LIST_FACE_SCAN_LIST, uid);
+       media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
+
+       ret = _media_svc_make_table_query(db_handle, MEDIA_SVC_DB_TABLE_FACE, MEDIA_SVC_DB_LIST_FACE, uid);
+       media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
+
        _media_svc_destroy_table_query();
 
        media_svc_debug_func();

diff --git a/src/include/common/media-svc-env.h b/src/include/common/media-svc-env.h
index 9ee488a..63e3dc6 100755 (executable)
--- a/src/include/common/media-svc-env.h
+++ b/src/include/common/media-svc-env.h
@@ -47,15 +47,17 @@ extern "C" {
  * Table Name
  */
 #define MEDIA_SVC_DB_TABLE_MEDIA                               "media"                         /**<  media table*/
-#define MEDIA_SVC_DB_TABLE_FOLDER                              "folder"                        /**<  media_folder table*/
+#define MEDIA_SVC_DB_TABLE_FOLDER                              "folder"                                /**<  media_folder table*/
 #define MEDIA_SVC_DB_TABLE_PLAYLIST                            "playlist"                      /**<  playlist table*/
 #define MEDIA_SVC_DB_TABLE_PLAYLIST_MAP                        "playlist_map"          /**<  playlist_map table*/
 #define MEDIA_SVC_DB_TABLE_ALBUM                               "album"                         /**<  album table*/
-#define MEDIA_SVC_DB_TABLE_TAG                                 "tag"                           /**<  tag table*/
-#define MEDIA_SVC_DB_TABLE_TAG_MAP                             "tag_map"                       /**<  tag_map table*/
-#define MEDIA_SVC_DB_TABLE_BOOKMARK                            "bookmark"                      /**<  bookmark table*/
-#define MEDIA_SVC_DB_TABLE_CUSTOM                              "custom"                                /**<  custom table*/
+#define MEDIA_SVC_DB_TABLE_TAG                                 "tag"                   /**<  tag table*/
+#define MEDIA_SVC_DB_TABLE_TAG_MAP                             "tag_map"               /**<  tag_map table*/
+#define MEDIA_SVC_DB_TABLE_BOOKMARK                            "bookmark"              /**<  bookmark table*/
+#define MEDIA_SVC_DB_TABLE_CUSTOM                              "custom"                        /**<  custom table*/
 #define MEDIA_SVC_DB_TABLE_STORAGE                             "storage"                       /**<  storage table*/
+#define MEDIA_SVC_DB_TABLE_FACE                                        "face"                  /**<  face table*/
+#define MEDIA_SVC_DB_TABLE_FACE_SCAN_LIST                      "face_scan_list"        /**<  face_scan_list table*/
 
 /**
  * View Name
@@ -76,6 +78,9 @@ extern "C" {
 #define MEDIA_SVC_DB_TRIGGER_BOOKMARK                  "bookmark_cleanup"
 #define MEDIA_SVC_DB_TRIGGER_STORAGE                   "storage_folder_cleanup"
 #define MEDIA_SVC_DB_TRIGGER_CUSTOM                    "custom_cleanup"
+#define MEDIA_SVC_DB_TRIGGER_FACE_SCAN_LIST    "face_scan_list_cleanup"
+#define MEDIA_SVC_DB_TRIGGER_FACE                              "face_cleanup"
+
 
 /**
  * Trigger Name
@@ -153,12 +158,14 @@ typedef enum {
        MEDIA_SVC_DB_LIST_PLAYLIST_MAP = 2,
        MEDIA_SVC_DB_LIST_PLAYLIST      = 3,
        MEDIA_SVC_DB_LIST_ALBUM         = 4,
-       MEDIA_SVC_DB_LIST_TAG_MAP               = 5,
+       MEDIA_SVC_DB_LIST_TAG_MAP       = 5,
        MEDIA_SVC_DB_LIST_TAG                   = 6,
        MEDIA_SVC_DB_LIST_BOOKMARK      = 7,
-       MEDIA_SVC_DB_LIST_STORAGE               = 8,
-       MEDIA_SVC_DB_LIST_CUSTOM                = 9,
-       MEDIA_SVC_DB_LIST_MAX                   = 10,
+       MEDIA_SVC_DB_LIST_STORAGE       = 8,
+       MEDIA_SVC_DB_LIST_FACE_SCAN_LIST        = 9,
+       MEDIA_SVC_DB_LIST_FACE                  = 10,
+       MEDIA_SVC_DB_LIST_CUSTOM,
+       MEDIA_SVC_DB_LIST_MAX   ,
 } media_svc_table_slist_e;
 
 typedef struct table_inform {