X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Finclude%2Fmm_player_internal.h;h=8f68a98016316b4efb20ea8ed56c50e8f439ec06;hb=74aa44f93940e2e97ac69c64c02f039bc605df9a;hp=60304e96c8c8780f7b0512c15d93e96f78fdbaae;hpb=8ba129f9fbf088535f2e91401013fd3ea563caff;p=platform%2Fcore%2Fmultimedia%2Flibmm-player.git
diff --git a/src/include/mm_player_internal.h b/src/include/mm_player_internal.h
index 60304e9..8f68a98 100644
--- a/src/include/mm_player_internal.h
+++ b/src/include/mm_player_internal.h
@@ -29,69 +29,6 @@
extern "C" {
#endif
-/**
- @addtogroup PLAYER-INTERNAL
- @{
-
- @par
-
-
- PROPERTY |
- TYPE |
- VALID TYPE |
- DEFAULT VALUE |
-
-
- "display_roi_x" |
- int |
- range |
- 0 |
-
-
- "display_roi_y" |
- int |
- range |
- 0 |
-
-
- "display_roi_width" |
- int |
- range |
- 640 |
-
-
- "display_roi_height" |
- int |
- range |
- 480 |
-
-
- "display_method" |
- int |
- range |
- MM_DISPLAY_METHOD_LETTER_BOX |
-
-
- "sound_volume_type" |
- int |
- range |
- MM_SOUND_VOLUME_TYPE_CALL |
-
-
- "sound_route" |
- int |
- range |
- MM_AUDIOROUTE_USE_EXTERNAL_SETTING |
-
-
- "sound_stop_when_unplugged" |
- int |
- range |
-
-
-
-*/
-
/*
* Enumerations of video colorspace
*/
@@ -100,16 +37,18 @@ typedef enum {
MM_PLAYER_COLORSPACE_RGB888, /**< RGB888 pixel format */
MM_PLAYER_COLORSPACE_NV12_TILED, /**< Customized color format */
MM_PLAYER_COLORSPACE_NV12,
-} MMPlayerVideoColorspace;
+ MM_PLAYER_COLORSPACE_BGRx, /**< BGRx pixel format */
+ MM_PLAYER_COLORSPACE_MAX = 0x7FFFFFFF
+} mmplayer_video_color_space_e;
typedef struct {
unsigned char *data; /* capture image buffer */
int size; /* capture image size */
- MMPlayerVideoColorspace fmt; /* color space type */
+ mmplayer_video_color_space_e fmt; /* color space type */
unsigned int width; /* width of captured image */
unsigned int height; /* height of captured image */
unsigned int orientation; /* content orientation */
-} MMPlayerVideoCapture;
+} mmplayer_video_capture_t;
typedef struct {
void *data;
@@ -119,10 +58,10 @@ typedef struct {
int depth;
bool is_little_endian;
guint64 channel_mask;
-} MMPlayerAudioStreamDataType;
+} mmplayer_audio_decoded_data_info_t;
/**
- * Video stream callback function type.
+ * Video decoded callback function type.
*
* @param stream [in] Reference pointer to video frame data
* @param stream_size [in] Size of video frame data
@@ -133,7 +72,7 @@ typedef struct {
*
* @return This callback function have to return MM_ERROR_NONE.
*/
-typedef bool (*mm_player_video_stream_callback) (void *stream, void *user_param);
+typedef bool (*mm_player_video_decoded_callback)(void *stream, void *user_param);
/**
* Audio stream callback function type.
@@ -145,7 +84,7 @@ typedef bool (*mm_player_video_stream_callback) (void *stream, void *user_param)
*
* @return This callback function have to return MM_ERROR_NONE.
*/
-typedef bool (*mm_player_video_capture_callback) (void *stream, int stream_size, void *user_param);
+typedef bool (*mm_player_video_capture_callback)(void *stream, int stream_size, void *user_param);
/**
* Video frame render error callback function type.
@@ -156,7 +95,7 @@ typedef bool (*mm_player_video_capture_callback) (void *stream, int stream_size,
*
* @return This callback function have to return MM_ERROR_NONE.
*/
-typedef bool (*mm_player_video_frame_render_error_callback) (void *error_id, void *user_param);
+typedef bool (*mm_player_video_frame_render_error_callback)(void *error_id, void *user_param);
/**
* Audio stream callback function type.
@@ -167,7 +106,7 @@ typedef bool (*mm_player_video_frame_render_error_callback) (void *error_id, voi
*
* @return This callback function have to return MM_ERROR_NONE.
*/
-typedef bool (*mm_player_audio_stream_callback_ex) (MMPlayerAudioStreamDataType *stream, void *user_param);
+typedef bool (*mm_player_audio_decoded_callback)(mmplayer_audio_decoded_data_info_t *stream, void *user_param);
/**
* This function is to set play speed for playback.
*
@@ -194,26 +133,25 @@ int mm_player_set_play_speed(MMHandleType player, float rate, bool streaming);
* @return This function returns zero on success, or negative value with error
* code.
* @remark
- * @see mm_player_video_stream_callback mm_player_set_audio_stream_callback
* @since
*/
-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);
/**
* This function set callback function for receiving audio stream from player.
*
* @param player [in] Handle of player.
- * @param sync [in] sync Sync on the clock.
- * @param callback [in] audio stream callback function.
+ * @param opt [in] audio extract option.
+ * @param callback [in] audio stream callback function.
* @param user_param [in] User parameter.
*
* @return This function returns zero on success, or negative value with error
* code.
* @remark
- * @see mm_player_audio_stream_callback_ex
+ * @see mm_player_audio_decoded_callback
* @since
*/
-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_audio_decoded_callback(MMHandleType player, mmplayer_audio_extract_opt_e opt, mm_player_audio_decoded_callback callback, void *user_param);
/**
* This function is to capture video frame.
@@ -231,21 +169,6 @@ int mm_player_set_audio_stream_callback_ex(MMHandleType player, bool sync, mm_pl
int mm_player_do_video_capture(MMHandleType player);
/**
- * This function set callback function for putting data into player.
- *
- * @param player [in] Handle of player.
- * @param buf [in] data to push into player
- * @param size [in] buffer size to push
- *
- * @return This function returns zero on success, or negative value with error
- * code.
- * @remark
- * @see
- * @since
- */
-int mm_player_push_buffer(MMHandleType player, unsigned char *buf, int size);
-
-/**
* This function changes the previous videosink plugin for a new one
*
* @param player [in] Handle of player.
@@ -261,19 +184,6 @@ int mm_player_push_buffer(MMHandleType player, unsigned char *buf, int size);
int mm_player_change_videosink(MMHandleType player, MMDisplaySurfaceType display_surface_type, void *display_overlay);
/**
- * This function is to set pcm spec.
- *
- * @param player [in] Handle of player.
- * @param samplerate [in] Samplerate.
- * @param channel [in] Channel.
- *
- * @return This function returns zero on success, or negative value with error
- * @see
- * @since
- */
-int mm_player_set_pcm_spec(MMHandleType player, int samplerate, int channel);
-
-/**
@}
*/