Add API - espp_client_set_eos_cb()

Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/src/client/espp_service_client.c b/src/client/espp_service_client.c
index 6eabe8e952a928096f47f3cdc541c603069ea463..2e59325f24601bc11494ea64a8a21fea0d7c781f 100644 (file)
--- a/src/client/espp_service_client.c
+++ b/src/client/espp_service_client.c
@@ -86,6 +86,29 @@ int espp_client_set_seek_done_cb(espp_h espp, espp_seek_done_cb callback, void *
        return ESPP_CLIENT_ERROR_NONE;
 }
 
+int espp_client_set_eos_cb(espp_h espp, espp_eos_cb callback, void *user_data)
+{
+       espp_s *_espp = (espp_s *)espp;
+       g_autoptr(GMutexLocker) locker = NULL;
+
+       RET_VAL_IF(!espp, ESPP_CLIENT_ERROR_INVALID_PARAMETER, "espp is NULL");
+       RET_VAL_IF(!callback, ESPP_CLIENT_ERROR_INVALID_PARAMETER, "callback is NULL");
+
+       locker = g_mutex_locker_new(&_espp->mutex);
+
+       if (espp_service_client_socket_request_set_callback(_espp, ESPP_SERVICE_EVENT_CB_EOS, (void *)callback, user_data) != 0)
+               return ESPP_CLIENT_ERROR_INVALID_OPERATION;
+
+       LOG_WARNING_IF_CALLBACK_EXISTS(_espp->eos_cb);
+
+       _espp->eos_cb.callback = callback;
+       _espp->eos_cb.user_data = user_data;
+
+       LOG_INFO("espp[%p] callback[%p] user_data[%p]", espp, callback, user_data);
+
+       return ESPP_CLIENT_ERROR_NONE;
+}
+
 int espp_client_set_resource_conflicted_cb(espp_h espp, espp_resource_conflicted_cb callback, void *user_data)
 {
        espp_s *_espp = (espp_s *)espp;

diff --git a/src/client/espp_service_client.h b/src/client/espp_service_client.h
index 0308b7b60688d34ed4169fc2e153ebff59b09f38..135a66121030a78e640f61a18d6a24d84806ac22 100644 (file)
--- a/src/client/espp_service_client.h
+++ b/src/client/espp_service_client.h
@@ -187,6 +187,13 @@ typedef void (*espp_prepare_async_done_cb)(bool result, void *user_data);
  */
 typedef void (*espp_seek_done_cb)(void *user_data);
 
+/**
+ * @brief Called when the ESPP service client handle has reached the end of stream.
+ * @param[in] user_data    The user data passed from the callback registration function
+ * @see espp_client_set_eos_cb()
+ */
+typedef void (*espp_eos_cb)(void *user_data);
+
 /**
  * @brief Called when a H/W resource of the ESPP service client handle has been conflicted.
  * @param[in] user_data    The user data passed from the callback registration function
@@ -236,6 +243,20 @@ int espp_client_set_prepare_async_done_cb(espp_h espp, espp_prepare_async_done_c
  */
 int espp_client_set_seek_done_cb(espp_h espp, espp_seek_done_cb callback, void *user_data);
 
+/**
+ * @brief Sets a callback function to be invoked when the ESPP service client handle has reached the end of stream.
+ * @param[in] espp       ESPP service client handle
+ * @param[in] callback   Callback function pointer
+ * @param[in] user_data  The user data to be passed to the callback function
+ * @return @c 0 on success,
+ *         otherwise a negative error value
+ * @retval #ESPP_CLIENT_ERROR_NONE Successful
+ * @retval #ESPP_CLIENT_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval #ESPP_CLIENT_ERROR_INVALID_OPERATION Invalid operation
+ * @post espp_eos_cb() will be invoked.
+ */
+int espp_client_set_eos_cb(espp_h espp, espp_eos_cb callback, void *user_data);
+
 /**
  * @brief Sets a callback function to be invoked when when a H/W resource of the ESPP service client handle has been conflicted.
  * @param[in] espp       ESPP service client handle

diff --git a/src/client/espp_service_client_event_handler.c b/src/client/espp_service_client_event_handler.c
index 63519591f903445d66090402f81255671309776f..0892bce5420b34377cabb2fe78ed839a064f7bad 100644 (file)
--- a/src/client/espp_service_client_event_handler.c
+++ b/src/client/espp_service_client_event_handler.c
@@ -96,8 +96,6 @@ static void __handle_event_cb_seek_done(espp_s *espp, espp_service_data_from_ser
        ASSERT(data);
        ASSERT(result);
 
-       result->ret = -1;
-
        if (espp->seek_done_cb.callback) {
                LOG_DEBUG(">>> callback[%p] user_data[%p]", espp->seek_done_cb.callback, espp->seek_done_cb.user_data);
                ((espp_seek_done_cb)(espp->seek_done_cb.callback))(espp->seek_done_cb.user_data);
@@ -107,11 +105,27 @@ static void __handle_event_cb_seek_done(espp_s *espp, espp_service_data_from_ser
        result->ret = 0;
 }
 
+static void __handle_event_cb_eos(espp_s *espp, espp_service_data_from_server_s *data, espp_service_data_from_client_s *result)
+{
+       ASSERT(espp);
+       ASSERT(data);
+       ASSERT(result);
+
+       if (espp->eos_cb.callback) {
+               LOG_DEBUG(">>> callback[%p] user_data[%p]", espp->eos_cb.callback, espp->eos_cb.user_data);
+               ((espp_eos_cb)(espp->eos_cb.callback))(espp->eos_cb.user_data);
+               LOG_DEBUG("<<< end of the callback");
+       }
+
+       result->ret = 0;
+}
+
 static func_handler handlers[] = {
        [ESPP_SERVICE_EVENT_MSG] = __handle_event_msg,
        [ESPP_SERVICE_EVENT_CB_READY_TO_PREPARE] = __handle_event_cb_ready_to_prepare,
        [ESPP_SERVICE_EVENT_CB_PREPARE_ASYNC_DONE] = __handle_event_cb_prepare_async_done,
        [ESPP_SERVICE_EVENT_CB_SEEK_DONE] = __handle_event_cb_seek_done,
+       [ESPP_SERVICE_EVENT_CB_EOS] = __handle_event_cb_eos,
 };
 
 static void __func_handler(espp_s *espp, espp_service_data_from_server_s *data, espp_service_data_from_client_s *result)

diff --git a/src/client/espp_service_client_priv.h b/src/client/espp_service_client_priv.h
index f317934650cd582dc2ff608ee21a12a16add5093..13df858a1c5b27a01b92988676f39ac65b58c470 100644 (file)
--- a/src/client/espp_service_client_priv.h
+++ b/src/client/espp_service_client_priv.h
@@ -58,6 +58,7 @@ typedef struct _espp_s {
        espp_callback_s ready_to_prepare_cb;
        espp_callback_s prepare_async_done_cb;
        espp_callback_s seek_done_cb;
+       espp_callback_s eos_cb;
        espp_callback_s resource_conflicted_cb;
 } espp_s;
 

diff --git a/src/common/espp_service_ipc.c b/src/common/espp_service_ipc.c
index e7b92f2f57608ebcb6b3f477dcf3f6b2c0989a98..0d7c73d0d4d9cbc9df41ae1f079c642f6e4546fc 100644 (file)
--- a/src/common/espp_service_ipc.c
+++ b/src/common/espp_service_ipc.c
@@ -40,6 +40,7 @@ espp_service_ipc_data_s events[] = {
        [ESPP_SERVICE_EVENT_CB_READY_TO_PREPARE] = { "ReadyToPrepareCB", "i" },
        [ESPP_SERVICE_EVENT_CB_PREPARE_ASYNC_DONE] = { "PrepareAsyncDoneCB", "b" },
        [ESPP_SERVICE_EVENT_CB_SEEK_DONE] = { "SeekDoneCB", NULL },
+       [ESPP_SERVICE_EVENT_CB_EOS] = { "EosCB", NULL },
        [ESPP_SERVICE_EVENT_CB_RESOURCE_CONFLICTED] = { "PrepareAsyncDoneCB", NULL },
 };
 

diff --git a/src/common/espp_service_ipc.h b/src/common/espp_service_ipc.h
index a4c364cdc6e357b6d91f9b4d0dd29a2ff38b0efd..675ca8cca69c2cfff9d1928e77003739e6b96608 100644 (file)
--- a/src/common/espp_service_ipc.h
+++ b/src/common/espp_service_ipc.h
@@ -49,6 +49,7 @@ typedef enum {
        ESPP_SERVICE_EVENT_CB_READY_TO_PREPARE,
        ESPP_SERVICE_EVENT_CB_PREPARE_ASYNC_DONE,
        ESPP_SERVICE_EVENT_CB_SEEK_DONE,
+       ESPP_SERVICE_EVENT_CB_EOS,
        ESPP_SERVICE_EVENT_CB_RESOURCE_CONFLICTED,
 } espp_service_event_e;
 

diff --git a/src/daemon/espp_service_handler.c b/src/daemon/espp_service_handler.c
index e2b844f4f0281e2a5e353c61b3040fd33c76facf..a70b0af3161b679016ff6c9c9c5a8b4cf755c2a9 100644 (file)
--- a/src/daemon/espp_service_handler.c
+++ b/src/daemon/espp_service_handler.c
@@ -475,6 +475,26 @@ static void __seek_done_cb(void *user_data)
        espp_service_send_data(tbs->event_fd, &data);
 }
 
+static void __eos_cb(void *user_data)
+{
+       handler_userdata_s *hdata = (handler_userdata_s *)user_data;
+       tb_data_s *tbs;
+       espp_service_data_from_server_s data;
+
+       ASSERT(hdata);
+       ASSERT(hdata->svc);
+       ASSERT(hdata->fd >= 0);
+
+       LOG_DEBUG("fd[%d], ESPP[%p]", hdata->fd, hdata->espp);
+
+       RET_IF(!(tbs = g_hash_table_lookup(hdata->svc->fd_table, hdata->key)), "failed to g_hash_table_lookup(), key[%s]", hdata->key);
+
+       LOG_DEBUG("event_fd[%d], ESPP[%p]", tbs->event_fd, tbs->espp);
+
+       FILL_SOCKET_MSG_EVENT(data, ESPP_SERVICE_EVENT_CB_EOS);
+       espp_service_send_data(tbs->event_fd, &data);
+}
+
 static void __resource_conflicted_cb(void *user_data)
 {
        handler_userdata_s *hdata = (handler_userdata_s *)user_data;
@@ -499,6 +519,7 @@ static cb_intf_s cb_setters[] = {
        [ESPP_SERVICE_EVENT_CB_READY_TO_PREPARE] = { (set_cb_func)esplusplayer_set_ready_to_prepare_cb, __ready_to_prepare_cb},
        [ESPP_SERVICE_EVENT_CB_PREPARE_ASYNC_DONE] = { (set_cb_func)esplusplayer_set_prepare_async_done_cb, __prepare_async_done_cb},
        [ESPP_SERVICE_EVENT_CB_SEEK_DONE] = { (set_cb_func)esplusplayer_set_seek_done_cb, __seek_done_cb},
+       [ESPP_SERVICE_EVENT_CB_EOS] = { (set_cb_func)esplusplayer_set_eos_cb, __eos_cb},
        [ESPP_SERVICE_EVENT_CB_RESOURCE_CONFLICTED] = { (set_cb_func)esplusplayer_set_resource_conflicted_cb, __resource_conflicted_cb},
 };