[0.6.50] devide the user_data for each cb

Change-Id: I2e44e5c09dc0b186bce38ed6a6881caf3af90b45

diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec
index 77c3076..f91dd7c 100644 (file)
--- a/packaging/libmm-player.spec
+++ b/packaging/libmm-player.spec
@@ -1,6 +1,6 @@
 Name:       libmm-player
 Summary:    Multimedia Framework Player Library
-Version:    0.6.49
+Version:    0.6.50
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/include/mm_player_priv.h b/src/include/mm_player_priv.h
index e4996b9..e7d074c 100644 (file)
--- a/src/include/mm_player_priv.h
+++ b/src/include/mm_player_priv.h
@@ -530,7 +530,8 @@ typedef struct {
        int video_num_buffers;  /* total num of buffers in vcodec */
        int video_extra_num_buffers; /* extra num of buffers in vcodec */
 
-       void* buffer_cb_user_param;
+       void* buffer_cb_user_param[MM_PLAYER_STREAM_TYPE_MAX];
+       void* seek_cb_user_param[MM_PLAYER_STREAM_TYPE_MAX];
 
        /* video stream changed callback */
        mm_player_stream_changed_callback video_stream_changed_cb;

diff --git a/src/mm_player_es.c b/src/mm_player_es.c
index bca7649..a6f2b7b 100644 (file)
--- a/src/mm_player_es.c
+++ b/src/mm_player_es.c
@@ -208,7 +208,7 @@ _mmplayer_set_media_stream_buffer_status_cb(MMHandleType hplayer,
        }
 
        player->media_stream_buffer_status_cb[type] = callback;
-       player->buffer_cb_user_param = user_param;
+       player->buffer_cb_user_param[type] = user_param;
 
        LOGD("player handle %p, type %d, callback %p\n", player, type,
                player->media_stream_buffer_status_cb[type]);
@@ -243,7 +243,7 @@ _mmplayer_set_media_stream_seek_data_cb(MMHandleType hplayer,
        }
 
        player->media_stream_seek_data_cb[type] = callback;
-       player->buffer_cb_user_param = user_param;
+       player->seek_cb_user_param[type] = user_param;
 
        LOGD("player handle %p, type %d, callback %p\n", player, type,
                player->media_stream_seek_data_cb[type]);
@@ -419,7 +419,7 @@ __mmplayer_check_buffer_level(mm_player_t *player, GstElement* element, MMPlayer
                                        current_level_bytes);
 
                if (current_level_per < player->media_stream_buffer_min_percent[type])
-                       player->media_stream_buffer_status_cb[type](type, MM_PLAYER_MEDIA_STREAM_BUFFER_UNDERRUN, current_level_bytes, player->buffer_cb_user_param);
+                       player->media_stream_buffer_status_cb[type](type, MM_PLAYER_MEDIA_STREAM_BUFFER_UNDERRUN, current_level_bytes, player->buffer_cb_user_param[type]);
 
                MMPLAYER_MEDIA_STREAM_CALLBACK_UNLOCK(player);
        }

diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c
index f256403..0a38a97 100644 (file)
--- a/src/mm_player_priv.c
+++ b/src/mm_player_priv.c
@@ -12240,6 +12240,8 @@ __mmplayer_release_misc(mm_player_t* player)
        for (i = 0; i < MM_PLAYER_STREAM_TYPE_MAX; i++) {
                player->media_stream_buffer_status_cb[i] = NULL;
                player->media_stream_seek_data_cb[i] = NULL;
+               player->buffer_cb_user_param[i] = NULL;
+               player->seek_cb_user_param[i] = NULL;
        }
        MMPLAYER_MEDIA_STREAM_CALLBACK_UNLOCK(player);
 
@@ -14926,7 +14928,7 @@ __gst_appsrc_feed_audio_data(GstElement *element, guint size, gpointer user_data
        MMPLAYER_MEDIA_STREAM_CALLBACK_LOCK(player);
 
        if (player->media_stream_buffer_status_cb[type])
-               player->media_stream_buffer_status_cb[type](type, MM_PLAYER_MEDIA_STREAM_BUFFER_UNDERRUN, current_level_bytes, player->buffer_cb_user_param);
+               player->media_stream_buffer_status_cb[type](type, MM_PLAYER_MEDIA_STREAM_BUFFER_UNDERRUN, current_level_bytes, player->buffer_cb_user_param[type]);
        MMPLAYER_MEDIA_STREAM_CALLBACK_UNLOCK(player);
 
 }
@@ -14946,7 +14948,7 @@ __gst_appsrc_feed_video_data(GstElement *element, guint size, gpointer user_data
 
        MMPLAYER_MEDIA_STREAM_CALLBACK_LOCK(player);
        if (player->media_stream_buffer_status_cb[type])
-               player->media_stream_buffer_status_cb[type](type, MM_PLAYER_MEDIA_STREAM_BUFFER_UNDERRUN, current_level_bytes, player->buffer_cb_user_param);
+               player->media_stream_buffer_status_cb[type](type, MM_PLAYER_MEDIA_STREAM_BUFFER_UNDERRUN, current_level_bytes, player->buffer_cb_user_param[type]);
        MMPLAYER_MEDIA_STREAM_CALLBACK_UNLOCK(player);
 }
 
@@ -14965,7 +14967,7 @@ __gst_appsrc_feed_subtitle_data(GstElement *element, guint size, gpointer user_d
 
        MMPLAYER_MEDIA_STREAM_CALLBACK_LOCK(player);
        if (player->media_stream_buffer_status_cb[type])
-               player->media_stream_buffer_status_cb[type](type, MM_PLAYER_MEDIA_STREAM_BUFFER_UNDERRUN, current_level_bytes, player->buffer_cb_user_param);
+               player->media_stream_buffer_status_cb[type](type, MM_PLAYER_MEDIA_STREAM_BUFFER_UNDERRUN, current_level_bytes, player->buffer_cb_user_param[type]);
 
        MMPLAYER_MEDIA_STREAM_CALLBACK_UNLOCK(player);
 }
@@ -14986,7 +14988,7 @@ __gst_appsrc_enough_audio_data(GstElement *element, gpointer user_data)
        MMPLAYER_MEDIA_STREAM_CALLBACK_LOCK(player);
 
        if (player->media_stream_buffer_status_cb[type])
-               player->media_stream_buffer_status_cb[type](type, MM_PLAYER_MEDIA_STREAM_BUFFER_OVERFLOW, current_level_bytes, player->buffer_cb_user_param);
+               player->media_stream_buffer_status_cb[type](type, MM_PLAYER_MEDIA_STREAM_BUFFER_OVERFLOW, current_level_bytes, player->buffer_cb_user_param[type]);
 
        MMPLAYER_MEDIA_STREAM_CALLBACK_UNLOCK(player);
 }
@@ -15006,7 +15008,7 @@ __gst_appsrc_enough_video_data(GstElement *element, gpointer user_data)
 
        MMPLAYER_MEDIA_STREAM_CALLBACK_LOCK(player);
        if (player->media_stream_buffer_status_cb[type])
-               player->media_stream_buffer_status_cb[type](type, MM_PLAYER_MEDIA_STREAM_BUFFER_OVERFLOW, current_level_bytes, player->buffer_cb_user_param);
+               player->media_stream_buffer_status_cb[type](type, MM_PLAYER_MEDIA_STREAM_BUFFER_OVERFLOW, current_level_bytes, player->buffer_cb_user_param[type]);
 
        MMPLAYER_MEDIA_STREAM_CALLBACK_UNLOCK(player);
 }
@@ -15023,7 +15025,7 @@ __gst_seek_audio_data(GstElement * appsrc, guint64 position, gpointer user_data)
        MMPLAYER_MEDIA_STREAM_CALLBACK_LOCK(player);
 
        if (player->media_stream_seek_data_cb[type])
-               player->media_stream_seek_data_cb[type](type, position, player->buffer_cb_user_param);
+               player->media_stream_seek_data_cb[type](type, position, player->seek_cb_user_param[type]);
        MMPLAYER_MEDIA_STREAM_CALLBACK_UNLOCK(player);
 
        return TRUE;
@@ -15040,7 +15042,7 @@ __gst_seek_video_data(GstElement * appsrc, guint64 position, gpointer user_data)
        LOGD("app-src: seek video data %llu\n", position);
        MMPLAYER_MEDIA_STREAM_CALLBACK_LOCK(player);
        if (player->media_stream_seek_data_cb[type])
-               player->media_stream_seek_data_cb[type](type, position, player->buffer_cb_user_param);
+               player->media_stream_seek_data_cb[type](type, position, player->seek_cb_user_param[type]);
        MMPLAYER_MEDIA_STREAM_CALLBACK_UNLOCK(player);
 
        return TRUE;
@@ -15058,7 +15060,7 @@ __gst_seek_subtitle_data(GstElement * appsrc, guint64 position, gpointer user_da
        MMPLAYER_MEDIA_STREAM_CALLBACK_LOCK(player);
 
        if (player->media_stream_seek_data_cb[type])
-               player->media_stream_seek_data_cb[type](type, position, player->buffer_cb_user_param);
+               player->media_stream_seek_data_cb[type](type, position, player->seek_cb_user_param[type]);
        MMPLAYER_MEDIA_STREAM_CALLBACK_UNLOCK(player);
 
        return TRUE;