From: Eunhye Choi Date: Tue, 25 Mar 2025 10:46:47 +0000 (+0900) Subject: [1.0.2] remove event - MUSE_PLAYER_EVENT_TYPE_STATE_CHANGED X-Git-Tag: accepted/tizen/unified/20250327.154215~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4de82157f8dbf363d0006b2684b4a8d0cb15ae4c;p=platform%2Fcore%2Fmultimedia%2Fmmsvc-player.git [1.0.2] remove event - MUSE_PLAYER_EVENT_TYPE_STATE_CHANGED - remove event which is not used anymore - revert de25be443c773f85ddc5024ec3a05e55dcdadebb Change-Id: I42fd8c2f65d302d626f0ade1f5e90f0a25a06d61 --- diff --git a/legacy/include/legacy_player.h b/legacy/include/legacy_player.h index 4639770..5c111e7 100644 --- a/legacy/include/legacy_player.h +++ b/legacy/include/legacy_player.h @@ -216,7 +216,6 @@ typedef enum { LEGACY_PLAYER_CALLBACK_TYPE_RETURN_BUFFER, LEGACY_PLAYER_CALLBACK_TYPE_SERVICE_DISCONNECTED, LEGACY_PLAYER_CALLBACK_TYPE_INTERRUPT_STARTED, - LEGACY_PLAYER_CALLBACK_TYPE_STATE_CHANGED, LEGACY_PLAYER_CALLBACK_TYPE_NUM } legacy_player_callback_type_e; @@ -283,11 +282,6 @@ typedef void (*legacy_player_media_stream_seek_cb)(legacy_player_callback_type_e */ typedef void (*legacy_player_video_stream_changed_cb)(int width, int height, int fps, int bit_rate, void *user_data); -/** - * @brief Called when the media player is state changed(actually unrealized now). - */ -typedef void (*legacy_player_state_changed_cb)(int state_previous, int state_current, void *user_data); - /** * @brief Creates a player handle for playing multimedia content. * @since_tizen 2.3 diff --git a/legacy/src/legacy_player.c b/legacy/src/legacy_player.c index 74da843..91efb67 100644 --- a/legacy/src/legacy_player.c +++ b/legacy/src/legacy_player.c @@ -311,7 +311,7 @@ static void __lplayer_buffer_status_callback(legacy_player_t *handle, MMMessageP /* check internal api callback */ L_PLAYER_USER_CB_LOCK(handle, event_type_internal); if (handle->user_cb[event_type_internal]) { - LOGD("event type %d, status %d, bytes %llu", event_type_internal, buffer_status, buffer_bytes); + LOGD("event type %d, status %d, bytes %"PRIu64, event_type_internal, buffer_status, buffer_bytes); ((legacy_player_media_stream_buffer_status_cb_ex)handle->user_cb[event_type_internal]) \ (event_type_internal, buffer_status, buffer_bytes, handle->user_data[event_type_internal]); } @@ -401,14 +401,6 @@ static int __lplayer_message_callback(int message, void *param, void *user_data) handle->user_data[LEGACY_PLAYER_CALLBACK_TYPE_PREPARE] = NULL; } L_PLAYER_USER_CB_UNLOCK(handle, LEGACY_PLAYER_CALLBACK_TYPE_PREPARE); - } else if (msg->state.previous > MM_PLAYER_STATE_NULL && msg->state.current == MM_PLAYER_STATE_NULL) { - LOGI("Unrealized!"); - if (handle->user_cb[LEGACY_PLAYER_CALLBACK_TYPE_STATE_CHANGED]) { - ((legacy_player_state_changed_cb)handle->user_cb[LEGACY_PLAYER_CALLBACK_TYPE_STATE_CHANGED])( - __lplayer_convert_state(msg->state.previous), - __lplayer_convert_state(msg->state.current), - handle->user_data[LEGACY_PLAYER_CALLBACK_TYPE_STATE_CHANGED]); - } } break; case MM_MESSAGE_BEGIN_OF_STREAM: /* 0x104 */ diff --git a/muse/include/muse_player.h b/muse/include/muse_player.h index 04ed50c..7d4a260 100644 --- a/muse/include/muse_player.h +++ b/muse/include/muse_player.h @@ -84,7 +84,6 @@ typedef enum { MUSE_PLAYER_EVENT_TYPE_RETURN_BUFFER, MUSE_PLAYER_EVENT_TYPE_SERVICE_DISCONNECTED, MUSE_PLAYER_EVENT_TYPE_INTERRUPT_STARTED, - MUSE_PLAYER_EVENT_TYPE_STATE_CHANGED, MUSE_PLAYER_EVENT_TYPE_NUM } muse_player_event_e; diff --git a/muse/src/muse_player.c b/muse/src/muse_player.c index bdc1ca7..18d8cdb 100644 --- a/muse/src/muse_player.c +++ b/muse/src/muse_player.c @@ -828,19 +828,6 @@ static void __mmplayer_flush_buffer(muse_player_event_e ev, muse_module_h module __mplayer_remove_export_media_packet(module); } -static void __mmplayer_state_changed_cb(int state_previous, int state_current, void *user_data) -{ - muse_player_cb_e api = MUSE_PLAYER_CB_EVENT; - muse_player_event_e ev = MUSE_PLAYER_EVENT_TYPE_STATE_CHANGED; - muse_module_h module = (muse_module_h)user_data; - - LOGD("ENTER state %d -> %d", state_previous, state_current); - - PLAYER_SEND_EVENT_MSG(api, ev, module, - MUSE_TYPE_INT, "previous", state_previous, - MUSE_TYPE_INT, "current", state_current); -} - static void __mplayer_error_cb(int code, void *user_data) { muse_player_cb_e api = MUSE_PLAYER_CB_EVENT; @@ -913,7 +900,6 @@ static void *__mplayer_callback_function[MUSE_PLAYER_EVENT_TYPE_NUM] = { __mplayer_default_callback, /* MUSE_PLAYER_EVENT_TYPE_RETURN_BUFFER */ NULL, /* MUSE_PLAYER_EVENT_TYPE_SERVICE_DISCONNECTED */ __mmplayer_flush_buffer, /* MUSE_PLAYER_EVENT_TYPE_INTERRUPT_STARTED */ - __mmplayer_state_changed_cb /* MUSE_PLAYER_EVENT_TYPE_STATE_CHANGED */ }; static int __mplayer_set_callback_func(muse_player_handle_t *muse_player, muse_player_event_e type, bool set, void *user_data) @@ -966,8 +952,8 @@ static int __mplayer_push_media_stream(muse_player_handle_t *muse_player, player int width = 0; int height = 0; if (!muse_player->video_format) { - media_format_create(&muse_player->video_format); - if (!muse_player->video_format) { + ret = media_format_create(&muse_player->video_format); + if (ret != MEDIA_FORMAT_ERROR_NONE) { LOGE("fail to create media format"); return PLAYER_ERROR_INVALID_PARAMETER; } @@ -988,8 +974,8 @@ static int __mplayer_push_media_stream(muse_player_handle_t *muse_player, player int channel = 0; int samplerate = 0; if (!muse_player->audio_format) { - media_format_create(&muse_player->audio_format); - if (!muse_player->audio_format) { + ret = media_format_create(&muse_player->audio_format); + if (ret != MEDIA_FORMAT_ERROR_NONE) { LOGE("fail to create media format"); return PLAYER_ERROR_INVALID_PARAMETER; } @@ -1257,12 +1243,6 @@ int player_disp_create(muse_module_h module) if (ret != PLAYER_ERROR_NONE) goto ERROR; - if (legacy_player_set_callback(muse_player->player_handle, - MUSE_PLAYER_EVENT_TYPE_STATE_CHANGED, - __mplayer_callback_function[MUSE_PLAYER_EVENT_TYPE_STATE_CHANGED], - (void *)module) != PLAYER_ERROR_NONE) - LOGW("failed to set state changed callback"); - muse_player->total_size_of_buffers = DEFAULT_VDEC_TOTAL_SIZE_OF_BUFFER; muse_player->extra_size_of_buffers = DEFAULT_VDEC_EXTRA_SIZE_OF_BUFFER; g_mutex_init(&muse_player->list_lock); diff --git a/packaging/mmsvc-player.spec b/packaging/mmsvc-player.spec index bdce89f..32b8522 100644 --- a/packaging/mmsvc-player.spec +++ b/packaging/mmsvc-player.spec @@ -1,6 +1,6 @@ Name: mmsvc-player Summary: A Media Player module for muse server -Version: 1.0.1 +Version: 1.0.2 Release: 0 Group: Multimedia/Libraries License: Apache-2.0