support duplicated seeking in case of media stream

Change-Id: Ia71feb4f27f52c5cca18f5c9ddc87367f70b3e69
Signed-off-by: Eunhae Choi <eunhae1.choi@samsung.com>

diff --git a/include/common/player.h b/include/common/player.h
index eadfd9326ffa7b6d3ed25f6ee6b770934c57a66a..0cb5a523c4cb4dd626aec604feaa227fbafdf6bf 100644 (file)
--- a/include/common/player.h
+++ b/include/common/player.h
@@ -748,6 +748,12 @@ int player_pause(player_h player);
 /**
  * @brief Sets the seek position for playback, asynchronously.
  * @since_tizen 2.3
+ * @remarks This api will trigger the seeking operation on player instance.
+ *          Normally application need to wait for player_seek_completed_cb() before calling it again.
+ *          Otherwise it will return PLAYER_ERROR_SEEK_FAILED.
+ *          Please note that if application is playing external media data via player_set_media_stream_info(),
+ *          then consecutive calling of this api will always success and no need to wait for player_seek_completed_cb()
+ *          before next calling of this api.(since_tizen 3.0)
  * @param[in] player The handle to the media player
  * @param[in] millisecond The position in milliseconds from the start to the seek point
  * @param[in] accurate If @c true the selected position is returned, but this might be considerably slow,

diff --git a/include/player_private.h b/include/player_private.h
index 5fc502944c9ef3e3240d4091aa634e573b5a2c47..7870e83b3d9b231fb4ebdd07bc9102a240620a0f 100644 (file)
--- a/include/player_private.h
+++ b/include/player_private.h
@@ -86,6 +86,8 @@ typedef struct _callback_cb_info {
        GCond player_cond[MUSE_PLAYER_API_MAX];
        GList *packet_list;
        GMutex packet_list_mutex;
+       gboolean block_seek_cb;
+       GMutex seek_cb_mutex;
        msg_buff_s buff;
        player_event_queue event_queue;
        media_format_h pkt_fmt;
@@ -105,6 +107,7 @@ typedef struct _player_cli_s {
        wl_client *wlclient;
        Evas_Object *eo;
        gboolean have_evas_callback;
+       gboolean push_media_stream;
 } player_cli_s;
 
 /* player callback information */

diff --git a/include/wearable/player.h b/include/wearable/player.h
index 85900a071e99f171d399a94d2654c36f552436dd..91e853ce66df129b6aad0ac08d97c6a2771c2dff 100644 (file)
--- a/include/wearable/player.h
+++ b/include/wearable/player.h
@@ -746,6 +746,12 @@ int player_pause(player_h player);
 /**
  * @brief Sets the seek position for playback, asynchronously.
  * @since_tizen 2.3.1
+ * @remarks This api will trigger the seeking operation on player instance.
+ *          Normally application need to wait for player_seek_completed_cb() before calling it again.
+ *          Otherwise it will return PLAYER_ERROR_SEEK_FAILED.
+ *          Please note that if application is playing external media data via player_set_media_stream_info(),
+ *          then consecutive calling of this api will always success and no need to wait for player_seek_completed_cb()
+ *          before next calling of this api.(since_tizen 3.0)
  * @param[in] player The handle to the media player
  * @param[in] millisecond The position in milliseconds from the start to the seek point
  * @param[in] accurate If @c true the selected position is returned, but this might be considerably slow,

diff --git a/src/player.c b/src/player.c
index 96ffe1b66f47f4698614d3eb98a21c9b9af72f80..52f74d91511170f5c58fe058aabb3350fc8befe0 100644 (file)
--- a/src/player.c
+++ b/src/player.c
@@ -480,9 +480,16 @@ static void __seek_cb_handler(callback_cb_info_s * cb_info, char *recvMsg)
 {
        muse_player_event_e ev = MUSE_PLAYER_EVENT_TYPE_SEEK;
 
-       ((player_seek_completed_cb) cb_info->user_cb[ev]) (cb_info->user_data[ev]);
-
-       set_null_user_cb(cb_info, ev);
+       g_mutex_lock(&cb_info->seek_cb_mutex);
+       if (cb_info->user_cb[ev] && cb_info->block_seek_cb == FALSE) {
+               LOGD("call seek cb");
+               ((player_seek_completed_cb) cb_info->user_cb[ev]) (cb_info->user_data[ev]);
+               set_null_user_cb(cb_info, ev);
+       }
+       else {
+               LOGW("ignored. seek cb %p, block %d", cb_info->user_cb[ev], cb_info->block_seek_cb);
+       }
+       g_mutex_unlock(&cb_info->seek_cb_mutex);
 }
 
 static void __media_packet_video_frame_cb_handler(callback_cb_info_s * cb_info, char *recvMsg)
@@ -613,12 +620,14 @@ static void __audio_frame_cb_handler(callback_cb_info_s * cb_info, char *recvMsg
        void *audio_frame = &audio;
 
        if (player_msg_get_array(audio_frame, recvMsg) && player_msg_get(size, recvMsg)) {
-               if (!player_msg_get(key, recvMsg))
+               if (!player_msg_get(key, recvMsg)) {
+                       LOGE("failed to get key from msg");
                        return;
+               }
 
                bo = tbm_bo_import(cb_info->bufmgr, key);
                if (bo == NULL) {
-                       LOGE("TBM get error : bo is NULL");
+                       LOGE("TBM get error : bo is NULL, key:%d", key);
                        goto EXIT;
                }
 
@@ -894,6 +903,29 @@ static void _player_event_queue_destroy(callback_cb_info_s * cb_info)
 
 }
 
+static void _player_event_queue_remove (player_event_queue * ev_queue, int ev)
+{
+       GList *item;
+
+       g_mutex_lock(&ev_queue->qlock);
+
+       item = g_queue_peek_head_link (ev_queue->queue);
+       while (item) {
+               GList *next = item->next;
+               _player_cb_data *cb_data = (_player_cb_data *)item->data;
+
+               if (cb_data && cb_data->int_data == ev) {
+                       LOGD ("removing '%p (ev:%d)' from event queue", cb_data, cb_data->int_data);
+                       g_free(cb_data->buf);
+                       g_free(cb_data);
+
+                       g_queue_delete_link (ev_queue->queue, item);
+               }
+               item = next;
+       }
+       g_mutex_unlock(&ev_queue->qlock);
+}
+
 static void _player_event_queue_add(player_event_queue * ev, _player_cb_data * data)
 {
        if (ev->running) {
@@ -1045,6 +1077,7 @@ static callback_cb_info_s *callback_new(gint sockfd)
                g_cond_init(&cb_info->player_cond[i]);
 
        g_mutex_init(&cb_info->packet_list_mutex);
+       g_mutex_init(&cb_info->seek_cb_mutex);
 
        buff = &cb_info->buff;
        buff->recvMsg = g_new(char, MUSE_MSG_MAX_LENGTH + 1);
@@ -1081,6 +1114,7 @@ static void callback_destroy(callback_cb_info_s * cb_info)
                g_cond_clear(&cb_info->player_cond[i]);
 
        g_mutex_clear(&cb_info->packet_list_mutex);
+       g_mutex_clear(&cb_info->seek_cb_mutex);
 
        g_free(cb_info->buff.recvMsg);
        g_free(cb_info);
@@ -1203,6 +1237,7 @@ int player_create(player_h * player)
                goto ERROR;
 
        pc->cb_info->bufmgr = tbm_bufmgr_init(-1);
+       pc->push_media_stream = FALSE;
 
        g_free(ret_buf);
        return ret;
@@ -1361,6 +1396,7 @@ int player_set_uri(player_h player, const char *uri)
        LOGD("ENTER");
 
        player_msg_send1(api, pc, ret_buf, ret, STRING, uri);
+       pc->push_media_stream = FALSE;
 
        g_free(ret_buf);
        return ret;
@@ -1405,6 +1441,7 @@ int player_set_memory_buffer(player_h player, const void *data, int size)
        }
 
        player_msg_send2(api, pc, ret_buf, ret, INT, key, INT, size);
+       pc->push_media_stream = FALSE;
 
  EXIT:
        tbm_bo_unref(bo);
@@ -1662,23 +1699,36 @@ int player_set_play_position(player_h player, int millisecond, bool accurate, pl
 
        LOGD("ENTER");
 
-       if (pc->cb_info->user_cb[MUSE_PLAYER_EVENT_TYPE_SEEK]) {
+       if ((pc->push_media_stream == FALSE) &&
+               (pc->cb_info->user_cb[MUSE_PLAYER_EVENT_TYPE_SEEK])) {
                LOGE("PLAYER_ERROR_SEEK_FAILED (0x%08x) : seeking...", PLAYER_ERROR_SEEK_FAILED);
                return PLAYER_ERROR_SEEK_FAILED;
        } else {
+               g_mutex_lock(&pc->cb_info->seek_cb_mutex);
+               if (pc->push_media_stream == TRUE) {
+                       pc->cb_info->block_seek_cb = TRUE;
+               }
                LOGI("Event type : %d, pos : %d ", MUSE_PLAYER_EVENT_TYPE_SEEK, millisecond);
                pc->cb_info->user_cb[MUSE_PLAYER_EVENT_TYPE_SEEK] = callback;
                pc->cb_info->user_data[MUSE_PLAYER_EVENT_TYPE_SEEK] = user_data;
+               g_mutex_unlock(&pc->cb_info->seek_cb_mutex);
        }
 
        player_msg_send2(api, pc, ret_buf, ret, INT, pos, INT, accurate);
 
-       if (ret != PLAYER_ERROR_NONE)
+       if (ret != PLAYER_ERROR_NONE) {
+               g_mutex_lock(&pc->cb_info->seek_cb_mutex);
                set_null_user_cb(pc->cb_info, MUSE_PLAYER_EVENT_TYPE_SEEK);
+               g_mutex_unlock(&pc->cb_info->seek_cb_mutex);
+       }
 
+       if (pc->push_media_stream == TRUE) {
+               _player_event_queue_remove(&pc->cb_info->event_queue, MUSE_PLAYER_EVENT_TYPE_SEEK);
+       }
+
+       pc->cb_info->block_seek_cb = FALSE;
        g_free(ret_buf);
        return ret;
-
 }
 
 int player_get_play_position(player_h player, int *millisecond)
@@ -3050,6 +3100,7 @@ int player_set_media_stream_info(player_h player, player_stream_type_e type, med
                player_msg_send6(api, pc, ret_buf, ret, INT, type, INT, mimetype, INT, channel, INT, samplerate, INT, avg_bps, INT, bit);
        }
        media_format_unref(format);
+       pc->push_media_stream = TRUE;
 
        g_free(ret_buf);
        return ret;