X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmm_player.c;h=e572e20fc83bc45945ec1c3170e72cc43746c920;hb=f5832892c46104e1fa39eb03732f45b53c9346f7;hp=3d19cc3ae6bc58d9d2eb4929d12870ac330d37f3;hpb=39da3bf7f4daef44c98027a22052c79064b2a81d;p=platform%2Fcore%2Fmultimedia%2Flibmm-player.git

diff --git a/src/mm_player.c b/src/mm_player.c
index 3d19cc3..e572e20 100644
--- a/src/mm_player.c
+++ b/src/mm_player.c
@@ -36,27 +36,27 @@
 #include "mm_player_tracks.h"
 #include "mm_player_es.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_try_new0(mm_player_t, 1);
+	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;
 	}
 
-	/* create player cmd lock */
-	g_mutex_init(&new_player->cmd_lock);
-
-	/* create player playback 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)) {
@@ -86,9 +86,9 @@ ERROR:
 
 	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);
 	}
 
@@ -102,9 +102,10 @@ int mm_player_destroy(MMHandleType player)
 
 	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_bus_msg_thread_destroy(player);
 
 	MMPLAYER_CMD_LOCK(player);
 
@@ -112,10 +113,14 @@ int mm_player_destroy(MMHandleType 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(player);
+	MMPLAYER_CMD_UNLOCK(player);
+
+	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);
@@ -144,8 +149,9 @@ int mm_player_abort_pause(MMHandleType player)
 
 	MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
 
+	_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_bus_msg_thread_destroy(player);
 
 	/* abort the pause operation for preparing(without cmd lock). */
 	result = _mmplayer_abort_pause(player);
@@ -183,7 +189,7 @@ int mm_player_set_message_callback(MMHandleType player, MMMessageCallback callba
 	return result;
 }
 
-int mm_player_set_audio_stream_callback(MMHandleType player, bool sync, 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;
 
@@ -191,14 +197,14 @@ int mm_player_set_audio_stream_callback(MMHandleType player, bool sync, mm_playe
 
 	MMPLAYER_CMD_LOCK(player);
 
-	result = _mmplayer_set_audiostream_cb(player, sync, callback, user_param);
+	result = _mmplayer_set_audio_decoded_cb(player, opt, 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 mm_player_set_video_decoded_callback(MMHandleType player, mm_player_video_decoded_callback callback, void *user_param)
 {
 	int result = MM_ERROR_NONE;
 
@@ -206,7 +212,7 @@ int mm_player_set_video_stream_callback(MMHandleType player, mm_player_video_str
 
 	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);
 
@@ -228,23 +234,22 @@ int mm_player_do_video_capture(MMHandleType 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;
 
@@ -260,7 +265,7 @@ int mm_player_get_volume(MMHandleType player, MMPlayerVolumeType *volume)
 	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;
 
@@ -275,7 +280,7 @@ int mm_player_set_mute(MMHandleType player, int mute)
 	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;
 
@@ -291,7 +296,7 @@ int mm_player_get_mute(MMHandleType player, int *mute)
 	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;
 
@@ -306,7 +311,7 @@ int mm_player_get_state(MMHandleType player, MMPlayerStateType *state)
 }
 
 /* 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;
 
@@ -314,7 +319,7 @@ int mm_player_change_videosink(MMHandleType player, MMDisplaySurfaceType display
 
 	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);
 
@@ -420,7 +425,7 @@ int mm_player_get_position(MMHandleType player, int64_t *pos)
 
 	MMPLAYER_CMD_LOCK(player);
 
-	result = _mmplayer_get_position(player, pos);
+	result = _mmplayer_gst_get_position((mmplayer_t *)player, pos);
 
 	MMPLAYER_CMD_UNLOCK(player);
 
@@ -474,20 +479,15 @@ int mm_player_set_external_subtitle_path(MMHandleType player, const char *path)
 	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)", format);
-		return MM_ERROR_INVALID_ARGUMENT;
-	}
-
 	MMPLAYER_CMD_LOCK(player);
 
-	result = _mmplayer_adjust_subtitle_postion(player, format, pos);
+	result = _mmplayer_adjust_subtitle_position(player, pos);
 
 	MMPLAYER_CMD_UNLOCK(player);
 
@@ -554,7 +554,7 @@ int mm_player_get_attribute(MMHandleType player,  char **err_attr_name, const ch
 	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;
 
@@ -568,7 +568,7 @@ int mm_player_get_attribute_info(MMHandleType player,  const char *attribute_nam
 	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;
 
@@ -584,7 +584,7 @@ int mm_player_get_track_count(MMHandleType player, MMPlayerTrackType type, int *
 	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;
 
@@ -599,7 +599,7 @@ int mm_player_select_track(MMHandleType player, MMPlayerTrackType type, int inde
 	return result;
 }
 
-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;
 
@@ -615,7 +615,7 @@ int mm_player_get_current_track(MMHandleType player, MMPlayerTrackType type, int
 	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;
 
@@ -751,7 +751,7 @@ int mm_player_set_audio_info(MMHandleType player, media_format_h format)
 	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;
 
@@ -768,7 +768,7 @@ int mm_player_set_subtitle_info(MMHandleType player, MMPlayerSubtitleStreamInfo
 	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;
 
@@ -785,7 +785,7 @@ int mm_player_set_media_stream_buffer_max_size(MMHandleType player, MMPlayerStre
 	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;
@@ -805,7 +805,7 @@ int mm_player_get_media_stream_buffer_max_size(MMHandleType player, MMPlayerStre
 	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;
 
@@ -822,7 +822,7 @@ int mm_player_set_media_stream_buffer_min_percent(MMHandleType player, MMPlayerS
 	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;
 
@@ -840,40 +840,6 @@ int mm_player_get_media_stream_buffer_min_percent(MMHandleType player, MMPlayerS
 	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 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);
-
-	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 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_seek_data_cb(player, type, callback, user_param);
-
-	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 result = MM_ERROR_NONE;
@@ -889,21 +855,6 @@ int mm_player_set_audio_stream_changed_callback(MMHandleType player, mm_player_s
 	return result;
 }
 
-int mm_player_set_video_stream_changed_callback(MMHandleType player, mm_player_stream_changed_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_changed_cb(player, callback, user_param);
-
-	MMPLAYER_CMD_UNLOCK(player);
-
-	return result;
-}
-
 int mm_player_get_timeout(MMHandleType player, int *timeout)
 {
 	int result = MM_ERROR_NONE;
@@ -920,22 +871,6 @@ int mm_player_get_timeout(MMHandleType player, int *timeout)
 	return result;
 }
 
-int mm_player_get_num_of_video_out_buffers(MMHandleType player, int *num, int *extra_num)
-{
-	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);
-
-	MMPLAYER_CMD_UNLOCK(player);
-
-	return result;
-}
-
 int mm_player_set_media_stream_dynamic_resolution(MMHandleType player, bool drc)
 {
 	int result = MM_ERROR_NONE;
@@ -1075,22 +1010,6 @@ int mm_player_set_audio_only(MMHandleType player, bool audio_only)
 	return result;
 }
 
-int mm_player_get_audio_only(MMHandleType player, bool *audio_only)
-{
-	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_CMD_LOCK(player);
-
-	result = _mmplayer_get_audio_only(player, audio_only);
-
-	MMPLAYER_CMD_UNLOCK(player);
-
-	return result;
-}
-
 int mm_player_360_is_content_spherical(MMHandleType player, bool *is_spherical)
 {
 	int result = MM_ERROR_NONE;
@@ -1227,7 +1146,7 @@ int mm_player_360_get_field_of_view(MMHandleType player, int *horizontal_degrees
 	return result;
 }
 
-int mm_player_set_codec_type(MMHandleType player, MMPlayerStreamType stream_type, MMPlayerVideoCodecType codec_type)
+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;
 
@@ -1302,3 +1221,48 @@ int mm_player_get_video_roi_area(MMHandleType player, double *scale_x, double *s
 
 	return result;
 }
+
+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_CMD_LOCK(player);
+
+	result = _mmplayer_set_client_pid(player, pid);
+
+	MMPLAYER_CMD_UNLOCK(player);
+
+	return result;
+}
+
+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_audio_offload_is_activated(player, activated);
+
+	MMPLAYER_CMD_UNLOCK(player);
+
+	return result;
+}
+
+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(available, MM_ERROR_INVALID_ARGUMENT);
+
+	MMPLAYER_CMD_LOCK(player);
+	result = _mmplayer_is_audio_control_available(player, opt, available);
+	MMPLAYER_CMD_UNLOCK(player);
+
+	return result;
+}