1. Remove unused all_face_detection_mode related code

2. Change DCM time out to 60 sec

Change-Id: I006667f389133d0418344f9f237a1e0b5d0db066

diff --git a/lib/include/media-server-ipc.h b/lib/include/media-server-ipc.h
index f787e9a..854dbc9 100755 (executable)
--- a/lib/include/media-server-ipc.h
+++ b/lib/include/media-server-ipc.h
@@ -25,6 +25,8 @@
 #define MS_TIMEOUT_SEC_3                                       3               /**< Response from Server time out */
 #define MS_TIMEOUT_SEC_10                                      10              /**< Response from Server time out */
 #define MS_TIMEOUT_SEC_20                      20              /**< Response from Media server time out */
+#define MS_TIMEOUT_SEC_60                      60              /**< Response from DCM daemon time out */
+
 
 typedef enum {
        MS_DB_BATCH_UPDATE_PORT = 0,    /**< Media DB batch update */
@@ -34,9 +36,9 @@ typedef enum {
        MS_THUMB_CREATOR_PORT,          /**< Create thumbnail */
        MS_THUMB_COMM_PORT,             /**< Port of communication between creator and server */
        MS_THUMB_DAEMON_PORT,           /**< Port of Thumbnail server */
-       MS_DCM_CREATOR_PORT,                    /**< Create DCM service */
-       MS_DCM_COMM_PORT,                       /**< Port of communication between creator and server */
-       MS_DCM_DAEMON_PORT,                     /**< Port of DCM service */
+       MS_DCM_CREATOR_PORT,                    /**< Port of DCM service thread. Receive DCM extract msg from client */
+       MS_DCM_COMM_PORT,                       /**< Port of communication between DCM service thread and DCM daemon */
+       MS_DCM_DAEMON_PORT,                     /**< Port of DCM daemon. Receive DCM extract msg from DCM service thread */
        MS_PORT_MAX,
 } ms_msg_port_type_e;
 
@@ -118,14 +120,9 @@ typedef struct {
 
 typedef enum {
        DCM_MSG_REQUEST_MEDIA,                  /**< request single media extracting. msg from media server to dcm server*/
-       DCM_MSG_REQUEST_ALL_MEDIA,              /**< request all media extracting. msg from media server to dcm server*/
        DCM_MSG_REQUEST_CANCEL_FACE,    /**< request cancel single media extracting. msg from media server to dcm server*/
        DCM_MSG_REQUEST_KILL_SERVER,            /**< request dcm server terminating. msg from media server to dcm server*/
-       DCM_MSG_SCAN_READY,                             /**< scan thread in dcm server is ready. msg from scan thread to main thread in dcm server*/
-       DCM_MSG_SCAN_COMPLETED,                 /**< all media extracting is done. msg from scan thread to main thread in dcm server*/
-       DCM_MSG_SCAN_TERMINATED,                /**< scan thread in dcm server is terminated. msg from scan thread to main thread in dcm server*/
        DCM_MSG_SERVER_READY,                   /**< dcm server is ready. msg from dcm server to media server*/
-       DCM_MSG_EXTRACT_ALL_DONE,               /**< all-dcm extracting done. msg from dcm server to media server*/
        DCM_MSG_MAX,
 } ms_dcm_msg_type_e;
 

diff --git a/lib/media-util-dcm.c b/lib/media-util-dcm.c
index 43224d0..d8ba669 100755 (executable)
--- a/lib/media-util-dcm.c
+++ b/lib/media-util-dcm.c
@@ -155,7 +155,7 @@ gboolean __media_dcm_write_socket(GIOChannel *src, GIOCondition condition, gpoin
        MSAPI_DBG("Completed.. %d, %s, %d", recv_msg.msg_type, recv_msg.msg, recv_msg.result);
 
        if (__media_dcm_check_cancel()) {
-               MSAPI_DBG_ERR("__media_dcm_check_cancel is true");
+               MSAPI_DBG_INFO("Not canceled item. call cb");
                if (data) {
                        faceUserData* cb = (faceUserData*)data;
                        if (cb->func != NULL)
@@ -177,7 +177,7 @@ static int __media_dcm_send_request()
        struct sockaddr_un serv_addr;
        dcmReq *req_manager = NULL;
 
-       MSAPI_DBG("__media_dcm_send_request start");
+       MSAPI_DBG_FUNC();
 
        err = ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock);
        if (err != MS_MEDIA_ERR_NONE) {
@@ -238,7 +238,7 @@ static int __media_dcm_send_request()
                return MS_MEDIA_ERR_SOCKET_SEND;
        }
 
-       MSAPI_DBG("Sending msg to dcm service is successful");
+       MSAPI_DBG("Sending msg to dcm service (in media-server) is successful");
 
        if (req_manager->msg_type == DCM_MSG_REQUEST_MEDIA) {
                req_manager->channel = channel;

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index e9427c6..8d03e2e 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.3.58
+Version:    0.3.59
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/server/media-server-dcm.c b/src/server/media-server-dcm.c
index 2ba49dd..db3140d 100755 (executable)
--- a/src/server/media-server-dcm.c
+++ b/src/server/media-server-dcm.c
@@ -212,7 +212,7 @@ gboolean _ms_dcm_agent_send_msg_to_dcm_server(dcmMsg *recv_msg, dcmMsg *res_msg)
                return FALSE;
        }
 
-       if (ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock) < 0) {
+       if (ms_ipc_create_client_socket(MS_TIMEOUT_SEC_60, &sock) < 0) {
                MS_DBG_ERR("ms_ipc_create_client_socket failed");
                return FALSE;
        }
@@ -236,7 +236,7 @@ gboolean _ms_dcm_agent_send_msg_to_dcm_server(dcmMsg *recv_msg, dcmMsg *res_msg)
                return FALSE;
        }
 
-       MS_DBG_SLOG("Sending msg to DCM service is successful %d", recv_msg->msg_type);
+       MS_DBG_SLOG("Sending msg to DCM daemon is successful. msg_type [%d]", recv_msg->msg_type);
 
        if (__ms_dcm_recv_msg(sock, res_msg) < 0) {
                MS_DBG_ERR("__ms_dcm_recv_msg failed");