#include "mm_player_capture.h"
#include "mm_player_tracks.h"
#include "mm_player_es.h"
-#include "mm_player_sound_focus.h"
#include "mm_player_360.h"
+#include "mm_player_gst.h"
int mm_player_create(MMHandleType *player)
{
int result = MM_ERROR_PLAYER_INTERNAL;
- mm_player_t* new_player = NULL;
+ mmplayer_t *new_player = NULL;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
/* alloc player structure */
- new_player = g_malloc(sizeof(mm_player_t));
+ new_player = g_try_new0(mmplayer_t, 1);
if (!new_player) {
LOGE("Cannot allocate memory for player\n");
result = MM_ERROR_PLAYER_RESOURCE_LIMIT;
goto ERROR;
}
- memset(new_player, 0, sizeof(mm_player_t));
- /* create player lock */
- g_mutex_init(&new_player->cmd_lock);
-
- /* create player lock */
- g_mutex_init(&new_player->playback_lock);
+ /* create player lock and cond */
+ MMPLAYER_CMD_LOCK_INIT(new_player);
+ g_mutex_init(&new_player->reconfigure_lock);
+ g_cond_init(&new_player->reconfigure_cond);
/* load ini files */
if (MM_ERROR_NONE != mm_player_ini_load(&new_player->ini)) {
if (new_player) {
_mmplayer_destroy((MMHandleType)new_player);
- g_mutex_clear(&new_player->cmd_lock);
- g_mutex_clear(&new_player->playback_lock);
-
+ MMPLAYER_CMD_LOCK_DEINIT(new_player);
+ g_mutex_clear(&new_player->reconfigure_lock);
+ g_cond_clear(&new_player->reconfigure_cond);
MMPLAYER_FREEIF(new_player);
}
return result; /* MM_ERROR_PLAYER_INTERNAL or MM_ERROR_PLAYER_RESOURCE_LIMIT */
}
-int mm_player_destroy(MMHandleType player)
+int mm_player_destroy(MMHandleType player)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
+ _mmplayer_bus_watcher_remove(player);
+ /* destroy the gst bus msg thread if it is remained.
+ this funct have to be called before getting cmd lock. */
+ _mmplayer_bus_msg_thread_destroy(player);
+
MMPLAYER_CMD_LOCK(player);
result = _mmplayer_destroy(player);
MMPLAYER_CMD_UNLOCK(player);
- /* to make sure unlocked.
- @see __mmplayer_gst_callback, GST_MESSAGE_BUFFERING handling */
MMPLAYER_CMD_LOCK(player);
MMPLAYER_CMD_UNLOCK(player);
- g_mutex_clear(&((mm_player_t*)player)->cmd_lock);
- g_mutex_clear(&((mm_player_t*)player)->playback_lock);
+ MMPLAYER_CMD_LOCK_DEINIT(player);
+ g_mutex_clear(&((mmplayer_t *)player)->reconfigure_lock);
+ g_cond_clear(&((mmplayer_t *)player)->reconfigure_cond);
- memset((mm_player_t*)player, 0x00, sizeof(mm_player_t));
+ memset((mmplayer_t *)player, 0x00, sizeof(mmplayer_t));
/* free player */
- g_free((void*)player);
+ g_free((void *)player);
return result;
}
-int mm_player_sound_register(MMHandleType player, int pid)
+int mm_player_realize(MMHandleType player)
{
int result = MM_ERROR_NONE;
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_sound_register_with_pid(player, pid);
+ result = _mmplayer_realize(player);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_get_client_pid(MMHandleType player, int* pid)
+int mm_player_abort_pause(MMHandleType player)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- MMPLAYER_RETURN_VAL_IF_FAIL(pid, MM_ERROR_INVALID_ARGUMENT);
- MMPLAYER_CMD_LOCK(player);
-
- result = _mmplayer_get_client_pid(player, pid);
+ _mmplayer_bus_watcher_remove(player);
+ /* destroy the gst bus msg thread not to be blocked in pause(without cmd lock). */
+ _mmplayer_bus_msg_thread_destroy(player);
- MMPLAYER_CMD_UNLOCK(player);
-
- return result;
-}
-
-int mm_player_realize(MMHandleType player)
-{
- int result = MM_ERROR_NONE;
-
- MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
-
- MMPLAYER_CMD_LOCK(player);
-
- result = _mmplayer_realize(player);
-
- MMPLAYER_CMD_UNLOCK(player);
+ /* abort the pause operation for preparing(without cmd lock). */
+ result = _mmplayer_abort_pause(player);
return result;
}
return result;
}
-int mm_player_set_pd_message_callback(MMHandleType player, MMMessageCallback callback, void *user_param)
-{
- int result = MM_ERROR_NONE;
-
- MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
-
- result = _mm_player_set_pd_downloader_message_cb(player, callback, user_param);
-
- return result;
-}
-
-int mm_player_set_audio_stream_callback(MMHandleType player, mm_player_audio_stream_callback callback, void *user_param)
+int mm_player_set_audio_decoded_callback(MMHandleType player, mmplayer_audio_extract_opt_e opt, mm_player_audio_decoded_callback callback, void *user_param)
{
int result = MM_ERROR_NONE;
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_set_audiostream_cb(player, callback, user_param);
+ result = _mmplayer_set_audio_decoded_cb(player, opt, callback, user_param);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_set_audio_stream_callback_ex(MMHandleType player, bool sync, mm_player_audio_stream_callback_ex callback, void *user_param)
+int mm_player_set_video_decoded_callback(MMHandleType player, mm_player_video_decoded_callback callback, void *user_param)
{
int result = MM_ERROR_NONE;
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_set_audiostream_cb_ex(player, sync, callback, user_param);
-
- MMPLAYER_CMD_UNLOCK(player);
-
- return result;
-}
-
-int mm_player_set_video_stream_callback(MMHandleType player, mm_player_video_stream_callback callback, void *user_param)
-{
- int result = MM_ERROR_NONE;
-
- MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
-
- MMPLAYER_CMD_LOCK(player);
-
- result = _mmplayer_set_videostream_cb(player, callback, user_param);
+ result = _mmplayer_set_video_decoded_cb(player, callback, user_param);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_set_volume(MMHandleType player, MMPlayerVolumeType *volume)
+int mm_player_set_volume(MMHandleType player, float volume)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- MMPLAYER_RETURN_VAL_IF_FAIL(volume, MM_ERROR_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_set_volume(player, *volume);
+ result = _mmplayer_set_volume(player, volume);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_get_volume(MMHandleType player, MMPlayerVolumeType *volume)
+int mm_player_get_volume(MMHandleType player, float *volume)
{
int result = MM_ERROR_NONE;
return result;
}
-int mm_player_set_mute(MMHandleType player, int mute)
+int mm_player_set_mute(MMHandleType player, bool mute)
{
int result = MM_ERROR_NONE;
return result;
}
-int mm_player_get_mute(MMHandleType player, int *mute)
+int mm_player_get_mute(MMHandleType player, bool *mute)
{
int result = MM_ERROR_NONE;
return result;
}
-int mm_player_get_state(MMHandleType player, MMPlayerStateType *state)
+int mm_player_get_state(MMHandleType player, mmplayer_state_e *state)
{
int result = MM_ERROR_NONE;
*state = MM_PLAYER_STATE_NULL;
- result = _mmplayer_get_state(player, (int*)state);
+ result = _mmplayer_get_state(player, (int *)state);
return result;
}
/* NOTE : It does not support some use cases, eg using colorspace converter */
-int mm_player_change_videosink(MMHandleType player, MMDisplaySurfaceType display_surface_type, void *display_overlay)
+int mm_player_change_videosink(MMHandleType player, MMDisplaySurfaceType display_surface_type, int wl_surface_id)
{
int result = MM_ERROR_NONE;
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_change_videosink(player, display_surface_type, display_overlay);
+ result = _mmplayer_change_videosink(player, display_surface_type, wl_surface_id);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_activate_section_repeat(MMHandleType player, int start_pos, int end_pos)
+int mm_player_set_play_speed(MMHandleType player, float rate, bool streaming)
{
int result = MM_ERROR_NONE;
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_activate_section_repeat(player, start_pos, end_pos);
+ result = _mmplayer_set_playspeed(player, rate, streaming);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_deactivate_section_repeat(MMHandleType player)
+int mm_player_set_position(MMHandleType player, int64_t pos)
{
int result = MM_ERROR_NONE;
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_deactivate_section_repeat(player);
+ result = _mmplayer_set_position(player, pos);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_set_play_speed(MMHandleType player, float rate, bool streaming)
+int mm_player_get_position(MMHandleType player, int64_t *pos)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
+ MMPLAYER_RETURN_VAL_IF_FAIL(pos, MM_ERROR_COMMON_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_set_playspeed(player, rate, streaming);
+ result = _mmplayer_gst_get_position((mmplayer_t *)player, pos);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_set_position(MMHandleType player, MMPlayerPosFormatType format, int pos)
+int mm_player_get_duration(MMHandleType player, int64_t *dur)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
-
- if (format >= MM_PLAYER_POS_FORMAT_NUM) {
- LOGE("wrong format\n");
- return MM_ERROR_COMMON_INVALID_ARGUMENT;
- }
+ MMPLAYER_RETURN_VAL_IF_FAIL(dur, MM_ERROR_COMMON_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_set_position(player, format, pos);
+ result = _mmplayer_get_duration(player, dur);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_get_position(MMHandleType player, MMPlayerPosFormatType format, unsigned long *pos)
-{
- int result = MM_ERROR_NONE;
-
- MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- MMPLAYER_RETURN_VAL_IF_FAIL(pos, MM_ERROR_COMMON_INVALID_ARGUMENT);
-
- if (format >= MM_PLAYER_POS_FORMAT_NUM) {
- LOGE("wrong format\n");
- return MM_ERROR_COMMON_INVALID_ARGUMENT;
- }
-
- MMPLAYER_CMD_LOCK(player);
-
- result = _mmplayer_get_position(player, (int)format, pos);
-
- MMPLAYER_CMD_UNLOCK(player);
-
- return result;
-}
-int mm_player_get_buffer_position(MMHandleType player, MMPlayerPosFormatType format, unsigned long *start_pos, unsigned long *stop_pos)
+int mm_player_get_buffer_position(MMHandleType player, int *start_pos, int *end_pos)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- MMPLAYER_RETURN_VAL_IF_FAIL(start_pos && stop_pos, MM_ERROR_COMMON_INVALID_ARGUMENT);
+ MMPLAYER_RETURN_VAL_IF_FAIL(start_pos && end_pos, MM_ERROR_COMMON_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_get_buffer_position(player, (int)format, start_pos, stop_pos);
+ result = _mmplayer_get_buffer_position(player, start_pos, end_pos);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_set_external_subtitle_path(MMHandleType player, const char* path)
+int mm_player_set_external_subtitle_path(MMHandleType player, const char *path)
{
int result = MM_ERROR_NONE;
return result;
}
-int mm_player_adjust_subtitle_position(MMHandleType player, MMPlayerPosFormatType format, int pos)
+int mm_player_adjust_subtitle_position(MMHandleType player, int pos)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- if (format >= MM_PLAYER_POS_FORMAT_NUM) {
- LOGE("wrong format(%d) \n", format);
- return MM_ERROR_INVALID_ARGUMENT;
- }
-
- MMPLAYER_CMD_LOCK(player);
-
- result = _mmplayer_adjust_subtitle_postion(player, format, pos);
-
- MMPLAYER_CMD_UNLOCK(player);
-
- return result;
-}
-
-int mm_player_adjust_video_position(MMHandleType player, int offset)
-{
- int result = MM_ERROR_NONE;
- MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_adjust_video_postion(player, offset);
+ result = _mmplayer_adjust_subtitle_position(player, pos);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_get_subtitle_silent(MMHandleType player, int* silent)
+int mm_player_get_subtitle_silent(MMHandleType player, int *silent)
{
int result = MM_ERROR_NONE;
return result;
}
-int mm_player_get_attribute_info(MMHandleType player, const char *attribute_name, MMPlayerAttrsInfo *info)
+int mm_player_get_attribute_info(MMHandleType player, const char *attribute_name, mmplayer_attrs_info_t *info)
{
int result = MM_ERROR_NONE;
return result;
}
-int mm_player_get_pd_status(MMHandleType player, guint64 *current_pos, guint64 *total_size)
-{
- int result = MM_ERROR_NONE;
-
- MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- MMPLAYER_RETURN_VAL_IF_FAIL(current_pos, MM_ERROR_COMMON_INVALID_ARGUMENT);
- MMPLAYER_RETURN_VAL_IF_FAIL(total_size, MM_ERROR_COMMON_INVALID_ARGUMENT);
-
- result = _mmplayer_get_pd_downloader_status(player, current_pos, total_size);
-
- return result;
-}
-
-int mm_player_get_track_count(MMHandleType player, MMPlayerTrackType type, int *count)
+int mm_player_get_track_count(MMHandleType player, mmplayer_track_type_e type, int *count)
{
int result = MM_ERROR_NONE;
return result;
}
-int mm_player_select_track(MMHandleType player, MMPlayerTrackType type, int index)
+int mm_player_select_track(MMHandleType player, mmplayer_track_type_e type, int index)
{
int result = MM_ERROR_NONE;
return result;
}
-#ifdef _MULTI_TRACK
-int mm_player_track_add_subtitle_language(MMHandleType player, int index)
-{
- int result = MM_ERROR_NONE;
-
- MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
-
- MMPLAYER_CMD_LOCK(player);
-
- result = _mmplayer_track_add_subtitle_language(player, index);
- MMPLAYER_CMD_UNLOCK(player);
-
- return result;
-}
-
-int mm_player_track_remove_subtitle_language(MMHandleType player, int index)
-{
- int result = MM_ERROR_NONE;
-
- MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
-
- MMPLAYER_CMD_LOCK(player);
-
- result = _mmplayer_track_remove_subtitle_language(player, index);
-
- MMPLAYER_CMD_UNLOCK(player);
-
- return result;
-
-}
-#endif
-int mm_player_get_current_track(MMHandleType player, MMPlayerTrackType type, int *index)
+int mm_player_get_current_track(MMHandleType player, mmplayer_track_type_e type, int *index)
{
int result = MM_ERROR_NONE;
return result;
}
-int mm_player_get_track_language_code(MMHandleType player, MMPlayerTrackType type, int index, char **code)
+int mm_player_get_track_language_code(MMHandleType player, mmplayer_track_type_e type, int index, char **code)
{
int result = MM_ERROR_NONE;
return result;
}
-int mm_player_set_video_share_master_clock(MMHandleType player,
- long long clock,
- long long clock_delta,
- long long video_time,
- long long media_clock,
- long long audio_time)
-{
- int result = MM_ERROR_NONE;
-
- MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
-
- MMPLAYER_CMD_LOCK(player);
-
- result = _mmplayer_set_video_share_master_clock(player, clock, clock_delta, video_time, media_clock, audio_time);
-
- MMPLAYER_CMD_UNLOCK(player);
-
- return result;
-}
-
-int mm_player_get_video_share_master_clock(MMHandleType player,
- long long *video_time,
- long long *media_clock,
- long long *audio_time)
-{
- int result = MM_ERROR_NONE;
-
- MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- MMPLAYER_RETURN_VAL_IF_FAIL(video_time, MM_ERROR_COMMON_INVALID_ARGUMENT);
- MMPLAYER_RETURN_VAL_IF_FAIL(media_clock, MM_ERROR_COMMON_INVALID_ARGUMENT);
- MMPLAYER_RETURN_VAL_IF_FAIL(audio_time, MM_ERROR_COMMON_INVALID_ARGUMENT);
-
- MMPLAYER_CMD_LOCK(player);
-
- result = _mmplayer_get_video_share_master_clock(player, video_time, media_clock, audio_time);
-
- MMPLAYER_CMD_UNLOCK(player);
-
- return result;
-}
-
-int mm_player_get_video_rotate_angle(MMHandleType player, int *angle)
-{
- int result = MM_ERROR_NONE;
-
- MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- MMPLAYER_RETURN_VAL_IF_FAIL(angle, MM_ERROR_COMMON_INVALID_ARGUMENT);
-
- MMPLAYER_CMD_LOCK(player);
-
- result = _mmplayer_get_video_rotate_angle(player, angle);
-
- MMPLAYER_CMD_UNLOCK(player);
-
- return result;
-}
-
-int mm_player_set_video_hub_download_mode(MMHandleType player, bool mode)
-{
- int result = MM_ERROR_NONE;
-
- MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
-
- MMPLAYER_CMD_LOCK(player);
-
- result = _mmplayer_set_video_hub_download_mode(player, mode);
-
- MMPLAYER_CMD_UNLOCK(player);
-
- return result;
-}
-
-int mm_player_enable_sync_handler(MMHandleType player, bool enable)
-{
- int result = MM_ERROR_NONE;
-
- MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
-
- MMPLAYER_CMD_LOCK(player);
-
- result = _mmplayer_enable_sync_handler(player, enable);
-
- MMPLAYER_CMD_UNLOCK(player);
-
- return result;
-}
-
int mm_player_set_uri(MMHandleType player, const char *uri)
{
int result = MM_ERROR_NONE;
return result;
}
-#ifdef _MULTI_TRACK
-int mm_player_track_foreach_selected_subtitle_language(MMHandleType player, mm_player_track_selected_subtitle_language_callback callback, void *user_param)
-{
- int result = MM_ERROR_NONE;
-
- MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
-
- MMPLAYER_CMD_LOCK(player);
-
- result = _mmplayer_track_foreach_selected_subtitle_language(player, callback, user_param);
-
- MMPLAYER_CMD_UNLOCK(player);
-
- return result;
-}
-#endif
int mm_player_has_closed_caption(MMHandleType player, bool *exist)
{
return result;
}
-void * mm_player_media_packet_video_stream_internal_buffer_ref(void *buffer)
+void mm_player_video_stream_internal_buffer_unref(void *buffer)
{
- void * result;
- result = _mm_player_media_packet_video_stream_internal_buffer_ref(buffer);
-
- return result;
-}
-
-void mm_player_media_packet_video_stream_internal_buffer_unref(void *buffer)
-{
- _mm_player_media_packet_video_stream_internal_buffer_unref(buffer);
+ _mm_player_video_stream_internal_buffer_unref(buffer);
}
int mm_player_submit_packet(MMHandleType player, media_packet_h packet)
return result;
}
-int mm_player_set_subtitle_info(MMHandleType player, MMPlayerSubtitleStreamInfo *subtitle_stream_info)
+int mm_player_set_subtitle_info(MMHandleType player, mmplayer_subtitle_stream_info_t *subtitle_stream_info)
{
int result = MM_ERROR_NONE;
return result;
}
-int mm_player_set_media_stream_buffer_max_size(MMHandleType player, MMPlayerStreamType type, unsigned long long max_size)
+int mm_player_set_media_stream_buffer_max_size(MMHandleType player, mmplayer_stream_type_e type, unsigned long long max_size)
{
int result = MM_ERROR_NONE;
return result;
}
-int mm_player_get_media_stream_buffer_max_size(MMHandleType player, MMPlayerStreamType type, unsigned long long *max_size)
+int mm_player_get_media_stream_buffer_max_size(MMHandleType player, mmplayer_stream_type_e type, unsigned long long *max_size)
{
int result = MM_ERROR_NONE;
guint64 _max_size = 0;
return result;
}
-int mm_player_set_media_stream_buffer_min_percent(MMHandleType player, MMPlayerStreamType type, unsigned min_percent)
+int mm_player_set_media_stream_buffer_min_percent(MMHandleType player, mmplayer_stream_type_e type, unsigned min_percent)
{
int result = MM_ERROR_NONE;
return result;
}
-int mm_player_get_media_stream_buffer_min_percent(MMHandleType player, MMPlayerStreamType type, unsigned int *min_percent)
+int mm_player_get_media_stream_buffer_min_percent(MMHandleType player, mmplayer_stream_type_e type, unsigned int *min_percent)
{
int result = MM_ERROR_NONE;
return result;
}
-int mm_player_set_media_stream_buffer_status_callback(MMHandleType player, MMPlayerStreamType type, mm_player_media_stream_buffer_status_callback callback, void * user_param)
+int mm_player_set_audio_stream_changed_callback(MMHandleType player, mm_player_stream_changed_callback callback, void *user_param)
{
int result = MM_ERROR_NONE;
- LOGD("\n");
-
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_set_media_stream_buffer_status_cb(player, type, callback, user_param);
+ result = _mmplayer_set_audiostream_changed_cb(player, callback, user_param);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_set_media_stream_seek_data_callback(MMHandleType player, MMPlayerStreamType type, mm_player_media_stream_seek_data_callback callback, void * user_param)
+int mm_player_get_timeout(MMHandleType player, int *timeout)
{
int result = MM_ERROR_NONE;
- LOGD("\n");
-
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
+ MMPLAYER_RETURN_VAL_IF_FAIL(timeout, MM_ERROR_COMMON_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_set_media_stream_seek_data_cb(player, type, callback, user_param);
+ result = _mmplayer_get_timeout(player, timeout);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_set_audio_stream_changed_callback(MMHandleType player, mm_player_stream_changed_callback callback, void *user_param)
+int mm_player_set_media_stream_dynamic_resolution(MMHandleType player, bool drc)
{
int result = MM_ERROR_NONE;
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_set_audiostream_changed_cb(player, callback, user_param);
+ result = _mmplayer_set_media_stream_dynamic_resolution(player, drc);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_set_video_stream_changed_callback(MMHandleType player, mm_player_stream_changed_callback callback, void *user_param)
+int mm_player_release_video_stream_bo(MMHandleType player, void *bo)
+{
+ int result = MM_ERROR_NONE;
+
+ MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
+ MMPLAYER_RETURN_VAL_IF_FAIL(bo, MM_ERROR_COMMON_INVALID_ARGUMENT);
+
+ //MMPLAYER_CMD_LOCK(player);
+
+ result = _mmplayer_video_stream_release_bo(player, bo);
+
+ //MMPLAYER_CMD_UNLOCK(player);
+
+ return result;
+}
+
+int mm_player_set_sound_stream_info(MMHandleType player, char *stream_type, int stream_index)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
+ MMPLAYER_RETURN_VAL_IF_FAIL((stream_type && (stream_index >= 0)), MM_ERROR_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_set_videostream_changed_cb(player, callback, user_param);
+ result = mm_player_set_attribute(player, NULL, "sound_stream_type", stream_type, strlen(stream_type), "sound_stream_index", stream_index, NULL);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_set_pcm_spec(MMHandleType player, int samplerate, int channel)
+int mm_player_manage_external_storage_state(MMHandleType player, int id, int state)
{
int result = MM_ERROR_NONE;
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_set_pcm_spec(player, samplerate, channel);
+ result = _mmplayer_manage_external_storage_state(player, id, state);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_get_timeout(MMHandleType player, int *timeout)
+int mm_player_get_adaptive_variant_info(MMHandleType player, int *num, char **var_info)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- MMPLAYER_RETURN_VAL_IF_FAIL(timeout, MM_ERROR_COMMON_INVALID_ARGUMENT);
+ MMPLAYER_RETURN_VAL_IF_FAIL(num && var_info, MM_ERROR_COMMON_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_get_timeout(player, timeout);
+ result = _mmplayer_get_adaptive_variant_info(player, num, var_info);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_get_num_of_video_out_buffers(MMHandleType player, int *num, int *extra_num)
+int mm_player_set_max_adaptive_variant_limit(MMHandleType player, int bandwidth, int width, int height)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- MMPLAYER_RETURN_VAL_IF_FAIL(num && extra_num, MM_ERROR_COMMON_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_get_num_of_video_out_buffers(player, num, extra_num);
+ result = _mmplayer_set_max_adaptive_variant_limit(player, bandwidth, width, height);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_set_media_stream_dynamic_resolution(MMHandleType player, bool drc)
+int mm_player_get_max_adaptive_variant_limit(MMHandleType player, int *bandwidth, int *width, int *height)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
+ MMPLAYER_RETURN_VAL_IF_FAIL(bandwidth && width && height, MM_ERROR_COMMON_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_set_media_stream_dynamic_resolution(player, drc);
+ result = _mmplayer_get_max_adaptive_variant_limit(player, bandwidth, width, height);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_release_video_stream_bo(MMHandleType player, void* bo)
+int mm_player_get_streaming_buffering_time(MMHandleType player, int *prebuffer_ms, int *rebuffer_ms)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- MMPLAYER_RETURN_VAL_IF_FAIL(bo, MM_ERROR_COMMON_INVALID_ARGUMENT);
+ MMPLAYER_RETURN_VAL_IF_FAIL(prebuffer_ms && rebuffer_ms, MM_ERROR_INVALID_ARGUMENT);
- //MMPLAYER_CMD_LOCK(player);
+ MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_video_stream_release_bo(player, bo);
+ result = _mmplayer_get_streaming_buffering_time(player, prebuffer_ms, rebuffer_ms);
- //MMPLAYER_CMD_UNLOCK(player);
+ MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_set_file_buffering_path(MMHandleType player, const char *file_path)
+int mm_player_set_audio_only(MMHandleType player, bool audio_only)
{
int result = MM_ERROR_NONE;
-
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_set_file_buffering_path(player, file_path);
+ result = _mmplayer_set_audio_only(player, audio_only);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_set_sound_stream_info(MMHandleType player, char *stream_type, int stream_index)
+int mm_player_360_is_content_spherical(MMHandleType player, bool *is_spherical)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- MMPLAYER_RETURN_VAL_IF_FAIL((stream_type && (stream_index >= 0)), MM_ERROR_INVALID_ARGUMENT);
+ MMPLAYER_RETURN_VAL_IF_FAIL(is_spherical, MM_ERROR_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
- _mmplayer_sound_unregister(&((mm_player_t*)player)->sound_focus);
- result = mm_player_set_attribute(player, NULL, "sound_stream_type", stream_type, strlen(stream_type), "sound_stream_index", stream_index, NULL);
+ result = _mmplayer_360_is_content_spherical(player, is_spherical);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_manage_external_storage_state(MMHandleType player, int state)
+int mm_player_360_set_enabled(MMHandleType player, bool enabled)
{
int result = MM_ERROR_NONE;
-
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_manage_external_storage_state(player, state);
+ result = _mmplayer_360_set_enabled(player, enabled);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_get_adaptive_variant_info(MMHandleType player, int *num, char **var_info)
+int mm_player_360_is_enabled(MMHandleType player, bool *enabled)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- MMPLAYER_RETURN_VAL_IF_FAIL(num && var_info, MM_ERROR_COMMON_INVALID_ARGUMENT);
+ MMPLAYER_RETURN_VAL_IF_FAIL(enabled, MM_ERROR_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_get_adaptive_variant_info(player, num, var_info);
+ result = _mmplayer_360_is_enabled(player, enabled);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_set_max_adaptive_variant_limit(MMHandleType player, int bandwidth, int width, int height)
+int mm_player_360_set_direction_of_view(MMHandleType player, float yaw, float pitch)
{
int result = MM_ERROR_NONE;
-
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_set_max_adaptive_variant_limit(player, bandwidth, width, height);
+ result = _mmplayer_360_set_direction_of_view(player, yaw, pitch);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_get_max_adaptive_variant_limit(MMHandleType player, int *bandwidth, int *width, int *height)
+int mm_player_360_get_direction_of_view(MMHandleType player, float *yaw, float *pitch)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- MMPLAYER_RETURN_VAL_IF_FAIL(bandwidth && width && height, MM_ERROR_COMMON_INVALID_ARGUMENT);
+ MMPLAYER_RETURN_VAL_IF_FAIL(yaw && pitch, MM_ERROR_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_get_max_adaptive_variant_limit(player, bandwidth, width, height);
+ result = _mmplayer_360_get_direction_of_view(player, yaw, pitch);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_set_streaming_buffering_time(MMHandleType player, int buffer_ms, int rebuffer_ms)
+int mm_player_360_set_zoom(MMHandleType player, float level)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_set_streaming_buffering_time(player, buffer_ms, rebuffer_ms);
+ result = _mmplayer_360_set_zoom(player, level);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_get_streaming_buffering_time(MMHandleType player, int *buffer_ms, int *rebuffer_ms)
+int mm_player_360_get_zoom(MMHandleType player, float *level)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- MMPLAYER_RETURN_VAL_IF_FAIL(buffer_ms && rebuffer_ms, MM_ERROR_INVALID_ARGUMENT);
+ MMPLAYER_RETURN_VAL_IF_FAIL(level, MM_ERROR_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_get_streaming_buffering_time(player, buffer_ms, rebuffer_ms);
+ result = _mmplayer_360_get_zoom(player, level);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_set_audio_only(MMHandleType player, bool audio_only)
+int mm_player_360_set_field_of_view(MMHandleType player, int horizontal_degrees, int vertical_degrees)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_set_audio_only(player, audio_only);
+ result = _mmplayer_360_set_field_of_view(player, horizontal_degrees, vertical_degrees);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_get_audio_only(MMHandleType player, bool *audio_only)
+int mm_player_360_get_field_of_view(MMHandleType player, int *horizontal_degrees, int *vertical_degrees)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- MMPLAYER_RETURN_VAL_IF_FAIL(audio_only, MM_ERROR_INVALID_ARGUMENT);
+ MMPLAYER_RETURN_VAL_IF_FAIL(horizontal_degrees && vertical_degrees, MM_ERROR_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_get_audio_only(player, audio_only);
+ result = _mmplayer_360_get_field_of_view(player, horizontal_degrees, vertical_degrees);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_360_set_enable(MMHandleType player, bool enable)
+int mm_player_set_codec_type(MMHandleType player, mmplayer_stream_type_e stream_type, mmplayer_codec_type_e codec_type)
{
int result = MM_ERROR_NONE;
+
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_360_set_enable(player, enable);
+ result = _mmplayer_set_codec_type(player, stream_type, codec_type);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_360_is_enabled(MMHandleType player, bool *enabled)
+int mm_player_set_replaygain_enabled(MMHandleType player, bool enabled)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- MMPLAYER_RETURN_VAL_IF_FAIL(enabled, MM_ERROR_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_360_is_enabled(player, enabled);
+ result = _mmplayer_set_replaygain_enabled(player, enabled);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_360_set_direction_of_view(MMHandleType player, float yaw, float pitch)
+int mm_player_is_replaygain_enabled(MMHandleType player, bool *enabled)
{
int result = MM_ERROR_NONE;
+
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
+ MMPLAYER_RETURN_VAL_IF_FAIL(enabled, MM_ERROR_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_360_set_direction_of_view(player, yaw, pitch);
+ result = _mmplayer_is_replaygain_enabled(player, enabled);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_360_get_direction_of_view(MMHandleType player, float *yaw, float *pitch)
+int mm_player_set_video_roi_area(MMHandleType player, double scale_x, double scale_y, double scale_width, double scale_height)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- MMPLAYER_RETURN_VAL_IF_FAIL(yaw && pitch, MM_ERROR_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_360_get_direction_of_view(player, yaw, pitch);
+ result = _mmplayer_set_video_roi_area(player, scale_x, scale_y, scale_width, scale_height);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_360_set_zoom(MMHandleType player, float level)
+int mm_player_get_video_roi_area(MMHandleType player, double *scale_x, double *scale_y, double *scale_width, double *scale_height)
{
int result = MM_ERROR_NONE;
+
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_360_set_zoom(player, level);
+ result = _mmplayer_get_video_roi_area(player, scale_x, scale_y, scale_width, scale_height);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_360_get_zoom(MMHandleType player, float *level)
+int mm_player_set_client_pid(MMHandleType player, int pid)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- MMPLAYER_RETURN_VAL_IF_FAIL(level, MM_ERROR_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_360_get_zoom(player, level);
+ result = _mmplayer_set_client_pid(player, pid);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_360_set_field_of_view(MMHandleType player, int horizontal_degrees, int vertical_degrees)
+int mm_player_audio_offload_is_activated(MMHandleType player, bool *activated)
{
int result = MM_ERROR_NONE;
+
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
+ MMPLAYER_RETURN_VAL_IF_FAIL(activated, MM_ERROR_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
- result = _mmplayer_360_set_field_of_view(player, horizontal_degrees, vertical_degrees);
+ result = _mmplayer_audio_offload_is_activated(player, activated);
MMPLAYER_CMD_UNLOCK(player);
return result;
}
-int mm_player_360_get_field_of_view(MMHandleType player, int *horizontal_degrees, int *vertical_degrees)
+int mm_player_is_audio_control_available(MMHandleType player, mmplayer_audio_control_opt_e opt, bool *available)
{
int result = MM_ERROR_NONE;
MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
- MMPLAYER_RETURN_VAL_IF_FAIL(horizontal_degrees && vertical_degrees, MM_ERROR_INVALID_ARGUMENT);
+ MMPLAYER_RETURN_VAL_IF_FAIL(available, MM_ERROR_INVALID_ARGUMENT);
MMPLAYER_CMD_LOCK(player);
-
- result = _mmplayer_360_get_field_of_view(player, horizontal_degrees, vertical_degrees);
-
+ result = _mmplayer_is_audio_control_available(player, opt, available);
MMPLAYER_CMD_UNLOCK(player);
return result;
projects / platform / core / multimedia / libmm-player.git / blobdiff