From: Eunhye Choi Date: Tue, 9 Apr 2019 12:37:49 +0000 (+0900) Subject: [0.6.180] apply tizen naming coding rule X-Git-Tag: accepted/tizen/unified/20190410.131432^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=34e49568da4fa5dd3756ccf60d85a1c79056a70e;p=platform%2Fcore%2Fmultimedia%2Flibmm-player.git [0.6.180] apply tizen naming coding rule - apply the below naming coding rule '[M12] No mixed-case, Use underscores('_') to separate words in an name.' Change-Id: Ic34a93495f6e804a98f829362e944c9315f64386 --- diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec index 43209c1..349dc81 100644 --- 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.179 +Version: 0.6.180 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/include/mm_player.h b/src/include/mm_player.h index 7a97387..494c07c 100644 --- a/src/include/mm_player.h +++ b/src/include/mm_player.h @@ -285,7 +285,7 @@ typedef struct { int elevation[BUFFER_MAX_PLANE_NUM]; /**< elevation of plane */ int orientation; /**< orientation */ int bo_size; /**< TBM buffer object size */ -} MMPlayerVideoStreamDataType; +} mmplayer_video_decoded_data_info_t; /** * Enumerations of player state. @@ -297,16 +297,7 @@ typedef enum { MM_PLAYER_STATE_PAUSED, /**< Player is paused while playing media */ MM_PLAYER_STATE_NONE, /**< Player is not created yet */ MM_PLAYER_STATE_NUM, /**< Number of player states */ -} MMPlayerStateType; - -/** - * Enumerations of position formats. - */ -typedef enum { - MM_PLAYER_POS_FORMAT_TIME, /**< Format for time based */ - MM_PLAYER_POS_FORMAT_PERCENT, /**< Format for percentage */ - MM_PLAYER_POS_FORMAT_NUM, /**< Number of position formats */ -} MMPlayerPosFormatType; +} mmplayer_state_e; /** * Enumeration for attribute values types. @@ -320,7 +311,7 @@ typedef enum { MM_PLAYER_ATTRS_TYPE_ARRAY, /**< Array type */ MM_PLAYER_ATTRS_TYPE_RANGE, /**< Range type */ MM_PLAYER_ATTRS_TYPE_NUM, /**< Number of attribute type */ -} MMPlayerAttrsType; +} mmplayer_attrs_type_e; /** * Enumeration for attribute validation type. @@ -332,7 +323,7 @@ typedef enum { MM_PLAYER_ATTRS_VALID_TYPE_INT_RANGE, /**< validity checking type of integer range */ MM_PLAYER_ATTRS_VALID_TYPE_DOUBLE_ARRAY, /**< validity checking type of double array */ MM_PLAYER_ATTRS_VALID_TYPE_DOUBLE_RANGE, /**< validity checking type of double range */ -} MMPlayerAttrsValidType; +} mmplayer_attrs_valid_type_e; /** * Enumeration for attribute access flag. @@ -344,7 +335,7 @@ typedef enum { MM_PLAYER_ATTRS_FLAG_MODIFIED = 1 << 2, /**< Modified */ MM_PLAYER_ATTRS_FLAG_RW = MM_PLAYER_ATTRS_FLAG_READABLE | MM_PLAYER_ATTRS_FLAG_WRITABLE, /**< Readable and Writable */ -} MMPlayerAttrsFlag; +} mmplayer_attrs_flag_e; /** * Enumeration of track types @@ -354,7 +345,7 @@ typedef enum { MM_PLAYER_TRACK_TYPE_VIDEO, MM_PLAYER_TRACK_TYPE_TEXT, MM_PLAYER_TRACK_TYPE_MAX -} MMPlayerTrackType; +} mmplayer_track_type_e; /** * Enumeration of runtime buffering mode @@ -363,18 +354,7 @@ typedef enum { MM_PLAYER_BUFFERING_MODE_ADAPTIVE = 0, /**< default, If buffering is occurred, player will consider the bandwidth to adjust buffer setting. */ MM_PLAYER_BUFFERING_MODE_FIXED, /**< player will set buffer size with this fixed size value. */ MM_PLAYER_BUFFERING_MODE_MAX, -} MMPlayerBufferingMode; - -/** - * Edge Properties of the text. - */ -typedef enum { - MM_PLAYER_EDGE_NO, - MM_PLAYER_EDGE_RAISED, - MM_PLAYER_EDGE_DEPRESSED, - MM_PLAYER_EDGE_UNIFORM, - MM_PLAYER_EDGE_DROPSHADOW -} MMPlayerSubtitleEdge; +} mmplayer_buffering_mode_e; /** * Enumeration of media stream buffer status @@ -382,7 +362,7 @@ typedef enum { typedef enum { MM_PLAYER_MEDIA_STREAM_BUFFER_UNDERRUN, MM_PLAYER_MEDIA_STREAM_BUFFER_OVERFLOW, -} MMPlayerMediaStreamBufferStatus; +} mmplayer_media_stream_buffer_status_e; /** * Enumeration for stream type. @@ -393,21 +373,21 @@ typedef enum { MM_PLAYER_STREAM_TYPE_VIDEO, /**< Video element stream type */ MM_PLAYER_STREAM_TYPE_TEXT, /**< Text type */ MM_PLAYER_STREAM_TYPE_MAX, -} MMPlayerStreamType; +} mmplayer_stream_type_e; typedef enum { MM_PLAYER_CODEC_TYPE_DEFAULT = 0, /**< codec is selected by the priority */ MM_PLAYER_CODEC_TYPE_HW, /**< HW codec can only be selected */ MM_PLAYER_CODEC_TYPE_SW, /**< SW codec can only be selected */ -} MMPlayerVideoCodecType; +} mmplayer_video_codec_type_e; /** * Attribute validity structure */ typedef struct { - MMPlayerAttrsType type; - MMPlayerAttrsValidType validity_type; - MMPlayerAttrsFlag flag; + mmplayer_attrs_type_e type; + mmplayer_attrs_valid_type_e validity_type; + mmplayer_attrs_flag_e flag; /** * a union that describes validity of the attribute. * Only when type is 'MM_ATTRS_TYPE_INT' or 'MM_ATTRS_TYPE_DOUBLE', @@ -447,7 +427,7 @@ typedef struct { double d_val; } double_range; }; -} MMPlayerAttrsInfo; +} mmplayer_attrs_info_t; /** * Volume type. @@ -456,13 +436,13 @@ typedef struct { */ typedef struct { float level[MM_VOLUME_CHANNEL_NUM]; /**< Relative volume factor for each channels */ -} MMPlayerVolumeType; +} mmplayer_volume_type_t; /** * Video stream info in external demux case * **/ -typedef struct _VideoStreamInfo { +typedef struct { const char *mime; unsigned int framerate_num; unsigned int framerate_den; @@ -471,13 +451,13 @@ typedef struct _VideoStreamInfo { unsigned char *codec_extradata; unsigned int extradata_size; unsigned int version; -} MMPlayerVideoStreamInfo; +} mmplayer_video_stream_info_t; /** * Audio stream info in external demux case * **/ -typedef struct _AudioStreamInfo { +typedef struct { const char *mime; unsigned int channels; unsigned int sample_rate; @@ -491,7 +471,7 @@ typedef struct _AudioStreamInfo { // unsigned int depth; // unsigned int endianness; // bool signedness; -} MMPlayerAudioStreamInfo; +} mmplayer_audio_stream_info_t; /** * Subtitle stream info in external demux case @@ -501,7 +481,7 @@ typedef struct _SubtitleStreamInfo { const char *mime; unsigned int codec_tag; void *context; //for smpte text -} MMPlayerSubtitleStreamInfo; +} mmplayer_subtitle_stream_info_t; /** * selected subtitle track number callback function type. @@ -523,7 +503,7 @@ typedef bool (*mm_player_track_selected_subtitle_language_callback)(int track_nu * * @return This callback function have to return MM_ERROR_NONE. */ -typedef bool (*mm_player_media_stream_buffer_status_callback)(MMPlayerStreamType type, MMPlayerMediaStreamBufferStatus status, unsigned long long bytes, void *user_param); +typedef bool (*mm_player_media_stream_buffer_status_callback)(mmplayer_stream_type_e type, mmplayer_media_stream_buffer_status_e status, unsigned long long bytes, void *user_param); /** * Buffer seek data callback function type. @@ -534,7 +514,7 @@ typedef bool (*mm_player_media_stream_buffer_status_callback)(MMPlayerStreamType * * @return This callback function have to return MM_ERROR_NONE. */ -typedef bool (*mm_player_media_stream_seek_data_callback)(MMPlayerStreamType type, unsigned long long offset, void *user_param); +typedef bool (*mm_player_media_stream_seek_data_callback)(mmplayer_stream_type_e type, unsigned long long offset, void *user_param); /** * Called to notify the stream changed. @@ -673,7 +653,7 @@ int mm_player_abort_pause(MMHandleType player); * * @return This function returns zero on success, or negative value with error code. * - * @see MMPlayerStateType + * @see mmplayer_state_e * @remark None * @par Example * @code @@ -682,7 +662,7 @@ if (mm_player_get_state(g_player, &state) != MM_ERROR_NONE) { } * @endcode */ -int mm_player_get_state(MMHandleType player, MMPlayerStateType *state); +int mm_player_get_state(MMHandleType player, mmplayer_state_e *state); /** * This function is to set relative volume of player. \n @@ -693,11 +673,11 @@ int mm_player_get_state(MMHandleType player, MMPlayerStateType *state); * @param volume [in] Volume factor of each channel * * @return This function returns zero on success, or negative value with error code. - * @see MMPlayerVolumeType, mm_player_get_volume + * @see mmplayer_volume_type_t, mm_player_get_volume * @remark The range of factor range is from 0 to 1.0. (1.0 = 100%) And, default value is 1.0. * @par Example * @code -MMPlayerVolumeType volume; +mmplayer_volume_type_t volume; int i = 0; for (i = 0; i < MM_VOLUME_CHANNEL_NUM; i++) @@ -709,7 +689,7 @@ if (mm_player_set_volume(g_player, &volume) != MM_ERROR_NONE) } * @endcode */ -int mm_player_set_volume(MMHandleType player, MMPlayerVolumeType *volume); +int mm_player_set_volume(MMHandleType player, mmplayer_volume_type_t *volume); /** * This function is to get current volume factor of player. @@ -719,11 +699,11 @@ int mm_player_set_volume(MMHandleType player, MMPlayerVolumeType *volume); * * @return This function returns zero on success, or negative value with error code. * - * @see MMPlayerVolumeType, mm_player_set_volume + * @see mmplayer_volume_type_t, mm_player_set_volume * @remark None * @par Example * @code -MMPlayerVolumeType volume; +mmplayer_volume_type_t volume; int i; if (mm_player_get_volume(g_player, &volume) != MM_ERROR_NONE) @@ -735,7 +715,7 @@ for (i = 0; i < MM_VOLUME_CHANNEL_NUM; i++) LOGD("channel[%d] = %d \n", i, volume.level[i]); * @endcode */ -int mm_player_get_volume(MMHandleType player, MMPlayerVolumeType *volume); +int mm_player_get_volume(MMHandleType player, mmplayer_volume_type_t *volume); /** * This function is to start playing media contents. Demux(parser), codec and related plugins are decided \n @@ -866,7 +846,7 @@ int mm_player_get_duration(MMHandleType player, int64_t *dur); * @param stop_pos [out] contains buffer current position on success or zero in case of failure. * * @return This function returns zero on success, or negative value with errors - * @see MMPlayerPosFormatType, mm_player_set_position + * @see mm_player_set_position * @remark the unit of time-based format is millisecond and other case is percent. * @par Example * @code @@ -981,14 +961,14 @@ int mm_player_get_mute(MMHandleType player, int *mute); int pos; pos = 5000; -if (mm_player_adjust_subtitle_position(g_player, MM_PLAYER_POS_FORMAT_TIME, pos) != MM_ERROR_NONE) +if (mm_player_adjust_subtitle_position(g_player, pos) != MM_ERROR_NONE) { LOGW("failed to adjust subtitle postion.\n"); } * @endcode */ -int mm_player_adjust_subtitle_position(MMHandleType player, MMPlayerPosFormatType format, int pos); +int mm_player_adjust_subtitle_position(MMHandleType player, int pos); /** * This function is to set subtitle silent status. So, subtitle can show or hide during playback \n @@ -1120,7 +1100,7 @@ if (method_info. validity_type == MM_PLAYER_ATTRS_VALID_TYPE_INT_RANGE) { } * @endcode */ -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); /** * This function is to get the track count @@ -1143,7 +1123,7 @@ if (mm_player_get_track_count(g_player, MM_PLAYER_TRACK_TYPE_AUDIO, &audio_count LOGD("audio track count : %d \n", audio_count); * @endcode */ -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); /** * This function is to select the track @@ -1155,7 +1135,7 @@ int mm_player_get_track_count(MMHandleType player, MMPlayerTrackType type, int * @return This function returns zero on success, or negative value with error * code. */ -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); /** * This function is to get the track language @@ -1168,7 +1148,7 @@ int mm_player_select_track(MMHandleType player, MMPlayerTrackType type, int inde * @return This function returns zero on success, or negative value with error * code. */ -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); /** * This function is to get the current running track @@ -1181,7 +1161,7 @@ int mm_player_get_track_language_code(MMHandleType player, MMPlayerTrackType ty * code. */ -int mm_player_get_current_track(MMHandleType hplayer, MMPlayerTrackType type, int *index); +int mm_player_get_current_track(MMHandleType hplayer, mmplayer_track_type_e type, int *index); /** * This function is to set the subtitle path @@ -1261,7 +1241,7 @@ int mm_player_set_audio_info(MMHandleType player, media_format_h format); * @param subtitle_stream_info [in] Subtitle stream info. * @return This function returns zero on success, or negative value with error code. */ -int mm_player_set_subtitle_info(MMHandleType player, MMPlayerSubtitleStreamInfo *info); +int mm_player_set_subtitle_info(MMHandleType player, mmplayer_subtitle_stream_info_t *info); /** * This function set callback function for receiving need or enough data message from player. @@ -1274,7 +1254,7 @@ int mm_player_set_subtitle_info(MMHandleType player, MMPlayerSubtitleStreamInfo * @return This function returns zero on success, or negative value with error * code. */ -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_media_stream_buffer_status_callback(MMHandleType player, mmplayer_stream_type_e type, mm_player_media_stream_buffer_status_callback callback, void *user_param); /** * This function set callback function for receiving seek data message from player. @@ -1287,7 +1267,7 @@ int mm_player_set_media_stream_buffer_status_callback(MMHandleType player, MMPla * @return This function returns zero on success, or negative value with error * code. */ -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_set_media_stream_seek_data_callback(MMHandleType player, mmplayer_stream_type_e type, mm_player_media_stream_seek_data_callback callback, void *user_param); /** * This function is to set max size of buffer(appsrc). @@ -1299,7 +1279,7 @@ int mm_player_set_media_stream_seek_data_callback(MMHandleType player, MMPlayerS * @return This function returns zero on success, or negative value with error * code. */ -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); /** * This function is to get max size of buffer(appsrc). @@ -1311,7 +1291,7 @@ int mm_player_set_media_stream_buffer_max_size(MMHandleType player, MMPlayerStre * @return This function returns zero on success, or negative value with error * code. */ -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); /** * This function is to set min percent of buffer(appsrc). @@ -1323,7 +1303,7 @@ int mm_player_get_media_stream_buffer_max_size(MMHandleType player, MMPlayerStre * @return This function returns zero on success, or negative value with error * code. */ -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); /** * This function is to get min percent of buffer(appsrc). @@ -1335,7 +1315,7 @@ int mm_player_set_media_stream_buffer_min_percent(MMHandleType player, MMPlayerS * @return This function returns zero on success, or negative value with error * code. */ -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); /** * This function set callback function for changing audio stream from player. \n @@ -1466,7 +1446,7 @@ int mm_player_360_get_field_of_view(MMHandleType player, int *horizontal_degrees /** * This function is to set codec type */ -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_video_codec_type_e codec_type); /** * These functions are to apply the replaygain diff --git a/src/include/mm_player_attrs.h b/src/include/mm_player_attrs.h index bbbe8f6..62d40aa 100644 --- a/src/include/mm_player_attrs.h +++ b/src/include/mm_player_attrs.h @@ -64,7 +64,7 @@ int _mmplayer_get_attribute(MMHandleType handle, char **err_atr_name, const cha * @see * */ -int _mmplayer_get_attributes_info(MMHandleType handle, const char *attribute_name, MMPlayerAttrsInfo *info); +int _mmplayer_get_attributes_info(MMHandleType handle, const char *attribute_name, mmplayer_attrs_info_t *info); /** * This function allocates structure of attributes and sets initial values. * diff --git a/src/include/mm_player_audioeffect.h b/src/include/mm_player_audioeffect.h index 145a1f7..dab1c1f 100644 --- a/src/include/mm_player_audioeffect.h +++ b/src/include/mm_player_audioeffect.h @@ -69,7 +69,7 @@ typedef enum { MM_AUDIO_EFFECT_PRESET_STUDIO, /**< Preset type Studio */ MM_AUDIO_EFFECT_PRESET_CLUB, /**< Preset type Club */ MM_AUDIO_EFFECT_PRESET_NUM, /**< Number of Preset type */ -} MMAudioEffectPresetType; +} mm_audio_effect_preset_type_e; /** * Enumerations of Audio Effect Custom Type @@ -82,7 +82,7 @@ typedef enum { MM_AUDIO_EFFECT_CUSTOM_REVERB_LEVEL, /**< Custom type Reverb Level */ MM_AUDIO_EFFECT_CUSTOM_CLARITY, /**< Custom type Clarity */ MM_AUDIO_EFFECT_CUSTOM_NUM, /**< Number of Custom type */ -} MMAudioEffectCustomType; +} mm_audio_effect_custom_type_e; /** * Enumerations of Audio Effect Type @@ -92,7 +92,7 @@ typedef enum { MM_AUDIO_EFFECT_TYPE_PRESET, MM_AUDIO_EFFECT_TYPE_CUSTOM, MM_AUDIO_EFFECT_TYPE_SQUARE, -} MMAudioEffectType; +} mm_audio_effect_type_e; /** @@ -108,21 +108,21 @@ typedef enum { MM_AUDIO_EFFECT_OUTPUT_USB_AUDIO, MM_AUDIO_EFFECT_OUTPUT_HDMI, MM_AUDIO_EFFECT_OUTPUT_NUM -} MMAudioEffectOutputMode; +} mm_audio_effect_output_mode_e; /** * Structure of AudioEffectInfo */ typedef struct { - MMAudioEffectType effect_type; /**< effect type, (NONE,PRESET,CUSTOM)*/ - MMAudioEffectPresetType preset; /**< for preset type*/ + mm_audio_effect_type_e effect_type; /**< effect type, (NONE,PRESET,CUSTOM)*/ + mm_audio_effect_preset_type_e preset; /**< for preset type*/ int *custom_ext_level_for_plugin; /**< for custom type, level value list of Extension effects*/ int custom_eq_level[MM_AUDIO_EFFECT_EQ_BAND_NUM_MAX]; /**< for custom type, EQ info*/ int custom_ext_level[MM_AUDIO_EFFECT_CUSTOM_NUM-1]; /**< for custom type, Extension effect info*/ int square_row; /**< for square type, square row configure*/ int square_col; /**< for square type, square col configure*/ -} MMAudioEffectInfo; +} mm_audio_effect_info_t; /** @@ -151,7 +151,7 @@ typedef bool (*mmplayer_supported_audio_effect_cb)(int effect_type, int type, vo * @see * @since */ -int mm_player_get_foreach_present_supported_effect_type(MMHandleType player, MMAudioEffectType effect_type, mmplayer_supported_audio_effect_cb foreach_cb, void *user_data); +int mm_player_get_foreach_present_supported_effect_type(MMHandleType player, mm_audio_effect_type_e effect_type, mmplayer_supported_audio_effect_cb foreach_cb, void *user_data); /** * This function is to bypass audio effect. @@ -260,10 +260,10 @@ int mm_player_audio_effect_custom_get_eq_bands_freq(MMHandleType hplayer, int ba * @return This function returns zero on success, or negative value with error code. * * @remark - * @see MMAudioEffectCustomType + * @see mm_audio_effect_custom_type_e * @since */ -int mm_player_audio_effect_custom_get_level(MMHandleType hplayer, MMAudioEffectCustomType type, int eq_index, int *level); +int mm_player_audio_effect_custom_get_level(MMHandleType hplayer, mm_audio_effect_custom_type_e type, int eq_index, int *level); /** * This function is to get range of the level of the custom effect. @@ -276,10 +276,10 @@ int mm_player_audio_effect_custom_get_level(MMHandleType hplayer, MMAudioEffectC * @return This function returns zero on success, or negative value with error code. * * @remark - * @see MMAudioEffectCustomType + * @see mm_audio_effect_custom_type_e * @since */ -int mm_player_audio_effect_custom_get_level_range(MMHandleType hplayer, MMAudioEffectCustomType type, int *min, int *max); +int mm_player_audio_effect_custom_get_level_range(MMHandleType hplayer, mm_audio_effect_custom_type_e type, int *min, int *max); /** * This function is to set the level of the custom effect. @@ -292,10 +292,10 @@ int mm_player_audio_effect_custom_get_level_range(MMHandleType hplayer, MMAudioE * @return This function returns zero on success, or negative value with error code. * * @remark - * @see MMAudioEffectCustomType + * @see mm_audio_effect_custom_type_e * @since */ -int mm_player_audio_effect_custom_set_level(MMHandleType hplayer, MMAudioEffectCustomType effect_custom_type, int eq_index, int level); +int mm_player_audio_effect_custom_set_level(MMHandleType hplayer, mm_audio_effect_custom_type_e effect_custom_type, int eq_index, int level); /** * This function is to set the bands level of equalizer custom effect using input list. @@ -324,7 +324,7 @@ int mm_player_audio_effect_custom_set_level_eq_from_list(MMHandleType hplayer, i * @see * @since */ -int mm_player_is_supported_preset_effect_type(MMHandleType hplayer, MMAudioEffectPresetType effect); +int mm_player_is_supported_preset_effect_type(MMHandleType hplayer, mm_audio_effect_preset_type_e effect); /** * This function is to decide if the custom type effect is supported or not @@ -338,7 +338,7 @@ int mm_player_is_supported_preset_effect_type(MMHandleType hplayer, MMAudioEffec * @see * @since */ -int mm_player_is_supported_custom_effect_type(MMHandleType hplayer, MMAudioEffectCustomType effect); +int mm_player_is_supported_custom_effect_type(MMHandleType hplayer, mm_audio_effect_custom_type_e effect); /** @} diff --git a/src/include/mm_player_capture.h b/src/include/mm_player_capture.h index eab5370..5c905cd 100644 --- a/src/include/mm_player_capture.h +++ b/src/include/mm_player_capture.h @@ -48,7 +48,7 @@ * @see * */ -int _mmplayer_initialize_video_capture(mm_player_t *player); +int _mmplayer_initialize_video_capture(mmplayer_t *player); /** * This function is to release video capture @@ -59,7 +59,7 @@ int _mmplayer_initialize_video_capture(mm_player_t *player); * @see * */ -int _mmplayer_release_video_capture(mm_player_t *player); +int _mmplayer_release_video_capture(mmplayer_t *player); /** * This function is to get video snapshot during playback. diff --git a/src/include/mm_player_es.h b/src/include/mm_player_es.h index a41cd55..c0c3315 100644 --- a/src/include/mm_player_es.h +++ b/src/include/mm_player_es.h @@ -41,34 +41,34 @@ int _mmplayer_set_video_info(MMHandleType player, media_format_h format); int _mmplayer_set_audio_info(MMHandleType player, media_format_h format); -int _mmplayer_set_subtitle_info(MMHandleType player, MMPlayerSubtitleStreamInfo *info); +int _mmplayer_set_subtitle_info(MMHandleType player, mmplayer_subtitle_stream_info_t *info); int _mmplayer_submit_packet(MMHandleType player, media_packet_h packet); int _mmplayer_set_media_stream_buffer_status_cb(MMHandleType player, - MMPlayerStreamType type, + mmplayer_stream_type_e type, mm_player_media_stream_buffer_status_callback callback, void *user_param); int _mmplayer_set_media_stream_seek_data_cb(MMHandleType player, - MMPlayerStreamType type, + mmplayer_stream_type_e type, mm_player_media_stream_seek_data_callback callback, void *user_param); int _mmplayer_set_media_stream_max_size(MMHandleType hplayer, - MMPlayerStreamType type, + mmplayer_stream_type_e type, guint64 max_size); int _mmplayer_get_media_stream_max_size(MMHandleType hplayer, - MMPlayerStreamType type, + mmplayer_stream_type_e type, guint64 *max_size); int _mmplayer_set_media_stream_min_percent(MMHandleType hplayer, - MMPlayerStreamType type, + mmplayer_stream_type_e type, guint min_percent); int _mmplayer_get_media_stream_min_percent(MMHandleType hplayer, - MMPlayerStreamType type, + mmplayer_stream_type_e type, guint *min_percent); int _mmplayer_set_media_stream_dynamic_resolution(MMHandleType hplayer, bool drc); diff --git a/src/include/mm_player_gst.h b/src/include/mm_player_gst.h index 7dba132..4852c40 100644 --- a/src/include/mm_player_gst.h +++ b/src/include/mm_player_gst.h @@ -55,29 +55,29 @@ extern "C" | GLOBAL FUNCTION PROTOTYPES | ========================================================================================*/ -gint __mmplayer_gst_handle_core_error(mm_player_t *player, int code); -gint __mmplayer_gst_handle_library_error(mm_player_t *player, int code); -gint __mmplayer_gst_handle_resource_error(mm_player_t *player, int code, GstMessage *message); -gint __mmplayer_gst_handle_stream_error(mm_player_t *player, GError *error, GstMessage *message); +gint __mmplayer_gst_handle_core_error(mmplayer_t *player, int code); +gint __mmplayer_gst_handle_library_error(mmplayer_t *player, int code); +gint __mmplayer_gst_handle_resource_error(mmplayer_t *player, int code, GstMessage *message); +gint __mmplayer_gst_handle_stream_error(mmplayer_t *player, GError *error, GstMessage *message); -gboolean __mmplayer_handle_gst_error(mm_player_t *player, GstMessage *message, GError *error); -int __mmplayer_gst_set_state(mm_player_t *player, GstElement *element, GstState state, gboolean async, gint timeout); +gboolean __mmplayer_handle_gst_error(mmplayer_t *player, GstMessage *message, GError *error); +int __mmplayer_gst_set_state(mmplayer_t *player, GstElement *element, GstState state, gboolean async, gint timeout); -int __mmplayer_gst_start(mm_player_t *player); -int __mmplayer_gst_stop(mm_player_t *player); -int __mmplayer_gst_pause(mm_player_t *player, gboolean async); -int __mmplayer_gst_resume(mm_player_t *player, gboolean async); -gboolean __mmplayer_gst_send_event_to_sink(mm_player_t *player, GstEvent *event); -gboolean __mmplayer_gst_seek(mm_player_t *player, GstElement *element, gdouble rate, +int __mmplayer_gst_start(mmplayer_t *player); +int __mmplayer_gst_stop(mmplayer_t *player); +int __mmplayer_gst_pause(mmplayer_t *player, gboolean async); +int __mmplayer_gst_resume(mmplayer_t *player, gboolean async); +gboolean __mmplayer_gst_send_event_to_sink(mmplayer_t *player, GstEvent *event); +gboolean __mmplayer_gst_seek(mmplayer_t *player, GstElement *element, gdouble rate, GstFormat format, GstSeekFlags flags, GstSeekType cur_type, gint64 cur, GstSeekType stop_type, gint64 stop); -int __mmplayer_gst_set_position(mm_player_t *player, gint64 position, gboolean internal_called); -int __mmplayer_gst_get_position(mm_player_t *player, gint64 *position); -int __mmplayer_gst_get_buffer_position(mm_player_t *player, int *start_pos, int *end_pos); -GstElement *__mmplayer_gst_create_source(mm_player_t *player); -int __mmplayer_gst_build_es_pipeline(mm_player_t *player); -int __mmplayer_gst_build_pipeline(mm_player_t *player); -int __mmplayer_gst_add_bus_watch(mm_player_t *player); +int __mmplayer_gst_set_position(mmplayer_t *player, gint64 position, gboolean internal_called); +int __mmplayer_gst_get_position(mmplayer_t *player, gint64 *position); +int __mmplayer_gst_get_buffer_position(mmplayer_t *player, int *start_pos, int *end_pos); +GstElement *__mmplayer_gst_create_source(mmplayer_t *player); +int __mmplayer_gst_build_es_pipeline(mmplayer_t *player); +int __mmplayer_gst_build_pipeline(mmplayer_t *player); +int __mmplayer_gst_add_bus_watch(mmplayer_t *player); #ifdef __cplusplus } diff --git a/src/include/mm_player_ini.h b/src/include/mm_player_ini.h index 193a480..f682052 100644 --- a/src/include/mm_player_ini.h +++ b/src/include/mm_player_ini.h @@ -60,7 +60,7 @@ enum keyword_type { KEYWORD_A_OFFLOAD, // for audio device type which can support offload }; -typedef struct __mm_player_ini { +typedef struct { /* general */ gchar videosink_element_overlay[PLAYER_INI_MAX_STRLEN]; gchar videosink_element_fake[PLAYER_INI_MAX_STRLEN]; @@ -120,7 +120,7 @@ typedef struct __mm_player_ini { gchar dump_element_keyword[PLAYER_INI_MAX_ELEMENT][PLAYER_INI_MAX_STRLEN]; gchar dump_element_path[PLAYER_INI_MAX_STRLEN]; gboolean set_dump_element_flag; -} mm_player_ini_t; +} mmplayer_ini_t; /* default values if each values are not specified in inifile */ /* general */ @@ -251,10 +251,10 @@ http timeout = -1 ; infinite retry \n\ " int -mm_player_ini_load(mm_player_ini_t *ini); +mm_player_ini_load(mmplayer_ini_t *ini); int -mm_player_audio_effect_ini_load(mm_player_ini_t *ini); +mm_player_audio_effect_ini_load(mmplayer_ini_t *ini); #ifdef __cplusplus } diff --git a/src/include/mm_player_internal.h b/src/include/mm_player_internal.h index 00a085f..3497a18 100644 --- a/src/include/mm_player_internal.h +++ b/src/include/mm_player_internal.h @@ -39,16 +39,16 @@ typedef enum { MM_PLAYER_COLORSPACE_NV12, MM_PLAYER_COLORSPACE_BGRx, /**< BGRx pixel format */ MM_PLAYER_COLORSPACE_MAX = 0x7FFFFFFF -} MMPlayerVideoColorspace; +} 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; @@ -58,7 +58,7 @@ typedef struct { int depth; bool is_little_endian; guint64 channel_mask; -} MMPlayerAudioStreamDataType; +} mmplayer_audio_decoded_data_info_t; /** * Video stream callback function type. @@ -106,7 +106,7 @@ typedef bool (*mm_player_video_frame_render_error_callback)(void *error_id, void * * @return This callback function have to return MM_ERROR_NONE. */ -typedef bool (*mm_player_audio_stream_callback)(MMPlayerAudioStreamDataType *stream, void *user_param); +typedef bool (*mm_player_audio_stream_callback)(mmplayer_audio_decoded_data_info_t *stream, void *user_param); /** * This function is to set play speed for playback. * diff --git a/src/include/mm_player_priv.h b/src/include/mm_player_priv.h index 21c5010..fdb8569 100644 --- a/src/include/mm_player_priv.h +++ b/src/include/mm_player_priv.h @@ -58,7 +58,7 @@ #define MM_PLAYER_IMGB_MPLANE_MAX 4 #define MM_PLAYER_STREAM_COUNT_MAX 3 -#define MM_PLAYER_CAST(x_player) ((mm_player_t *)(x_player)) +#define MM_PLAYER_CAST(x_player) ((mmplayer_t *)(x_player)) /** * @x_player: MMHandleType of player * @@ -101,7 +101,7 @@ enum content_attr_flag { ATTR_ALL = 0x0020, }; -enum MMPlayerSinkType { +enum mmplayer_sink_type { MMPLAYER_VIDEO_SINK = 0x01, MMPLAYER_AUDIO_SINK = 0x02, MMPLAYER_TEXT_SINK = 0x04, @@ -111,7 +111,7 @@ enum MMPlayerSinkType { /** * Enumerations of Player Uri type */ -enum MMPlayerUriType { +enum mmplayer_uri_type { MM_PLAYER_URI_TYPE_NONE, /**< Player URI type None */ MM_PLAYER_URI_TYPE_URL_RTSP, /**< Player URI type RTSP */ MM_PLAYER_URI_TYPE_URL_HTTP, /**< Player URI type HTTP */ @@ -127,18 +127,18 @@ enum MMPlayerUriType { MM_PLAYER_URI_TYPE_TEMP, /**< Player URI type Temp */ }; -typedef enum _MissingCodec { +typedef enum { MISSING_PLUGIN_NONE = 0x00, MISSING_PLUGIN_AUDIO = 0x01, MISSING_PLUGIN_VIDEO = 0x02 -} MissingCodec; +} missing_codec_e; -typedef enum _FoundCodec { +typedef enum { FOUND_PLUGIN_NONE = 0x00, FOUND_PLUGIN_AUDIO = 0x01, FOUND_PLUGIN_VIDEO = 0x02 -} FoundCodec; +} found_codec_e; /** * Enumeration of signal type @@ -151,10 +151,10 @@ typedef enum { MM_PLAYER_SIGNAL_TYPE_OTHERS, MM_PLAYER_SIGNAL_TYPE_ALL, MM_PLAYER_SIGNAL_TYPE_MAX = MM_PLAYER_SIGNAL_TYPE_ALL, -} MMPlayerSignalType; +} mmplayer_signal_type_e; /* main pipeline's element id */ -enum MainElementID { +typedef enum { MMPLAYER_M_PIPE = 0, /* NOTE : MMPLAYER_M_PIPE should be zero */ MMPLAYER_M_SRC, MMPLAYER_M_2ND_SRC, /* 2nd Source Element for es buff src */ @@ -192,10 +192,10 @@ enum MainElementID { MMPLAYER_M_A_INPUT_SELECTOR, // audio input_select MMPLAYER_M_T_INPUT_SELECTOR, // text input_select MMPLAYER_M_NUM -}; +} main_element_id_e; /* audio pipeline's element id */ -enum AudioElementID { +enum audio_element_id { MMPLAYER_A_BIN = 0, /* NOTE : MMPLAYER_A_BIN should be zero */ MMPLAYER_A_CONV, MMPLAYER_A_VOL, @@ -214,7 +214,7 @@ enum AudioElementID { }; /* video pipeline's element id */ -enum VideoElementID { +enum video_element_id { MMPLAYER_V_BIN = 0, /* NOTE : MMPLAYER_V_BIN should be zero */ MMPLAYER_V_CONV, MMPLAYER_V_CAPS, @@ -224,7 +224,7 @@ enum VideoElementID { }; /* text pipeline's element id */ -enum TextElementID { +enum text_element_id { MMPLAYER_T_BIN = 0, /* NOTE : MMPLAYER_V_BIN should be zero */ MMPLAYER_T_QUEUE, MMPLAYER_T_VIDEO_QUEUE, @@ -235,14 +235,7 @@ enum TextElementID { MMPLAYER_T_NUM }; -/* midi main pipeline's element id */ -enum MidiElementID { - MMPLAYER_MIDI_PIPE, - MMPLAYER_MIDI_PLAYER, - MMPLAYER_MIDI_NUM -}; - -enum PlayerCommandState { +typedef enum { MMPLAYER_COMMAND_NONE, MMPLAYER_COMMAND_CREATE, MMPLAYER_COMMAND_DESTROY, @@ -253,13 +246,13 @@ enum PlayerCommandState { MMPLAYER_COMMAND_PAUSE, MMPLAYER_COMMAND_RESUME, MMPLAYER_COMMAND_NUM -}; +} mmplayer_command_state_e; -/* Note : StreamingSrcError is error enum for streaming source which post error message +/* Note : mmplayer_streaming_src_error is error enum for streaming source which post error message * using custom message made by itself. The enum value must start with zero, * because the streaming source(secrtspsrc) also does. */ -enum StreamingSrcError { +enum mmplayer_streaming_src_error { MMPLAYER_STREAMING_ERROR_NONE = 0, MMPLAYER_STREAMING_ERROR_UNSUPPORTED_AUDIO, MMPLAYER_STREAMING_ERROR_UNSUPPORTED_VIDEO, @@ -312,13 +305,13 @@ typedef enum { MMPLAYER_SEEK_NONE = 0, MMPLAYER_SEEK_IN_PROGRESS, MMPLAYER_SEEK_COMPLETED, /* after getting async done but before posting seek complete */ -} MMPlayerSeekState; +} mmplayer_seek_state_e; typedef enum { MMPLAYER_PATH_VOD = 0, MMPLAYER_PATH_TEXT, MMPLAYER_PATH_MAX -} MMPlayerPathType; +} mmplayer_path_type_e; /* Video360 related enums. These are duplication from video360.h from * gst-plugins-tizen. @@ -330,7 +323,7 @@ typedef enum { VIDEO360_MODE_STEREOSCOPIC_LEFT_RIGHT = 2, VIDEO360_MODE_STEREOSCOPIC_STEREO_MESH = 3, VIDEO360_MODE_LAST_ITEM -} mm_player_stereo_mode_e; +} mmplayer_stereo_mode_e; typedef enum { VIDEO360_PROJECTION_TYPE_UNKNOWN = -1, @@ -338,7 +331,7 @@ typedef enum { VIDEO360_PROJECTION_TYPE_CUBEMAP = 1, VIDEO360_PROJECTION_TYPE_MESH = 2, VIDEO360_PROJECTION_TYPE_LAST_ITEM -} mm_player_projection_type_e; +} mmplayer_projection_type_e; /* Spatial audio related enums. These are duplication from mm_file.h from * libmm-fileinfo. @@ -347,21 +340,21 @@ typedef enum { MMFILE_AMBISONIC_TYPE_UNKNOWN = 0, MMFILE_AMBISONIC_TYPE_PERIPHONIC = 1, /**< To comply with Google's Spatial Audio RFC*/ MMFILE_AMBISONIC_TYPE_NON_PERIPHONIC = 2, -} MMFILE_AMBISONIC_TYPE; +} mmfile_ambisonic_type_e; typedef enum { MMFILE_AMBISONIC_FORMAT_UNKNOWN = 0, MMFILE_AMBISONIC_FORMAT_AMBIX = 1, /**< AMBIX (Channel sequence: ACN, Normalization: SN3D) */ MMFILE_AMBISONIC_FORMAT_AMB = 2, /**< .AMB, Tetraproc (Channel sequence: FuMa, Normalization: FuMa) */ MMFILE_AMBISONIC_FORMAT_UA = 3, /**< Universal Ambisonics (Channel sequence: SID, Normalization: N3D) */ -} MMFILE_AMBISONIC_FORMAT; +} mmfile_ambisonic_format_e; typedef enum { MMFILE_AMBISONIC_ORDER_UNKNOWN = 0, MMFILE_AMBISONIC_ORDER_FOA = 1, /**< First order Ambisonics */ MMFILE_AMBISONIC_ORDER_SOA = 2, /**< Second order Ambisonics */ MMFILE_AMBISONIC_ORDER_TOA = 3, /**< Third order Ambisonics */ -} MMFILE_AMBISONIC_ORDER; +} mmfile_ambisonic_order_e; /*--------------------------------------------------------------------------- | GLOBAL DATA TYPE DEFINITIONS: | @@ -370,15 +363,15 @@ typedef enum { typedef struct { int id; GstElement *gst; -} MMPlayerGstElement; +} mmplayer_gst_element_t; typedef struct { GstTagList *tag_list; - MMPlayerGstElement *mainbin; - MMPlayerGstElement *audiobin; - MMPlayerGstElement *videobin; - MMPlayerGstElement *textbin; -} MMPlayerGstPipelineInfo; + mmplayer_gst_element_t *mainbin; + mmplayer_gst_element_t *audiobin; + mmplayer_gst_element_t *videobin; + mmplayer_gst_element_t *textbin; +} mmplayer_pipeline_info_t; typedef struct { float volume; @@ -386,61 +379,61 @@ typedef struct { int bluetooth; /* enable/disable */ int focus_id; bool rg_enable; -} MMPlayerSoundInfo; +} mmplayer_sound_info_t; typedef struct { char *buf; int len; int offset; -} MMPlayerInputBuffer; +} mmplayer_input_buffer_t; typedef struct { int uri_type; - MMPlayerInputBuffer input_mem; + mmplayer_input_buffer_t input_mem; char uri[MM_MAX_URL_LEN]; char urgent[MM_MAX_FILENAME_LEN]; -} MMPlayerParseProfile; +} mmplayer_parse_profile_t; typedef struct { storage_type_e type; storage_state_e state; int id; char path[MM_MAX_URL_LEN]; -} MMPlayerStorageInfo; +} mmplayer_storage_info_t; typedef struct { bool is_pending; gint64 pos; -} MMPlayerPendingSeek; +} mmplayer_pending_seek_t; typedef struct { GObject *obj; gulong sig; -} MMPlayerSignalItem; +} mmplayer_signal_item_t; typedef struct { bool rich_audio; bool video_zc; // video zero-copy bool subtitle_off; bool media_packet_video_stream; -} MMPlayerSetMode; +} mmplayer_setting_mode_t; /* FIXME: renaming */ typedef struct { GMainContext *global_default; GMainContext *thread_default; -} MMPlayerGMainContext; +} mmplayer_context_info_t; typedef struct { gint uri_idx; GList *uri_list; -} MMPlayerUriList; +} mmplayer_uri_list_t; typedef struct { double scale_x; double scale_y; double scale_width; double scale_height; -} MMPlayerVideoROI; +} mmplayer_video_roi_t; typedef struct { gint active_pad_index; @@ -448,7 +441,7 @@ typedef struct { GPtrArray *channels; gulong block_id; gulong event_probe_id; -} mm_player_selector_t; +} mmplayer_selector_t; typedef struct { gboolean running; @@ -460,7 +453,7 @@ typedef struct { GstSegment segment[MM_PLAYER_TRACK_TYPE_MAX]; gboolean update_segment[MM_PLAYER_TRACK_TYPE_MAX]; -} mm_player_gapless_t; +} mmplayer_gapless_t; typedef struct { int channel; @@ -471,7 +464,7 @@ typedef struct { void *pcm_data; int data_size; int buff_size; -} mm_player_audio_stream_buff_t; +} mmplayer_audio_stream_buff_t; /** * @brief data of video_bo_list @@ -481,18 +474,18 @@ typedef struct { typedef struct { gboolean used; void *bo; -} mm_player_video_bo_info_t; +} mmplayer_video_bo_info_t; typedef struct { gint bandwidth; gint width; gint height; -} VariantData; +} stream_variant_t; typedef struct { GList *var_list; - VariantData limit; -} MMAdaptiveVariantInfo; + stream_variant_t limit; +} mmplayer_adaptive_variant_info_t; typedef struct { int is_spherical; @@ -500,8 +493,8 @@ typedef struct { char *stitching_software; char *projection_type_string; char *stereo_mode_string; - mm_player_projection_type_e projection_type; - mm_player_stereo_mode_e stereo_mode; + mmplayer_projection_type_e projection_type; + mmplayer_stereo_mode_e stereo_mode; int source_count; int init_view_heading; int init_view_pitch; @@ -516,7 +509,7 @@ typedef struct { int ambisonic_type; int ambisonic_format; int ambisonic_order; -} mm_player_spherical_metadata_t; +} mmplayer_spherical_metadata_t; typedef struct { /* STATE */ @@ -539,15 +532,15 @@ typedef struct { gboolean gapless_play_thread_exit; GCond gapless_play_thread_cond; GMutex gapless_play_thread_mutex; - mm_player_gapless_t gapless; + mmplayer_gapless_t gapless; /* capture thread */ GThread *capture_thread; gboolean capture_thread_exit; GCond capture_thread_cond; GMutex capture_thread_mutex; - MMPlayerVideoCapture capture; - MMPlayerVideoColorspace video_cs; + mmplayer_video_capture_t capture; + mmplayer_video_color_space_e video_cs; MMVideoBuffer captured; /* gst bus msg thread, create during realize */ @@ -570,10 +563,10 @@ typedef struct { void *msg_cb_param; /* streaming player */ - mm_player_streaming_t *streamer; + mmplayer_streaming_t *streamer; /* gstreamer pipeline */ - MMPlayerGstPipelineInfo *pipeline; + mmplayer_pipeline_info_t *pipeline; /* pad */ GstPad *ghost_pad_for_videobin; @@ -603,7 +596,7 @@ typedef struct { void *video_stream_cb_user_param; GCond video_bo_cond; GMutex video_bo_mutex; - GList *video_bo_list; /* mm_player_video_bo_info_t, bo list for decoded video data by sw codec */ + GList *video_bo_list; /* mmplayer_video_bo_info_t, bo list for decoded video data by sw codec */ int video_bo_size; bool video_stream_prerolled; @@ -611,13 +604,13 @@ typedef struct { mm_player_audio_stream_callback audio_stream_render_cb; void *audio_stream_cb_user_param; bool audio_stream_sink_sync; - GList *audio_stream_buff_list; /* mm_player_audio_stream_buff_t, buff list of extract pcm data */ + GList *audio_stream_buff_list; /* mmplayer_audio_stream_buff_t, buff list of extract pcm data */ /* video capture callback*/ gulong video_capture_cb_probe_id; /* sound info */ - MMPlayerSoundInfo sound; + mmplayer_sound_info_t sound; /* type string */ gchar *type; @@ -626,12 +619,12 @@ typedef struct { GstCaps *v_stream_caps; /* audio effect infomation */ - MMAudioEffectInfo audio_effect_info; + mm_audio_effect_info_t audio_effect_info; gboolean bypass_audio_effect; /* content profile */ - MMPlayerParseProfile profile; - MMPlayerStorageInfo storage_info[MMPLAYER_PATH_MAX]; + mmplayer_parse_profile_t profile; + mmplayer_storage_info_t storage_info[MMPLAYER_PATH_MAX]; /* streaming service type */ MMStreamingType streaming_type; @@ -672,7 +665,7 @@ typedef struct { gint textsink_linked; /* missing plugin during autoplugging */ - MissingCodec not_supported_codec; + missing_codec_e not_supported_codec; /* unlinked audio/video mime type */ gchar *unlinked_video_mime; @@ -680,13 +673,13 @@ typedef struct { gchar *unlinked_demuxer_mime; /* found codec during autoplugging */ - FoundCodec can_support_codec; + found_codec_e can_support_codec; gboolean not_found_demuxer; /* support seek even though player is not start */ - MMPlayerPendingSeek pending_seek; - MMPlayerSeekState seek_state; + mmplayer_pending_seek_t pending_seek; + mmplayer_seek_state_e seek_state; /* prevent to post msg over and over */ gboolean msg_posted; @@ -699,8 +692,8 @@ typedef struct { guint bus_watcher; GQueue *bus_msg_q; GMutex bus_msg_q_lock; - MMPlayerGMainContext context; - MMPlayerUriList uri_info; + mmplayer_context_info_t context; + mmplayer_uri_list_t uri_info; gboolean is_sound_extraction; @@ -743,15 +736,15 @@ typedef struct { /* To store the current running audio pad index of demuxer */ gint demux_pad_index; - mm_player_selector_t selector[MM_PLAYER_TRACK_TYPE_MAX]; + mmplayer_selector_t selector[MM_PLAYER_TRACK_TYPE_MAX]; guint internal_text_idx; guint external_text_idx; - MMPlayerSetMode set_mode; + mmplayer_setting_mode_t set_mode; /* initialize values */ - mm_player_ini_t ini; + mmplayer_ini_t ini; /* store dump pad list */ GList *dump_list; @@ -772,13 +765,13 @@ typedef struct { /* tmb buffer manager for s/w codec tmb_bo */ tbm_bufmgr bufmgr; - MMAdaptiveVariantInfo adaptive_info; + mmplayer_adaptive_variant_info_t adaptive_info; /* Video360 related stuff * */ gboolean is_360_feature_enabled; gboolean is_content_spherical; - mm_player_spherical_metadata_t video360_metadata; + mmplayer_spherical_metadata_t video360_metadata; gboolean is_openal_plugin_used; /* User settable values */ gboolean is_video360_enabled; @@ -789,24 +782,24 @@ typedef struct { int video360_vertical_fov; /* Video ROI area scale value */ - MMPlayerVideoROI video_roi; + mmplayer_video_roi_t video_roi; /* build audio offload */ gboolean build_audio_offload; guint audio_device_cb_id; -} mm_player_t; +} mmplayer_t; typedef struct { gchar *language_code; gchar *language_key; gboolean active; -} MMPlayerLangStruct; +} mmplayer_lang_info_t; typedef struct { GstPad *dump_pad; gulong probe_handle_id; FILE *dump_element_file; -} mm_player_dump_t; +} mmplayer_dump_t; typedef struct { char *name; @@ -816,7 +809,7 @@ typedef struct { int valid_type; // validity type int value_min; //<- set validity value range int value_max; //-> -} MMPlayerAttrsSpec; +} mmplayer_attrs_spec_t; /*=========================================================================================== | | @@ -832,8 +825,8 @@ int _mmplayer_destroy(MMHandleType hplayer); int _mmplayer_realize(MMHandleType hplayer); int _mmplayer_unrealize(MMHandleType hplayer); int _mmplayer_get_state(MMHandleType hplayer, int *pstate); -int _mmplayer_set_volume(MMHandleType hplayer, MMPlayerVolumeType volume); -int _mmplayer_get_volume(MMHandleType hplayer, MMPlayerVolumeType *volume); +int _mmplayer_set_volume(MMHandleType hplayer, mmplayer_volume_type_t volume); +int _mmplayer_get_volume(MMHandleType hplayer, mmplayer_volume_type_t *volume); int _mmplayer_set_mute(MMHandleType hplayer, int mute); int _mmplayer_get_mute(MMHandleType hplayer, int *pmute); int _mmplayer_start(MMHandleType hplayer); @@ -844,7 +837,7 @@ int _mmplayer_resume(MMHandleType hplayer); int _mmplayer_set_position(MMHandleType hplayer, gint64 pos); int _mmplayer_get_position(MMHandleType hplayer, gint64 *pos); int _mmplayer_get_duration(MMHandleType hplayer, gint64 *duration); -int _mmplayer_adjust_subtitle_postion(MMHandleType hplayer, int format, int pos); +int _mmplayer_adjust_subtitle_postion(MMHandleType hplayer, int pos); int _mmplayer_set_playspeed(MMHandleType hplayer, float rate, bool streaming); int _mmplayer_set_message_callback(MMHandleType hplayer, MMMessageCallback callback, void *user_param); int _mmplayer_set_videostream_changed_cb(MMHandleType hplayer, mm_player_stream_changed_callback callback, void *user_param); @@ -854,12 +847,12 @@ int _mmplayer_set_subtitle_silent(MMHandleType hplayer, int silent); int _mmplayer_get_subtitle_silent(MMHandleType hplayer, int *silent); int _mmplayer_set_external_subtitle_path(MMHandleType hplayer, const char *filepath); int _mmplayer_get_buffer_position(MMHandleType hplayer, int *start_pos, int *end_pos); -int _mmplayer_update_video_param(mm_player_t *player, char *param_name); +int _mmplayer_update_video_param(mmplayer_t *player, char *param_name); int _mmplayer_change_videosink(MMHandleType handle, MMDisplaySurfaceType surface_type, void *display_overlay); -int _mmplayer_audio_effect_custom_apply(mm_player_t *player); +int _mmplayer_audio_effect_custom_apply(mmplayer_t *player); int _mmplayer_set_audiostream_cb(MMHandleType hplayer, bool sync, mm_player_audio_stream_callback callback, void *user_param); -int _mmplayer_change_track_language(MMHandleType hplayer, MMPlayerTrackType type, int index); -int _mmplayer_sync_subtitle_pipeline(mm_player_t *player); +int _mmplayer_change_track_language(MMHandleType hplayer, mmplayer_track_type_e type, int index); +int _mmplayer_sync_subtitle_pipeline(mmplayer_t *player); int _mmplayer_use_system_clock(MMHandleType hplayer); int _mmplayer_set_uri(MMHandleType hplayer, const char *uri); int _mmplayer_set_next_uri(MMHandleType hplayer, const char *uri, bool is_first_path); @@ -869,14 +862,14 @@ void _mm_player_video_stream_internal_buffer_unref(void *buffer); int _mmplayer_get_timeout(MMHandleType hplayer, int *timeout); int _mmplayer_get_num_of_video_out_buffers(MMHandleType hplayer, int *num, int *extra_num); int _mmplayer_manage_external_storage_state(MMHandleType hplayer, int id, int state); -int _mmplayer_video_stream_release_bo(mm_player_t *player, void *bo); +int _mmplayer_video_stream_release_bo(mmplayer_t *player, void *bo); int _mmplayer_get_adaptive_variant_info(MMHandleType hplayer, int *num, char **var_info); int _mmplayer_set_max_adaptive_variant_limit(MMHandleType hplayer, int bandwidth, int width, int height); int _mmplayer_get_max_adaptive_variant_limit(MMHandleType hplayer, int *bandwidth, int *width, int *height); int _mmplayer_set_audio_only(MMHandleType hplayer, bool audio_only); int _mmplayer_get_audio_only(MMHandleType hplayer, bool *paudio_only); int _mmplayer_get_streaming_buffering_time(MMHandleType hplayer, int *prebuffer_ms, int *rebuffer_ms); -int _mmplayer_set_codec_type(MMHandleType hplayer, MMPlayerStreamType stream_type, MMPlayerVideoCodecType codec_type); +int _mmplayer_set_codec_type(MMHandleType hplayer, mmplayer_stream_type_e stream_type, mmplayer_video_codec_type_e codec_type); int _mmplayer_set_replaygain_enabled(MMHandleType hplayer, bool enabled); int _mmplayer_is_replaygain_enabled(MMHandleType hplayer, bool *enabled); int _mmplayer_set_video_roi_area(MMHandleType hplayer, double scale_x, double scale_y, double scale_width, double scale_height); @@ -885,24 +878,24 @@ int _mmplayer_get_video_roi_area(MMHandleType hplayer, double *scale_x, double * /* internal */ void __mmplayer_bus_msg_thread_destroy(MMHandleType hplayer); -void __mmplayer_set_state(mm_player_t *player, int state); -int __mmplayer_check_state(mm_player_t *player, enum PlayerCommandState command); -gboolean __mmplayer_update_content_attrs(mm_player_t *player, enum content_attr_flag flag); -void __mmplayer_cancel_eos_timer(mm_player_t *player); -void __mmplayer_audio_stream_clear_buffer(mm_player_t *player, gboolean send_all); -MMStreamingType __mmplayer_get_stream_service_type(mm_player_t *player); -int __mmplayer_get_video_angle(mm_player_t *player, int *display_angle, int *orientations); -gboolean __mmplayer_gst_remove_fakesink(mm_player_t *player, MMPlayerGstElement *fakesink); -void __mmplayer_add_signal_connection(mm_player_t *player, GObject *object, MMPlayerSignalType type, const gchar *signal, GCallback cb_funct, gpointer u_data); +void __mmplayer_set_state(mmplayer_t *player, int state); +int __mmplayer_check_state(mmplayer_t *player, mmplayer_command_state_e command); +gboolean __mmplayer_update_content_attrs(mmplayer_t *player, enum content_attr_flag flag); +void __mmplayer_cancel_eos_timer(mmplayer_t *player); +void __mmplayer_audio_stream_clear_buffer(mmplayer_t *player, gboolean send_all); +MMStreamingType __mmplayer_get_stream_service_type(mmplayer_t *player); +int __mmplayer_get_video_angle(mmplayer_t *player, int *display_angle, int *orientations); +gboolean __mmplayer_gst_remove_fakesink(mmplayer_t *player, mmplayer_gst_element_t *fakesink); +void __mmplayer_add_signal_connection(mmplayer_t *player, GObject *object, mmplayer_signal_type_e type, const gchar *signal, GCallback cb_funct, gpointer u_data); void __mmplayer_gst_decode_pad_added(GstElement *elem, GstPad *pad, gpointer data); gint __mmplayer_gst_decode_autoplug_select(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *factory, gpointer data); -gboolean __mmplayer_gst_create_decoder(mm_player_t *player, GstPad *srcpad, const GstCaps *caps); +gboolean __mmplayer_gst_create_decoder(mmplayer_t *player, GstPad *srcpad, const GstCaps *caps); void __mmplayer_gst_element_added(GstElement *bin, GstElement *element, gpointer data); -GstElement *__mmplayer_gst_make_decodebin(mm_player_t *player); +GstElement *__mmplayer_gst_make_decodebin(mmplayer_t *player); int __mmplayer_gst_element_add_bucket_to_bin(GstBin *bin, GList *element_bucket); int __mmplayer_gst_element_link_bucket(GList *element_bucket); void __mmplayer_typefind_have_type(GstElement *tf, guint probability, GstCaps *caps, gpointer data); -int __mmplayer_parse_profile(const char *uri, void *param, MMPlayerParseProfile *data); +int __mmplayer_parse_profile(const char *uri, void *param, mmplayer_parse_profile_t *data); #ifdef __cplusplus diff --git a/src/include/mm_player_streaming.h b/src/include/mm_player_streaming.h index 5e40663..dc8965b 100644 --- a/src/include/mm_player_streaming.h +++ b/src/include/mm_player_streaming.h @@ -87,7 +87,7 @@ } while (0) #define PLAYER_BUFFER_CAST(handle) ((streaming_buffer_t *)(handle)) -#define PLAYER_STREAM_CAST(sr) ((mm_player_streaming_t *)(sr)) +#define PLAYER_STREAM_CAST(sr) ((mmplayer_streaming_t *)(sr)) #define GET_CURRENT_BUFFERING_BYTE(handle) (PLAYER_BUFFER_CAST(handle)->buffering_bytes) #define GET_CURRENT_BUFFERING_TIME(handle) (PLAYER_BUFFER_CAST(handle)->buffering_time) @@ -103,23 +103,23 @@ typedef enum { BUFFER_TYPE_MUXED = BUFFER_TYPE_DEFAULT, /* queue2 */ BUFFER_TYPE_DEMUXED, /* multi Q in decodebin */ BUFFER_TYPE_MAX, -} BufferType; +} buffer_type_e; typedef enum { MUXED_BUFFER_TYPE_MEM_QUEUE, /* push mode in queue2 */ MUXED_BUFFER_TYPE_MEM_RING_BUFFER, /* pull mode in queue2 */ MUXED_BUFFER_TYPE_MAX, -} MuxedBufferType; +} muxed_buffer_type_e; typedef enum { MM_PLAYER_BUFFERING_DEFAULT = 0x00, MM_PLAYER_BUFFERING_IN_PROGRESS = 0x01, MM_PLAYER_BUFFERING_ABORT = 0x02, MM_PLAYER_BUFFERING_COMPLETE = 0x04, -} MMPlayerBufferingState; +} mmplayer_buffering_state_e; typedef struct { - MMPlayerBufferingMode mode; + mmplayer_buffering_mode_e mode; gboolean is_pre_buffering; gint prebuffer_time; /* ms */ gint rebuffer_time; /* ms */ @@ -143,13 +143,13 @@ typedef struct { } streaming_default_t; typedef struct { - BufferType streaming_buffer_type; + buffer_type_e streaming_buffer_type; streaming_buffer_t buffer_handle[BUFFER_TYPE_MAX]; /* front buffer : queue2 */ streaming_requirement_t buffering_req; streaming_default_t default_val; - MMPlayerBufferingState buffering_state; + mmplayer_buffering_state_e buffering_state; gboolean is_adaptive_streaming; gint buffering_percent; @@ -158,25 +158,25 @@ typedef struct { gboolean need_update; gboolean need_sync; gint ring_buffer_size; -} mm_player_streaming_t; +} mmplayer_streaming_t; -mm_player_streaming_t *__mm_player_streaming_create(void); +mmplayer_streaming_t *__mm_player_streaming_create(void); -void __mm_player_streaming_initialize(mm_player_streaming_t *streaming_player, gboolean buffer_init); +void __mm_player_streaming_initialize(mmplayer_streaming_t *streaming_player, gboolean buffer_init); -void __mm_player_streaming_destroy(mm_player_streaming_t *streaming_player); +void __mm_player_streaming_destroy(mmplayer_streaming_t *streaming_player); -void __mm_player_streaming_set_queue2(mm_player_streaming_t *streamer, GstElement *buffer, - gboolean use_buffering, MuxedBufferType type, guint64 content_size); +void __mm_player_streaming_set_queue2(mmplayer_streaming_t *streamer, GstElement *buffer, + gboolean use_buffering, muxed_buffer_type_e type, guint64 content_size); -void __mm_player_streaming_set_multiqueue(mm_player_streaming_t *streamer, GstElement *buffer); +void __mm_player_streaming_set_multiqueue(mmplayer_streaming_t *streamer, GstElement *buffer); -void __mm_player_streaming_sync_property(mm_player_streaming_t *streamer, GstElement *decodebin); +void __mm_player_streaming_sync_property(mmplayer_streaming_t *streamer, GstElement *decodebin); -void __mm_player_streaming_buffering(mm_player_streaming_t *streamer, GstMessage *buffering_msg, +void __mm_player_streaming_buffering(mmplayer_streaming_t *streamer, GstMessage *buffering_msg, guint64 content_size, gint64 position, gint64 duration); -void __mm_player_streaming_set_content_bitrate(mm_player_streaming_t *streaming_player, guint max_bitrate, guint avg_bitrate); +void __mm_player_streaming_set_content_bitrate(mmplayer_streaming_t *streaming_player, guint max_bitrate, guint avg_bitrate); #endif diff --git a/src/include/mm_player_tracks.h b/src/include/mm_player_tracks.h index cef29e1..c2e2105 100644 --- a/src/include/mm_player_tracks.h +++ b/src/include/mm_player_tracks.h @@ -31,21 +31,21 @@ #define DEFAULT_TRACK 0 -void __mmplayer_track_initialize(mm_player_t *player); +void __mmplayer_track_initialize(mmplayer_t *player); -void __mmplayer_track_destroy(mm_player_t *player); +void __mmplayer_track_destroy(mmplayer_t *player); -void __mmplayer_track_update_selector_info(mm_player_t *player, MMPlayerTrackType type, GstPad *sinkpad); +void __mmplayer_track_update_selector_info(mmplayer_t *player, mmplayer_track_type_e type, GstPad *sinkpad); -void __mmplayer_track_update_text_attr_info(mm_player_t *player, GstMessage *msg); +void __mmplayer_track_update_text_attr_info(mmplayer_t *player, GstMessage *msg); -int _mmplayer_get_track_count(MMHandleType hplayer, MMPlayerTrackType type, int *count); +int _mmplayer_get_track_count(MMHandleType hplayer, mmplayer_track_type_e type, int *count); -int _mmplayer_select_track(MMHandleType hplayer, MMPlayerTrackType type, int index); +int _mmplayer_select_track(MMHandleType hplayer, mmplayer_track_type_e type, int index); -int _mmplayer_get_track_language_code(MMHandleType hplayer, MMPlayerTrackType type, int index, char **code); +int _mmplayer_get_track_language_code(MMHandleType hplayer, mmplayer_track_type_e type, int index, char **code); -int _mmplayer_get_current_track(MMHandleType hplayer, MMPlayerTrackType type, int *index); +int _mmplayer_get_current_track(MMHandleType hplayer, mmplayer_track_type_e type, int *index); #ifdef __cplusplus } #endif diff --git a/src/include/mm_player_utils.h b/src/include/mm_player_utils.h index 754e8cf..88946f1 100644 --- a/src/include/mm_player_utils.h +++ b/src/include/mm_player_utils.h @@ -57,61 +57,61 @@ } \ } while (0) -#define MMPLAYER_GET_ATTRS(x_player) ((mm_player_t *)x_player)->attrs +#define MMPLAYER_GET_ATTRS(x_player) ((mmplayer_t *)x_player)->attrs /* command */ -#define MMPLAYER_CMD_LOCK(x_player) g_mutex_lock(&((mm_player_t *)x_player)->cmd_lock) -#define MMPLAYER_CMD_TRYLOCK(x_player) g_mutex_trylock(&((mm_player_t *)x_player)->cmd_lock) -#define MMPLAYER_CMD_UNLOCK(x_player) g_mutex_unlock(&((mm_player_t *)x_player)->cmd_lock) +#define MMPLAYER_CMD_LOCK(x_player) g_mutex_lock(&((mmplayer_t *)x_player)->cmd_lock) +#define MMPLAYER_CMD_TRYLOCK(x_player) g_mutex_trylock(&((mmplayer_t *)x_player)->cmd_lock) +#define MMPLAYER_CMD_UNLOCK(x_player) g_mutex_unlock(&((mmplayer_t *)x_player)->cmd_lock) /* playback */ -#define MMPLAYER_PLAYBACK_LOCK(x_player) g_mutex_lock(&((mm_player_t *)x_player)->playback_lock) -#define MMPLAYER_PLAYBACK_UNLOCK(x_player) g_mutex_unlock(&((mm_player_t *)x_player)->playback_lock) +#define MMPLAYER_PLAYBACK_LOCK(x_player) g_mutex_lock(&((mmplayer_t *)x_player)->playback_lock) +#define MMPLAYER_PLAYBACK_UNLOCK(x_player) g_mutex_unlock(&((mmplayer_t *)x_player)->playback_lock) /* capture thread */ -#define MMPLAYER_CAPTURE_THREAD_LOCK(x_player) g_mutex_lock(&((mm_player_t *)x_player)->capture_thread_mutex) -#define MMPLAYER_CAPTURE_THREAD_UNLOCK(x_player) g_mutex_unlock(&((mm_player_t *)x_player)->capture_thread_mutex) -#define MMPLAYER_CAPTURE_THREAD_WAIT(x_player) g_cond_wait(&((mm_player_t *)x_player)->capture_thread_cond, &((mm_player_t *)x_player)->capture_thread_mutex) -#define MMPLAYER_CAPTURE_THREAD_SIGNAL(x_player) g_cond_signal(&((mm_player_t *)x_player)->capture_thread_cond); +#define MMPLAYER_CAPTURE_THREAD_LOCK(x_player) g_mutex_lock(&((mmplayer_t *)x_player)->capture_thread_mutex) +#define MMPLAYER_CAPTURE_THREAD_UNLOCK(x_player) g_mutex_unlock(&((mmplayer_t *)x_player)->capture_thread_mutex) +#define MMPLAYER_CAPTURE_THREAD_WAIT(x_player) g_cond_wait(&((mmplayer_t *)x_player)->capture_thread_cond, &((mmplayer_t *)x_player)->capture_thread_mutex) +#define MMPLAYER_CAPTURE_THREAD_SIGNAL(x_player) g_cond_signal(&((mmplayer_t *)x_player)->capture_thread_cond); /* gapless play thread */ -#define MMPLAYER_GAPLESS_PLAY_THREAD_LOCK(x_player) g_mutex_lock(&((mm_player_t *)x_player)->gapless_play_thread_mutex) -#define MMPLAYER_GAPLESS_PLAY_THREAD_UNLOCK(x_player) g_mutex_unlock(&((mm_player_t *)x_player)->gapless_play_thread_mutex) -#define MMPLAYER_GAPLESS_PLAY_THREAD_WAIT(x_player) g_cond_wait(&((mm_player_t *)x_player)->gapless_play_thread_cond, &((mm_player_t *)x_player)->gapless_play_thread_mutex) -#define MMPLAYER_GAPLESS_PLAY_THREAD_SIGNAL(x_player) g_cond_signal(&((mm_player_t *)x_player)->gapless_play_thread_cond); +#define MMPLAYER_GAPLESS_PLAY_THREAD_LOCK(x_player) g_mutex_lock(&((mmplayer_t *)x_player)->gapless_play_thread_mutex) +#define MMPLAYER_GAPLESS_PLAY_THREAD_UNLOCK(x_player) g_mutex_unlock(&((mmplayer_t *)x_player)->gapless_play_thread_mutex) +#define MMPLAYER_GAPLESS_PLAY_THREAD_WAIT(x_player) g_cond_wait(&((mmplayer_t *)x_player)->gapless_play_thread_cond, &((mmplayer_t *)x_player)->gapless_play_thread_mutex) +#define MMPLAYER_GAPLESS_PLAY_THREAD_SIGNAL(x_player) g_cond_signal(&((mmplayer_t *)x_player)->gapless_play_thread_cond); /* gst bus msg thread */ -#define MMPLAYER_BUS_MSG_THREAD_LOCK(x_player) g_mutex_lock(&((mm_player_t *)x_player)->bus_msg_thread_mutex) -#define MMPLAYER_BUS_MSG_THREAD_UNLOCK(x_player) g_mutex_unlock(&((mm_player_t *)x_player)->bus_msg_thread_mutex) -#define MMPLAYER_BUS_MSG_THREAD_WAIT(x_player) g_cond_wait(&((mm_player_t *)x_player)->bus_msg_thread_cond, &((mm_player_t *)x_player)->bus_msg_thread_mutex) -#define MMPLAYER_BUS_MSG_THREAD_WAIT_UNTIL(x_player, end_time) g_cond_wait_until(&((mm_player_t *)x_player)->bus_msg_thread_cond, &((mm_player_t *)x_player)->bus_msg_thread_mutex, end_time) -#define MMPLAYER_BUS_MSG_THREAD_SIGNAL(x_player) g_cond_signal(&((mm_player_t *)x_player)->bus_msg_thread_cond); +#define MMPLAYER_BUS_MSG_THREAD_LOCK(x_player) g_mutex_lock(&((mmplayer_t *)x_player)->bus_msg_thread_mutex) +#define MMPLAYER_BUS_MSG_THREAD_UNLOCK(x_player) g_mutex_unlock(&((mmplayer_t *)x_player)->bus_msg_thread_mutex) +#define MMPLAYER_BUS_MSG_THREAD_WAIT(x_player) g_cond_wait(&((mmplayer_t *)x_player)->bus_msg_thread_cond, &((mmplayer_t *)x_player)->bus_msg_thread_mutex) +#define MMPLAYER_BUS_MSG_THREAD_WAIT_UNTIL(x_player, end_time) g_cond_wait_until(&((mmplayer_t *)x_player)->bus_msg_thread_cond, &((mmplayer_t *)x_player)->bus_msg_thread_mutex, end_time) +#define MMPLAYER_BUS_MSG_THREAD_SIGNAL(x_player) g_cond_signal(&((mmplayer_t *)x_player)->bus_msg_thread_cond); /* handling fakesink */ -#define MMPLAYER_FSINK_LOCK(x_player) g_mutex_lock(&((mm_player_t *)x_player)->fsink_lock) -#define MMPLAYER_FSINK_UNLOCK(x_player) g_mutex_unlock(&((mm_player_t *)x_player)->fsink_lock) +#define MMPLAYER_FSINK_LOCK(x_player) g_mutex_lock(&((mmplayer_t *)x_player)->fsink_lock) +#define MMPLAYER_FSINK_UNLOCK(x_player) g_mutex_unlock(&((mmplayer_t *)x_player)->fsink_lock) /* handling update tag */ -#define MMPLAYER_UPDATE_TAG_LOCK(x_player) g_mutex_lock(&((mm_player_t *)x_player)->update_tag_lock) -#define MMPLAYER_UPDATE_TAG_UNLOCK(x_player) g_mutex_unlock(&((mm_player_t *)x_player)->update_tag_lock) +#define MMPLAYER_UPDATE_TAG_LOCK(x_player) g_mutex_lock(&((mmplayer_t *)x_player)->update_tag_lock) +#define MMPLAYER_UPDATE_TAG_UNLOCK(x_player) g_mutex_unlock(&((mmplayer_t *)x_player)->update_tag_lock) /* video stream bo */ -#define MMPLAYER_VIDEO_BO_LOCK(x_player) g_mutex_lock(&((mm_player_t *)x_player)->video_bo_mutex) -#define MMPLAYER_VIDEO_BO_UNLOCK(x_player) g_mutex_unlock(&((mm_player_t *)x_player)->video_bo_mutex) -#define MMPLAYER_VIDEO_BO_WAIT(x_player) g_cond_wait(&((mm_player_t *)x_player)->video_bo_cond, &((mm_player_t *)x_player)->video_bo_mutex) -#define MMPLAYER_VIDEO_BO_WAIT_UNTIL(x_player, end_time) g_cond_wait_until(&((mm_player_t *)x_player)->video_bo_cond, &((mm_player_t *)x_player)->video_bo_mutex, end_time) -#define MMPLAYER_VIDEO_BO_SIGNAL(x_player) g_cond_signal(&((mm_player_t *)x_player)->video_bo_cond); +#define MMPLAYER_VIDEO_BO_LOCK(x_player) g_mutex_lock(&((mmplayer_t *)x_player)->video_bo_mutex) +#define MMPLAYER_VIDEO_BO_UNLOCK(x_player) g_mutex_unlock(&((mmplayer_t *)x_player)->video_bo_mutex) +#define MMPLAYER_VIDEO_BO_WAIT(x_player) g_cond_wait(&((mmplayer_t *)x_player)->video_bo_cond, &((mmplayer_t *)x_player)->video_bo_mutex) +#define MMPLAYER_VIDEO_BO_WAIT_UNTIL(x_player, end_time) g_cond_wait_until(&((mmplayer_t *)x_player)->video_bo_cond, &((mmplayer_t *)x_player)->video_bo_mutex, end_time) +#define MMPLAYER_VIDEO_BO_SIGNAL(x_player) g_cond_signal(&((mmplayer_t *)x_player)->video_bo_cond); /* media stream lock */ -#define MMPLAYER_MEDIA_STREAM_CALLBACK_LOCK(x_player) g_mutex_lock(&((mm_player_t *)x_player)->media_stream_cb_lock) -#define MMPLAYER_MEDIA_STREAM_CALLBACK_UNLOCK(x_player) g_mutex_unlock(&((mm_player_t *)x_player)->media_stream_cb_lock) +#define MMPLAYER_MEDIA_STREAM_CALLBACK_LOCK(x_player) g_mutex_lock(&((mmplayer_t *)x_player)->media_stream_cb_lock) +#define MMPLAYER_MEDIA_STREAM_CALLBACK_UNLOCK(x_player) g_mutex_unlock(&((mmplayer_t *)x_player)->media_stream_cb_lock) /* subtitle info */ -#define MMPLAYER_SUBTITLE_INFO_LOCK(x_player) g_mutex_lock(&((mm_player_t *)x_player)->subtitle_info_mutex) -#define MMPLAYER_SUBTITLE_INFO_UNLOCK(x_player) g_mutex_unlock(&((mm_player_t *)x_player)->subtitle_info_mutex) -#define MMPLAYER_SUBTITLE_INFO_WAIT(x_player) g_cond_wait(&((mm_player_t *)x_player)->subtitle_info_cond, &((mm_player_t *)x_player)->subtitle_info_mutex) -#define MMPLAYER_SUBTITLE_INFO_WAIT_UNTIL(x_player, end_time) g_cond_wait_until(&((mm_player_t *)x_player)->subtitle_info_cond, &((mm_player_t *)x_player)->subtitle_info_mutex, end_time) -#define MMPLAYER_SUBTITLE_INFO_SIGNAL(x_player) g_cond_signal(&((mm_player_t *)x_player)->subtitle_info_cond); +#define MMPLAYER_SUBTITLE_INFO_LOCK(x_player) g_mutex_lock(&((mmplayer_t *)x_player)->subtitle_info_mutex) +#define MMPLAYER_SUBTITLE_INFO_UNLOCK(x_player) g_mutex_unlock(&((mmplayer_t *)x_player)->subtitle_info_mutex) +#define MMPLAYER_SUBTITLE_INFO_WAIT(x_player) g_cond_wait(&((mmplayer_t *)x_player)->subtitle_info_cond, &((mmplayer_t *)x_player)->subtitle_info_mutex) +#define MMPLAYER_SUBTITLE_INFO_WAIT_UNTIL(x_player, end_time) g_cond_wait_until(&((mmplayer_t *)x_player)->subtitle_info_cond, &((mmplayer_t *)x_player)->subtitle_info_mutex, end_time) +#define MMPLAYER_SUBTITLE_INFO_SIGNAL(x_player) g_cond_signal(&((mmplayer_t *)x_player)->subtitle_info_cond); #if 0 #define MMPLAYER_FENTER(); LOGD(""); @@ -212,8 +212,8 @@ /* signal manipulation */ #define MMPLAYER_SIGNAL_CONNECT(x_player, x_object, x_type, x_signal, x_callback, x_arg) \ do { \ - MMPlayerSignalItem *item = NULL; \ - item = (MMPlayerSignalItem *)g_malloc(sizeof(MMPlayerSignalItem)); \ + mmplayer_signal_item_t *item = NULL; \ + item = (mmplayer_signal_item_t *)g_malloc(sizeof(mmplayer_signal_item_t)); \ if (!item) { \ LOGE("cannot connect signal [%s]", x_signal); \ } else { \ @@ -239,10 +239,10 @@ } while (0) /* state */ -#define MMPLAYER_PREV_STATE(x_player) ((mm_player_t *)x_player)->prev_state -#define MMPLAYER_CURRENT_STATE(x_player) ((mm_player_t *)x_player)->state -#define MMPLAYER_PENDING_STATE(x_player) ((mm_player_t *)x_player)->pending_state -#define MMPLAYER_TARGET_STATE(x_player) ((mm_player_t *)x_player)->target_state +#define MMPLAYER_PREV_STATE(x_player) ((mmplayer_t *)x_player)->prev_state +#define MMPLAYER_CURRENT_STATE(x_player) ((mmplayer_t *)x_player)->state +#define MMPLAYER_PENDING_STATE(x_player) ((mmplayer_t *)x_player)->pending_state +#define MMPLAYER_TARGET_STATE(x_player) ((mmplayer_t *)x_player)->target_state #define MMPLAYER_STATE_GET_NAME(state) __get_state_name(state) #define MMPLAYER_PRINT_STATE(x_player) \ @@ -254,7 +254,7 @@ MMPLAYER_STATE_GET_NAME(MMPLAYER_TARGET_STATE(x_player))); \ } while (0) -#define MMPLAYER_STATE_CHANGE_TIMEOUT(x_player) ((mm_player_t *)x_player)->state_change_timeout +#define MMPLAYER_STATE_CHANGE_TIMEOUT(x_player) ((mmplayer_t *)x_player)->state_change_timeout /* streaming */ #define MMPLAYER_IS_STREAMING(x_player) __is_streaming(x_player) @@ -280,25 +280,25 @@ const gchar *__get_state_name(int state); const gchar *__get_stream_type_name(int type); -gboolean __is_streaming(mm_player_t *player); -gboolean __is_rtsp_streaming(mm_player_t *player); -gboolean __is_live_streaming(mm_player_t *player); -gboolean __is_http_streaming(mm_player_t *player); -gboolean __is_http_live_streaming(mm_player_t *player); -gboolean __is_dash_streaming(mm_player_t *player); -gboolean __is_smooth_streaming(mm_player_t *player); -gboolean __is_ms_buff_src(mm_player_t *player); -gboolean __has_suffix(mm_player_t *player, const gchar *suffix); +gboolean __is_streaming(mmplayer_t *player); +gboolean __is_rtsp_streaming(mmplayer_t *player); +gboolean __is_live_streaming(mmplayer_t *player); +gboolean __is_http_streaming(mmplayer_t *player); +gboolean __is_http_live_streaming(mmplayer_t *player); +gboolean __is_dash_streaming(mmplayer_t *player); +gboolean __is_smooth_streaming(mmplayer_t *player); +gboolean __is_ms_buff_src(mmplayer_t *player); +gboolean __has_suffix(mmplayer_t *player, const gchar *suffix); -gboolean __mmplayer_post_message(mm_player_t *player, enum MMMessageType msgtype, MMMessageParamType *param); -gboolean __mmplayer_dump_pipeline_state(mm_player_t *player); +gboolean __mmplayer_post_message(mmplayer_t *player, enum MMMessageType msgtype, MMMessageParamType *param); +gboolean __mmplayer_dump_pipeline_state(mmplayer_t *player); bool util_is_sdp_file(const char *path); int util_exist_file_path(const char *file_path); char **util_get_cookie_list(const char *cookies); const char *util_get_charset(const char *file_path); int util_get_pixtype(unsigned int fourcc); -bool util_get_storage_info(const char *path, MMPlayerStorageInfo *storage_info); +bool util_get_storage_info(const char *path, mmplayer_storage_info_t *storage_info); #ifdef __cplusplus } diff --git a/src/mm_player.c b/src/mm_player.c index 3d19cc3..feeeae9 100644 --- a/src/mm_player.c +++ b/src/mm_player.c @@ -40,12 +40,12 @@ 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; @@ -112,10 +112,10 @@ 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); + g_mutex_clear(&((mmplayer_t *)player)->cmd_lock); + g_mutex_clear(&((mmplayer_t *)player)->playback_lock); - memset((mm_player_t *)player, 0x00, sizeof(mm_player_t)); + memset((mmplayer_t *)player, 0x00, sizeof(mmplayer_t)); /* free player */ g_free((void *)player); @@ -228,7 +228,7 @@ 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, mmplayer_volume_type_t *volume) { int result = MM_ERROR_NONE; @@ -244,7 +244,7 @@ int mm_player_set_volume(MMHandleType player, MMPlayerVolumeType *volume) return result; } -int mm_player_get_volume(MMHandleType player, MMPlayerVolumeType *volume) +int mm_player_get_volume(MMHandleType player, mmplayer_volume_type_t *volume) { int result = MM_ERROR_NONE; @@ -291,7 +291,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; @@ -474,20 +474,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_postion(player, pos); MMPLAYER_CMD_UNLOCK(player); @@ -554,7 +549,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 +563,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 +579,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 +594,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 +610,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 +746,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 +763,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 +780,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 +800,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 +817,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,7 +835,7 @@ 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 mm_player_set_media_stream_buffer_status_callback(MMHandleType player, mmplayer_stream_type_e type, mm_player_media_stream_buffer_status_callback callback, void *user_param) { int result = MM_ERROR_NONE; @@ -857,7 +852,7 @@ int mm_player_set_media_stream_buffer_status_callback(MMHandleType player, MMPla 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_set_media_stream_seek_data_callback(MMHandleType player, mmplayer_stream_type_e type, mm_player_media_stream_seek_data_callback callback, void *user_param) { int result = MM_ERROR_NONE; @@ -1227,7 +1222,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_video_codec_type_e codec_type) { int result = MM_ERROR_NONE; diff --git a/src/mm_player_360.c b/src/mm_player_360.c index a8c732c..6dfb03a 100644 --- a/src/mm_player_360.c +++ b/src/mm_player_360.c @@ -27,7 +27,7 @@ #include static bool -__mmplayer_check_video_360_used(mm_player_t *player) +__mmplayer_check_video_360_used(mmplayer_t *player) { /* check video 360 plugin is created */ MMPLAYER_RETURN_VAL_IF_FAIL(player && @@ -41,7 +41,7 @@ __mmplayer_check_video_360_used(mm_player_t *player) } static bool -__mmplayer_check_audio_sink(mm_player_t *player) +__mmplayer_check_audio_sink(mmplayer_t *player) { /* check audio sink is created */ MMPLAYER_RETURN_VAL_IF_FAIL(player && @@ -57,7 +57,7 @@ __mmplayer_check_audio_sink(mm_player_t *player) int _mmplayer_360_is_content_spherical(MMHandleType hplayer, bool *is_spherical) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player && player->pipeline, MM_ERROR_PLAYER_NOT_INITIALIZED); @@ -80,7 +80,7 @@ _mmplayer_360_is_content_spherical(MMHandleType hplayer, bool *is_spherical) int _mmplayer_360_set_enabled(MMHandleType hplayer, bool enabled) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED); @@ -104,7 +104,7 @@ _mmplayer_360_set_enabled(MMHandleType hplayer, bool enabled) int _mmplayer_360_is_enabled(MMHandleType hplayer, bool *enabled) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; gboolean is_enabled; MMPLAYER_FENTER(); @@ -131,7 +131,7 @@ _mmplayer_360_is_enabled(MMHandleType hplayer, bool *enabled) int _mmplayer_360_set_direction_of_view(MMHandleType hplayer, float yaw, float pitch) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED); @@ -169,7 +169,7 @@ _mmplayer_360_set_direction_of_view(MMHandleType hplayer, float yaw, float pitch int _mmplayer_360_get_direction_of_view(MMHandleType hplayer, float *yaw, float *pitch) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int yaw_degrees = 0; int pitch_degrees = 0; @@ -200,7 +200,7 @@ _mmplayer_360_get_direction_of_view(MMHandleType hplayer, float *yaw, float *pit int _mmplayer_360_set_zoom(MMHandleType hplayer, float level) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED); @@ -230,7 +230,7 @@ _mmplayer_360_set_zoom(MMHandleType hplayer, float level) int _mmplayer_360_get_zoom(MMHandleType hplayer, float *level) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; float current_zoom = 0.0; MMPLAYER_FENTER(); @@ -258,7 +258,7 @@ _mmplayer_360_get_zoom(MMHandleType hplayer, float *level) int _mmplayer_360_set_field_of_view(MMHandleType hplayer, int horizontal_degrees, int vertical_degrees) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED); @@ -288,7 +288,7 @@ _mmplayer_360_set_field_of_view(MMHandleType hplayer, int horizontal_degrees, in int _mmplayer_360_get_field_of_view(MMHandleType hplayer, int *horizontal_degrees, int *vertical_degrees) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED); diff --git a/src/mm_player_attrs.c b/src/mm_player_attrs.c index f1c1691..6df24d2 100644 --- a/src/mm_player_attrs.c +++ b/src/mm_player_attrs.c @@ -101,7 +101,7 @@ _mmplayer_set_attribute(MMHandleType handle, char **err_attr_name, const char * } int -_mmplayer_get_attributes_info(MMHandleType handle, const char *attribute_name, MMPlayerAttrsInfo *dst_info) +_mmplayer_get_attributes_info(MMHandleType handle, const char *attribute_name, mmplayer_attrs_info_t *dst_info) { int result = MM_ERROR_NONE; MMHandleType attrs = 0; @@ -120,7 +120,7 @@ _mmplayer_get_attributes_info(MMHandleType handle, const char *attribute_name, return result; } - memset(dst_info, 0x00, sizeof(MMPlayerAttrsInfo)); + memset(dst_info, 0x00, sizeof(mmplayer_attrs_info_t)); dst_info->type = src_info.type; dst_info->flag = src_info.flag; @@ -161,13 +161,13 @@ _mmplayer_get_attributes_info(MMHandleType handle, const char *attribute_name, int __mmplayer_apply_attribute(MMHandleType handle, const char *attribute_name) { - mm_player_t *player = 0; + mmplayer_t *player = 0; MMPLAYER_RETURN_VAL_IF_FAIL(handle, MM_ERROR_COMMON_INVALID_ARGUMENT); MMPLAYER_RETURN_VAL_IF_FAIL(attribute_name, MM_ERROR_COMMON_INVALID_ARGUMENT); player = MM_PLAYER_CAST(handle); - MMPlayerGstPipelineInfo *pipeline = player->pipeline; + mmplayer_pipeline_info_t *pipeline = player->pipeline; /* before preparing, just keep the attr value */ MMPLAYER_RETURN_VAL_IF_FAIL(pipeline && pipeline->mainbin, MM_ERROR_NONE); @@ -252,7 +252,7 @@ _mmplayer_construct_attribute(MMHandleType handle) MMPLAYER_RETURN_VAL_IF_FAIL(handle, 0); - MMPlayerAttrsSpec player_attrs[] = { + mmplayer_attrs_spec_t player_attrs[] = { { "profile_uri", // name MM_ATTRS_TYPE_STRING, // type @@ -844,7 +844,7 @@ _mmplayer_construct_attribute(MMHandleType handle) bool _mmplayer_deconstruct_attribute(MMHandleType handle) // @ { - mm_player_t *player = MM_PLAYER_CAST(handle); + mmplayer_t *player = MM_PLAYER_CAST(handle); MMPLAYER_RETURN_VAL_IF_FAIL(player, FALSE); diff --git a/src/mm_player_audioeffect.c b/src/mm_player_audioeffect.c index 0968c6f..440236d 100644 --- a/src/mm_player_audioeffect.c +++ b/src/mm_player_audioeffect.c @@ -29,9 +29,9 @@ int -mm_player_get_foreach_present_supported_effect_type(MMHandleType hplayer, MMAudioEffectType effect_type, mmplayer_supported_audio_effect_cb foreach_cb, void *user_data) +mm_player_get_foreach_present_supported_effect_type(MMHandleType hplayer, mm_audio_effect_type_e effect_type, mmplayer_supported_audio_effect_cb foreach_cb, void *user_data) { - mm_player_t *player = NULL; + mmplayer_t *player = NULL; int result = MM_ERROR_NONE; mm_sound_device_flags_e flags = MM_SOUND_DEVICE_IO_DIRECTION_OUT_FLAG | MM_SOUND_DEVICE_STATE_ACTIVATED_FLAG; MMSoundDeviceList_t device_list = NULL; @@ -113,7 +113,7 @@ EXIT: int -__mmplayer_set_harmony_effect(mm_player_t *player, GstElement *audio_effect_element) +__mmplayer_set_harmony_effect(mmplayer_t *player, GstElement *audio_effect_element) { gint *ext_effect_level_list = NULL; int count = 1; /* start from 1, because of excepting eq index */ @@ -178,7 +178,7 @@ __mmplayer_set_harmony_effect(mm_player_t *player, GstElement *audio_effect_elem gboolean -__mmplayer_is_earphone_only_effect_type(mm_player_t *player, MMAudioEffectType effect_type, int effect) +__mmplayer_is_earphone_only_effect_type(mmplayer_t *player, mm_audio_effect_type_e effect_type, int effect) { gboolean result = FALSE; int i = 0; @@ -215,7 +215,7 @@ __mmplayer_is_earphone_only_effect_type(mm_player_t *player, MMAudioEffectType e } int -__mmplayer_audio_set_output_type(mm_player_t *player, MMAudioEffectType effect_type, int effect) +__mmplayer_audio_set_output_type(mmplayer_t *player, mm_audio_effect_type_e effect_type, int effect) { GstElement *audio_effect_element = NULL; mm_sound_device_flags_e flags = MM_SOUND_DEVICE_ALL_FLAG; @@ -289,7 +289,7 @@ EXIT: } gboolean -_mmplayer_is_supported_effect_type(mm_player_t *player, MMAudioEffectType effect_type, int effect) +_mmplayer_is_supported_effect_type(mmplayer_t *player, mm_audio_effect_type_e effect_type, int effect) { gboolean result = TRUE; mm_sound_device_flags_e flags = MM_SOUND_DEVICE_ALL_FLAG; @@ -373,7 +373,7 @@ EXIT: } int -_mmplayer_audio_effect_custom_apply(mm_player_t *player) +_mmplayer_audio_effect_custom_apply(mmplayer_t *player) { GstElement *audio_effect_element = NULL; int result = MM_ERROR_NONE; @@ -415,7 +415,7 @@ _mmplayer_audio_effect_custom_apply(mm_player_t *player) } int -_mmplayer_audio_effect_custom_update_level(mm_player_t *player) +_mmplayer_audio_effect_custom_update_level(mmplayer_t *player) { GstElement *audio_effect_element = NULL; int result = MM_ERROR_NONE; @@ -461,7 +461,7 @@ int mm_player_audio_effect_custom_clear_eq_all(MMHandleType hplayer) { int result = MM_ERROR_NONE; - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); @@ -483,7 +483,7 @@ mm_player_audio_effect_custom_clear_ext_all(MMHandleType hplayer) { int i; int result = MM_ERROR_NONE; - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); @@ -502,9 +502,9 @@ mm_player_audio_effect_custom_clear_ext_all(MMHandleType hplayer) int -mm_player_is_supported_preset_effect_type(MMHandleType hplayer, MMAudioEffectPresetType effect) +mm_player_is_supported_preset_effect_type(MMHandleType hplayer, mm_audio_effect_preset_type_e effect) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int result = MM_ERROR_NONE; MMPLAYER_FENTER(); @@ -521,9 +521,9 @@ mm_player_is_supported_preset_effect_type(MMHandleType hplayer, MMAudioEffectPre int -mm_player_is_supported_custom_effect_type(MMHandleType hplayer, MMAudioEffectCustomType effect) +mm_player_is_supported_custom_effect_type(MMHandleType hplayer, mm_audio_effect_custom_type_e effect) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int result = MM_ERROR_NONE; MMPLAYER_FENTER(); @@ -541,7 +541,7 @@ mm_player_is_supported_custom_effect_type(MMHandleType hplayer, MMAudioEffectCus int mm_player_audio_effect_custom_apply(MMHandleType hplayer) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int result = MM_ERROR_NONE; MMPLAYER_FENTER(); @@ -565,7 +565,7 @@ mm_player_audio_effect_custom_apply(MMHandleType hplayer) int mm_player_audio_effect_bypass(MMHandleType hplayer) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int result = MM_ERROR_NONE; GstElement *audio_effect_element = NULL; @@ -595,7 +595,7 @@ mm_player_audio_effect_bypass(MMHandleType hplayer) int -_mmplayer_audio_effect_custom_set_level_ext(mm_player_t *player, MMAudioEffectCustomType custom_effect_type, int level) +_mmplayer_audio_effect_custom_set_level_ext(mmplayer_t *player, mm_audio_effect_custom_type_e custom_effect_type, int level) { int effect_level_max = 0; int effect_level_min = 0; @@ -645,7 +645,7 @@ _mmplayer_audio_effect_custom_set_level_ext(mm_player_t *player, MMAudioEffectCu int -_mmplayer_audio_effect_custom_set_level_eq(mm_player_t *player, int index, int level) +_mmplayer_audio_effect_custom_set_level_eq(mmplayer_t *player, int index, int level) { gint eq_level_max = 0; gint eq_level_min = 0; @@ -686,9 +686,9 @@ _mmplayer_audio_effect_custom_set_level_eq(mm_player_t *player, int index, int l /* NOTE : parameter eq_index is only used for _set_eq_level() */ int -mm_player_audio_effect_custom_set_level(MMHandleType hplayer, MMAudioEffectCustomType effect_custom_type, int eq_index, int level) +mm_player_audio_effect_custom_set_level(MMHandleType hplayer, mm_audio_effect_custom_type_e effect_custom_type, int eq_index, int level) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int result = MM_ERROR_NONE; MMPLAYER_FENTER(); @@ -718,7 +718,7 @@ mm_player_audio_effect_custom_set_level(MMHandleType hplayer, MMAudioEffectCusto int mm_player_audio_effect_custom_get_eq_bands_number(MMHandleType hplayer, int *bands) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int result = MM_ERROR_NONE; MMPLAYER_FENTER(); @@ -743,7 +743,7 @@ mm_player_audio_effect_custom_get_eq_bands_number(MMHandleType hplayer, int *ban int mm_player_audio_effect_custom_get_eq_bands_width(MMHandleType hplayer, int band_idx, int *width) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int result = MM_ERROR_NONE; unsigned int eq_num = 0; @@ -776,7 +776,7 @@ mm_player_audio_effect_custom_get_eq_bands_width(MMHandleType hplayer, int band_ int mm_player_audio_effect_custom_get_eq_bands_freq(MMHandleType hplayer, int band_idx, int *freq) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int result = MM_ERROR_NONE; unsigned int eq_num = 0; @@ -807,9 +807,9 @@ mm_player_audio_effect_custom_get_eq_bands_freq(MMHandleType hplayer, int band_i int -mm_player_audio_effect_custom_get_level(MMHandleType hplayer, MMAudioEffectCustomType type, int eq_index, int *level) +mm_player_audio_effect_custom_get_level(MMHandleType hplayer, mm_audio_effect_custom_type_e type, int eq_index, int *level) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int result = MM_ERROR_NONE; MMPLAYER_FENTER(); @@ -846,9 +846,9 @@ mm_player_audio_effect_custom_get_level(MMHandleType hplayer, MMAudioEffectCusto int -mm_player_audio_effect_custom_get_level_range(MMHandleType hplayer, MMAudioEffectCustomType type, int *min, int *max) +mm_player_audio_effect_custom_get_level_range(MMHandleType hplayer, mm_audio_effect_custom_type_e type, int *min, int *max) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int result = MM_ERROR_NONE; int count = 1; /* start from 1, because of excepting eq index */ int ext_level_index = 1; /* start from 1, because of excepting eq index */ @@ -897,7 +897,7 @@ mm_player_audio_effect_custom_get_level_range(MMHandleType hplayer, MMAudioEffec int mm_player_audio_effect_custom_set_level_eq_from_list(MMHandleType hplayer, int *level_list, int size) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; gint i = 0; gint eq_level_min = 0; gint eq_level_max = 0; diff --git a/src/mm_player_capture.c b/src/mm_player_capture.c index 44f6e0b..8b71aaa 100644 --- a/src/mm_player_capture.c +++ b/src/mm_player_capture.c @@ -43,17 +43,17 @@ | LOCAL FUNCTION PROTOTYPES: | ---------------------------------------------------------------------------*/ static GstPadProbeReturn __mmplayer_video_capture_probe(GstPad *pad, GstPadProbeInfo *info, gpointer u_data); -static int __mmplayer_get_video_frame_from_buffer(mm_player_t *player, GstPad *pad, GstBuffer *buffer); +static int __mmplayer_get_video_frame_from_buffer(mmplayer_t *player, GstPad *pad, GstBuffer *buffer); static gpointer __mmplayer_capture_thread(gpointer data); static void __csc_tiled_to_linear_crop(unsigned char *yuv420_dest, unsigned char *nv12t_src, int yuv420_width, int yuv420_height, int left, int top, int right, int buttom); static int __tile_4x2_read(int x_size, int y_size, int x_pos, int y_pos); -static int __mm_player_convert_colorspace(mm_player_t *player, unsigned char *src_data, size_t src_size, mm_util_color_format_e src_fmt, unsigned int src_w, unsigned int src_h, mm_util_color_format_e dst_fmt); -static int __mm_player_convert_NV12_tiled(mm_player_t *player); -static int __mm_player_convert_NV12(mm_player_t *player); -static int __mm_player_convert_I420(mm_player_t *player); -static int __mm_player_convert_BGRx(mm_player_t *player); +static int __mm_player_convert_colorspace(mmplayer_t *player, unsigned char *src_data, size_t src_size, mm_util_color_format_e src_fmt, unsigned int src_w, unsigned int src_h, mm_util_color_format_e dst_fmt); +static int __mm_player_convert_NV12_tiled(mmplayer_t *player); +static int __mm_player_convert_NV12(mmplayer_t *player); +static int __mm_player_convert_I420(mmplayer_t *player); +static int __mm_player_convert_BGRx(mmplayer_t *player); #ifdef CAPTURE_OUTPUT_DUMP -static void capture_output_dump(mm_player_t *player); +static void capture_output_dump(mmplayer_t *player); #endif /*=========================================================================================== @@ -62,7 +62,7 @@ static void capture_output_dump(mm_player_t *player); | | ========================================================================================== */ int -_mmplayer_initialize_video_capture(mm_player_t *player) +_mmplayer_initialize_video_capture(mmplayer_t *player) { int ret = MM_ERROR_NONE; MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED); @@ -93,7 +93,7 @@ ERROR: } int -_mmplayer_release_video_capture(mm_player_t *player) +_mmplayer_release_video_capture(mmplayer_t *player) { MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED); /* release capture thread */ @@ -114,7 +114,7 @@ _mmplayer_release_video_capture(mm_player_t *player) int _mmplayer_do_video_capture(MMHandleType hplayer) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int ret = MM_ERROR_NONE; GstPad *pad = NULL; @@ -180,7 +180,7 @@ _mmplayer_do_video_capture(MMHandleType hplayer) } int -__mmplayer_handle_orientation(mm_player_t *player, int orientation, int format) +__mmplayer_handle_orientation(mmplayer_t *player, int orientation, int format) { unsigned char *src_buffer = NULL; int ret = MM_ERROR_NONE; @@ -254,7 +254,7 @@ __mmplayer_handle_orientation(mm_player_t *player, int orientation, int format) static gpointer __mmplayer_capture_thread(gpointer data) { - mm_player_t *player = (mm_player_t *)data; + mmplayer_t *player = (mmplayer_t *)data; MMMessageParamType msg = {0, }; int orientation = 0; int display_angle = 0; @@ -354,7 +354,7 @@ EXIT: * The output is fixed as RGB888 */ static int -__mmplayer_get_video_frame_from_buffer(mm_player_t *player, GstPad *pad, GstBuffer *buffer) +__mmplayer_get_video_frame_from_buffer(mmplayer_t *player, GstPad *pad, GstBuffer *buffer) { gint i = 0; guint plane_size = 0; @@ -376,7 +376,7 @@ __mmplayer_get_video_frame_from_buffer(mm_player_t *player, GstPad *pad, GstBuff MMPLAYER_LOG_GST_CAPS_TYPE(caps); /* init capture image buffer */ - memset(&player->capture, 0x00, sizeof(MMPlayerVideoCapture)); + memset(&player->capture, 0x00, sizeof(mmplayer_video_capture_t)); gst_video_info_from_caps(&vinfo, caps); @@ -444,7 +444,7 @@ __mmplayer_get_video_frame_from_buffer(mm_player_t *player, GstPad *pad, GstBuff static GstPadProbeReturn __mmplayer_video_capture_probe(GstPad *pad, GstPadProbeInfo *info, gpointer u_data) { - mm_player_t *player = (mm_player_t *)u_data; + mmplayer_t *player = (mmplayer_t *)u_data; GstBuffer *buffer = NULL; int ret = MM_ERROR_NONE; @@ -470,7 +470,7 @@ __mmplayer_video_capture_probe(GstPad *pad, GstPadProbeInfo *info, gpointer u_da } static int -__mm_player_convert_colorspace(mm_player_t *player, unsigned char *src_data, size_t src_size, mm_util_color_format_e src_fmt, unsigned int src_w, unsigned int src_h, mm_util_color_format_e dst_fmt) +__mm_player_convert_colorspace(mmplayer_t *player, unsigned char *src_data, size_t src_size, mm_util_color_format_e src_fmt, unsigned int src_w, unsigned int src_h, mm_util_color_format_e dst_fmt) { int ret = MM_ERROR_NONE; mm_util_image_h src_image = NULL; @@ -755,7 +755,7 @@ __csc_tiled_to_linear_crop(unsigned char *yuv420_dest, unsigned char *nv12t_src, #ifdef CAPTURE_OUTPUT_DUMP /* for capture output dump */ static void -capture_output_dump(mm_player_t *player) +capture_output_dump(mmplayer_t *player) { unsigned char *temp = NULL; char file[100] = { 0, }; @@ -788,7 +788,7 @@ capture_output_dump(mm_player_t *player) #endif static int -__mm_player_convert_NV12_tiled(mm_player_t *player) +__mm_player_convert_NV12_tiled(mmplayer_t *player) { /* Colorspace conversion : NV12T-> NV12-> RGB888 */ int i; @@ -837,7 +837,7 @@ __mm_player_convert_NV12_tiled(mm_player_t *player) } static int -__mm_player_convert_NV12(mm_player_t *player) +__mm_player_convert_NV12(mmplayer_t *player) { unsigned char *src_buffer = NULL; unsigned char *p_buf = NULL; @@ -894,7 +894,7 @@ __mm_player_convert_NV12(mm_player_t *player) } static int -__mm_player_convert_I420(mm_player_t *player) +__mm_player_convert_I420(mmplayer_t *player) { unsigned char *src_buffer = NULL; unsigned char *p_buf = NULL; @@ -959,7 +959,7 @@ __mm_player_convert_I420(mm_player_t *player) } static int -__mm_player_convert_BGRx(mm_player_t *player) +__mm_player_convert_BGRx(mmplayer_t *player) { int i; guint size; diff --git a/src/mm_player_es.c b/src/mm_player_es.c index 08671b7..74af354 100644 --- a/src/mm_player_es.c +++ b/src/mm_player_es.c @@ -44,10 +44,10 @@ /*--------------------------------------------------------------------------- | LOCAL FUNCTION PROTOTYPES: | ---------------------------------------------------------------------------*/ -static int __parse_media_format(MMPlayerVideoStreamInfo *video, MMPlayerAudioStreamInfo *audio, media_format_h format); -static int __convert_media_format_video_mime_to_str(MMPlayerVideoStreamInfo *video, media_format_mimetype_e mime); -static int __convert_media_format_audio_mime_to_str(MMPlayerAudioStreamInfo *audio, media_format_mimetype_e mime); -static gboolean __mm_player_is_codec_data_changed(mm_player_t *player, media_packet_h packet, MMPlayerStreamType streamtype); +static int __parse_media_format(mmplayer_video_stream_info_t *video, mmplayer_audio_stream_info_t *audio, media_format_h format); +static int __convert_media_format_video_mime_to_str(mmplayer_video_stream_info_t *video, media_format_mimetype_e mime); +static int __convert_media_format_audio_mime_to_str(mmplayer_audio_stream_info_t *audio, media_format_mimetype_e mime); +static gboolean __mm_player_is_codec_data_changed(mmplayer_t *player, media_packet_h packet, mmplayer_stream_type_e streamtype); /*=========================================================================================== | | @@ -56,7 +56,7 @@ static gboolean __mm_player_is_codec_data_changed(mm_player_t *player, media_pac ========================================================================================== */ static int -__convert_media_format_video_mime_to_str(MMPlayerVideoStreamInfo *video, +__convert_media_format_video_mime_to_str(mmplayer_video_stream_info_t *video, media_format_mimetype_e mime) { MMPLAYER_RETURN_VAL_IF_FAIL(video, MM_ERROR_INVALID_ARGUMENT); @@ -80,7 +80,7 @@ __convert_media_format_video_mime_to_str(MMPlayerVideoStreamInfo *video, } static int -__convert_media_format_audio_mime_to_str(MMPlayerAudioStreamInfo *audio, +__convert_media_format_audio_mime_to_str(mmplayer_audio_stream_info_t *audio, media_format_mimetype_e mime) { MMPLAYER_RETURN_VAL_IF_FAIL(audio, MM_ERROR_INVALID_ARGUMENT); @@ -99,8 +99,8 @@ __convert_media_format_audio_mime_to_str(MMPlayerAudioStreamInfo *audio, } static int -__parse_media_format(MMPlayerVideoStreamInfo *video, - MMPlayerAudioStreamInfo *audio, media_format_h format) +__parse_media_format(mmplayer_video_stream_info_t *video, + mmplayer_audio_stream_info_t *audio, media_format_h format) { if (audio) { media_format_mimetype_e mime; @@ -152,7 +152,7 @@ __parse_media_format(MMPlayerVideoStreamInfo *video, static gboolean __mmplayer_update_video_info(MMHandleType hplayer, media_format_h fmt) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; gboolean ret = FALSE; GstStructure *str = NULL; media_format_mimetype_e mimetype = 0; @@ -196,11 +196,11 @@ __mmplayer_update_video_info(MMHandleType hplayer, media_format_h fmt) int _mmplayer_set_media_stream_buffer_status_cb(MMHandleType hplayer, - MMPlayerStreamType type, + mmplayer_stream_type_e type, mm_player_media_stream_buffer_status_callback callback, void *user_param) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); @@ -229,11 +229,11 @@ _mmplayer_set_media_stream_buffer_status_cb(MMHandleType hplayer, int _mmplayer_set_media_stream_seek_data_cb(MMHandleType hplayer, - MMPlayerStreamType type, + mmplayer_stream_type_e type, mm_player_media_stream_seek_data_callback callback, void *user_param) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); @@ -261,9 +261,9 @@ _mmplayer_set_media_stream_seek_data_cb(MMHandleType hplayer, } static GstElement * -__mmplayer_get_source_element(mm_player_t *player, MMPlayerStreamType type) +__mmplayer_get_source_element(mmplayer_t *player, mmplayer_stream_type_e type) { - enum MainElementID elemId = MMPLAYER_M_NUM; + main_element_id_e elemId = MMPLAYER_M_NUM; if (player && player->pipeline && player->pipeline->mainbin) { /* get elem according to the stream type */ @@ -286,9 +286,9 @@ __mmplayer_get_source_element(mm_player_t *player, MMPlayerStreamType type) } int -_mmplayer_set_media_stream_max_size(MMHandleType hplayer, MMPlayerStreamType type, guint64 max_size) +_mmplayer_set_media_stream_max_size(MMHandleType hplayer, mmplayer_stream_type_e type, guint64 max_size) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; GstElement *element = NULL; MMPLAYER_FENTER(); @@ -315,9 +315,9 @@ _mmplayer_set_media_stream_max_size(MMHandleType hplayer, MMPlayerStreamType typ } int -_mmplayer_get_media_stream_max_size(MMHandleType hplayer, MMPlayerStreamType type, guint64 *max_size) +_mmplayer_get_media_stream_max_size(MMHandleType hplayer, mmplayer_stream_type_e type, guint64 *max_size) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); @@ -332,9 +332,9 @@ _mmplayer_get_media_stream_max_size(MMHandleType hplayer, MMPlayerStreamType typ } int -_mmplayer_set_media_stream_min_percent(MMHandleType hplayer, MMPlayerStreamType type, guint min_percent) +_mmplayer_set_media_stream_min_percent(MMHandleType hplayer, mmplayer_stream_type_e type, guint min_percent) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; GstElement *element = NULL; MMPLAYER_FENTER(); @@ -360,9 +360,9 @@ _mmplayer_set_media_stream_min_percent(MMHandleType hplayer, MMPlayerStreamType } int -_mmplayer_get_media_stream_min_percent(MMHandleType hplayer, MMPlayerStreamType type, guint *min_percent) +_mmplayer_get_media_stream_min_percent(MMHandleType hplayer, mmplayer_stream_type_e type, guint *min_percent) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); @@ -377,7 +377,7 @@ _mmplayer_get_media_stream_min_percent(MMHandleType hplayer, MMPlayerStreamType } static int -__mmplayer_check_buffer_level(mm_player_t *player, GstElement *element, MMPlayerStreamType type) +__mmplayer_check_buffer_level(mmplayer_t *player, GstElement *element, mmplayer_stream_type_e type) { guint64 current_level_bytes = 0; guint64 max_bytes = 0; @@ -434,11 +434,11 @@ _mmplayer_submit_packet(MMHandleType hplayer, media_packet_h packet) { int ret = MM_ERROR_NONE; GstBuffer *_buffer = NULL; - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; guint8 *buf = NULL; uint64_t size = 0; GstElement *element = NULL; - MMPlayerStreamType streamtype = MM_PLAYER_STREAM_TYPE_AUDIO; + mmplayer_stream_type_e streamtype = MM_PLAYER_STREAM_TYPE_AUDIO; media_format_h fmt = NULL; bool flag = false; bool is_eos = false; @@ -591,14 +591,14 @@ ERROR: } static int -__mmplayer_video_caps_new(MMHandleType hplayer, MMPlayerVideoStreamInfo *video, +__mmplayer_video_caps_new(MMHandleType hplayer, mmplayer_video_stream_info_t *video, const char *fieldname, ...) { int cap_size; GstCaps *caps = NULL; GstStructure *structure = NULL; va_list var_args; - mm_player_t *player = MM_PLAYER_CAST(hplayer); + mmplayer_t *player = MM_PLAYER_CAST(hplayer); MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED); @@ -652,7 +652,7 @@ __mmplayer_video_caps_new(MMHandleType hplayer, MMPlayerVideoStreamInfo *video, } static void -__mmplayer_set_uri_type(mm_player_t *player) +__mmplayer_set_uri_type(mmplayer_t *player) { MMPLAYER_FENTER(); @@ -666,8 +666,8 @@ __mmplayer_set_uri_type(mm_player_t *player) int _mmplayer_set_video_info(MMHandleType hplayer, media_format_h format) { - mm_player_t *player = MM_PLAYER_CAST(hplayer); - MMPlayerVideoStreamInfo video = { 0, }; + mmplayer_t *player = MM_PLAYER_CAST(hplayer); + mmplayer_video_stream_info_t video = { 0, }; int ret = MM_ERROR_NONE; gboolean drc = FALSE; @@ -731,9 +731,9 @@ _mmplayer_set_video_info(MMHandleType hplayer, media_format_h format) int _mmplayer_set_audio_info(MMHandleType hplayer, media_format_h format) { - mm_player_t *player = MM_PLAYER_CAST(hplayer); + mmplayer_t *player = MM_PLAYER_CAST(hplayer); GstCaps *caps = NULL; - MMPlayerAudioStreamInfo audio = { 0, }; + mmplayer_audio_stream_info_t audio = { 0, }; int ret = MM_ERROR_NONE; MMPLAYER_FENTER(); @@ -822,10 +822,10 @@ _mmplayer_set_audio_info(MMHandleType hplayer, media_format_h format) int _mmplayer_set_subtitle_info(MMHandleType hplayer, - MMPlayerSubtitleStreamInfo *subtitle) + mmplayer_subtitle_stream_info_t *subtitle) { #if 0 //todo - mm_player_t *player = MM_PLAYER_CAST(hplayer); + mmplayer_t *player = MM_PLAYER_CAST(hplayer); GstCaps *caps = NULL; MMPLAYER_FENTER(); @@ -862,7 +862,7 @@ _mmplayer_set_subtitle_info(MMHandleType hplayer, int _mmplayer_set_media_stream_dynamic_resolution(MMHandleType hplayer, bool drc) { - mm_player_t *player = MM_PLAYER_CAST(hplayer); + mmplayer_t *player = MM_PLAYER_CAST(hplayer); int ret = MM_ERROR_NONE; MMPLAYER_FENTER(); @@ -882,8 +882,8 @@ _mmplayer_set_media_stream_dynamic_resolution(MMHandleType hplayer, bool drc) } static gboolean -__mm_player_is_codec_data_changed(mm_player_t *player, media_packet_h packet, - MMPlayerStreamType streamtype) +__mm_player_is_codec_data_changed(mmplayer_t *player, media_packet_h packet, + mmplayer_stream_type_e streamtype) { GstCaps *cur_caps = NULL; GstCaps *new_caps = NULL; diff --git a/src/mm_player_gst.c b/src/mm_player_gst.c index 285c6df..9c4451e 100644 --- a/src/mm_player_gst.c +++ b/src/mm_player_gst.c @@ -84,7 +84,7 @@ ========================================================================================== */ static gboolean -__mmplayer_check_error_posted_from_activated_track(mm_player_t *player, gchar *src_element_name) +__mmplayer_check_error_posted_from_activated_track(mmplayer_t *player, gchar *src_element_name) { /* check whether the error is posted from not-activated track or not */ int msg_src_pos = 0; @@ -123,7 +123,7 @@ __mmplayer_check_error_posted_from_activated_track(mm_player_t *player, gchar *s } static int -__mmplayer_gst_transform_error_decode(mm_player_t *player, const char *klass) +__mmplayer_gst_transform_error_decode(mmplayer_t *player, const char *klass) { /* Demuxer can't parse one track because it's corrupted. * So, the decoder for it is not linked. @@ -148,7 +148,7 @@ __mmplayer_gst_transform_error_decode(mm_player_t *player, const char *klass) } static int -__mmplayer_gst_transform_error_type(mm_player_t *player, GstElement *src_element) +__mmplayer_gst_transform_error_type(mmplayer_t *player, GstElement *src_element) { if (src_element == player->pipeline->mainbin[MMPLAYER_M_SUBPARSE].gst) { LOGE("Not supported subtitle."); @@ -158,7 +158,7 @@ __mmplayer_gst_transform_error_type(mm_player_t *player, GstElement *src_element } static int -__mmplayer_gst_transform_error_failed(mm_player_t *player, const char *klass, GError *error) +__mmplayer_gst_transform_error_failed(mmplayer_t *player, const char *klass, GError *error) { /* Decoder Custom Message */ if (!strstr(error->message, "ongoing")) @@ -181,7 +181,7 @@ __mmplayer_gst_transform_error_failed(mm_player_t *player, const char *klass, GE } static int -__mmplayer_gst_transform_error_decrypt(mm_player_t *player, GError *error) +__mmplayer_gst_transform_error_decrypt(mmplayer_t *player, GError *error) { if (strstr(error->message, "rights expired")) return MM_ERROR_PLAYER_DRM_EXPIRED; @@ -197,7 +197,7 @@ __mmplayer_gst_transform_error_decrypt(mm_player_t *player, GError *error) /* NOTE : decide gstreamer state whether there is some playable track or not. */ static gint -__mmplayer_gst_transform_gsterror(mm_player_t *player, GstMessage *message, GError *error) +__mmplayer_gst_transform_gsterror(mmplayer_t *player, GstMessage *message, GError *error) { gchar *src_element_name = NULL; GstElement *src_element = NULL; @@ -258,7 +258,7 @@ __mmplayer_gst_transform_gsterror(mm_player_t *player, GstMessage *message, GErr } gint -__mmplayer_gst_handle_core_error(mm_player_t *player, int code) +__mmplayer_gst_handle_core_error(mmplayer_t *player, int code) { gint trans_err = MM_ERROR_NONE; @@ -293,7 +293,7 @@ __mmplayer_gst_handle_core_error(mm_player_t *player, int code) } gint -__mmplayer_gst_handle_library_error(mm_player_t *player, int code) +__mmplayer_gst_handle_library_error(mmplayer_t *player, int code) { gint trans_err = MM_ERROR_NONE; @@ -319,7 +319,7 @@ __mmplayer_gst_handle_library_error(mm_player_t *player, int code) } gint -__mmplayer_gst_handle_resource_error(mm_player_t *player, int code, GstMessage *message) +__mmplayer_gst_handle_resource_error(mmplayer_t *player, int code, GstMessage *message) { gint trans_err = MM_ERROR_NONE; @@ -345,7 +345,7 @@ __mmplayer_gst_handle_resource_error(mm_player_t *player, int code, GstMessage * break; } else if (message != NULL && message->src != NULL) { storage_state_e storage_state = STORAGE_STATE_UNMOUNTABLE; - MMPlayerPathType path_type = MMPLAYER_PATH_MAX; + mmplayer_path_type_e path_type = MMPLAYER_PATH_MAX; if (message->src == (GstObject *)player->pipeline->mainbin[MMPLAYER_M_SRC].gst) path_type = MMPLAYER_PATH_VOD; @@ -380,7 +380,7 @@ __mmplayer_gst_handle_resource_error(mm_player_t *player, int code, GstMessage * } gint -__mmplayer_gst_handle_stream_error(mm_player_t *player, GError *error, GstMessage *message) +__mmplayer_gst_handle_stream_error(mmplayer_t *player, GError *error, GstMessage *message) { gint trans_err = MM_ERROR_NONE; @@ -418,7 +418,7 @@ __mmplayer_gst_handle_stream_error(mm_player_t *player, GError *error, GstMessag } gboolean -__mmplayer_handle_gst_error(mm_player_t *player, GstMessage *message, GError *error) +__mmplayer_handle_gst_error(mmplayer_t *player, GstMessage *message, GError *error) { MMMessageParamType msg_param; gchar *msg_src_element; @@ -488,7 +488,7 @@ __mmplayer_handle_gst_error(mm_player_t *player, GstMessage *message, GError *er } static gboolean -__mmplayer_handle_streaming_error(mm_player_t *player, GstMessage *message) +__mmplayer_handle_streaming_error(mmplayer_t *player, GstMessage *message) { LOGD("\n"); MMMessageParamType msg_param; @@ -681,7 +681,7 @@ __mmplayer_handle_streaming_error(mm_player_t *player, GstMessage *message) } static void -__mmplayer_get_metadata_360_from_tags(GstTagList *tags, mm_player_spherical_metadata_t *metadata) +__mmplayer_get_metadata_360_from_tags(GstTagList *tags, mmplayer_spherical_metadata_t *metadata) { gst_tag_list_get_int(tags, "is_spherical", &metadata->is_spherical); gst_tag_list_get_int(tags, "is_stitched", &metadata->is_stitched); @@ -713,7 +713,7 @@ __mmplayer_get_metadata_360_from_tags(GstTagList *tags, mm_player_spherical_meta } static gboolean -__mmplayer_gst_extract_tag_from_msg(mm_player_t *player, GstMessage *msg) +__mmplayer_gst_extract_tag_from_msg(mmplayer_t *player, GstMessage *msg) { /* macro for better code readability */ @@ -770,7 +770,7 @@ __mmplayer_gst_extract_tag_from_msg(mm_player_t *player, GstMessage *msg) if (gst_tag_list_get_uint(tag_list, gsttag, &v_uint)) { \ if (v_uint) { \ int i = 0; \ - MMPlayerTrackType track_type = MM_PLAYER_TRACK_TYPE_AUDIO; \ + mmplayer_track_type_e track_type = MM_PLAYER_TRACK_TYPE_AUDIO; \ if (strstr(GST_OBJECT_NAME(msg->src), "audio")) \ track_type = MM_PLAYER_TRACK_TYPE_AUDIO; \ else if (strstr(GST_OBJECT_NAME(msg->src), "video")) \ @@ -974,7 +974,7 @@ __mmplayer_gst_extract_tag_from_msg(mm_player_t *player, GstMessage *msg) /* if retval is FALSE, it will be dropped for perfomance. */ static gboolean -__mmplayer_gst_check_useful_message(mm_player_t *player, GstMessage *message) +__mmplayer_gst_check_useful_message(mmplayer_t *player, GstMessage *message) { gboolean retval = FALSE; @@ -1037,7 +1037,7 @@ __mmplayer_gst_check_useful_message(mm_player_t *player, GstMessage *message) } static void -__mmplayer_update_buffer_setting(mm_player_t *player, GstMessage *buffering_msg) +__mmplayer_update_buffer_setting(mmplayer_t *player, GstMessage *buffering_msg) { guint64 data_size = 0; gint64 pos_nsec = 0; @@ -1057,13 +1057,13 @@ __mmplayer_update_buffer_setting(mm_player_t *player, GstMessage *buffering_msg) } static int -__mmplayer_handle_buffering_playback(mm_player_t *player) +__mmplayer_handle_buffering_playback(mmplayer_t *player) { int ret = MM_ERROR_NONE; - MMPlayerStateType prev_state = MM_PLAYER_STATE_NONE; - MMPlayerStateType current_state = MM_PLAYER_STATE_NONE; - MMPlayerStateType target_state = MM_PLAYER_STATE_NONE; - MMPlayerStateType pending_state = MM_PLAYER_STATE_NONE; + mmplayer_state_e prev_state = MM_PLAYER_STATE_NONE; + mmplayer_state_e current_state = MM_PLAYER_STATE_NONE; + mmplayer_state_e target_state = MM_PLAYER_STATE_NONE; + mmplayer_state_e pending_state = MM_PLAYER_STATE_NONE; if (!player || !player->streamer || (MMPLAYER_IS_LIVE_STREAMING(player) && MMPLAYER_IS_RTSP_STREAMING(player))) { LOGW("do nothing for buffering msg"); @@ -1188,13 +1188,13 @@ exit: return ret; } -static VariantData * -__mmplayer_adaptive_var_info(const VariantData *self, gpointer user_data) +static stream_variant_t * +__mmplayer_adaptive_var_info(const stream_variant_t *self, gpointer user_data) { - VariantData *var_info = NULL; + stream_variant_t *var_info = NULL; g_return_val_if_fail(self != NULL, NULL); - var_info = g_new0(VariantData, 1); + var_info = g_new0(stream_variant_t, 1); if (!var_info) return NULL; var_info->bandwidth = self->bandwidth; var_info->width = self->width; @@ -1203,7 +1203,7 @@ __mmplayer_adaptive_var_info(const VariantData *self, gpointer user_data) } static gboolean -__mmplayer_gst_handle_duration(mm_player_t *player, GstMessage *msg) +__mmplayer_gst_handle_duration(mmplayer_t *player, GstMessage *msg) { gint64 bytes = 0; @@ -1233,13 +1233,13 @@ __mmplayer_gst_handle_duration(mm_player_t *player, GstMessage *msg) static gboolean __mmplayer_eos_timer_cb(gpointer u_data) { - mm_player_t *player = NULL; + mmplayer_t *player = NULL; MMHandleType attrs = 0; int count = 0; MMPLAYER_RETURN_VAL_IF_FAIL(u_data, FALSE); - player = (mm_player_t *)u_data; + player = (mmplayer_t *)u_data; attrs = MMPLAYER_GET_ATTRS(player); mm_attrs_get_int_by_name(attrs, "profile_play_count", &count); @@ -1259,7 +1259,7 @@ __mmplayer_eos_timer_cb(gpointer u_data) } static void -__mmplayer_handle_eos_delay(mm_player_t *player, int delay_in_ms) +__mmplayer_handle_eos_delay(mmplayer_t *player, int delay_in_ms) { MMPLAYER_RETURN_IF_FAIL(player); @@ -1295,9 +1295,9 @@ __mmplayer_handle_eos_delay(mm_player_t *player, int delay_in_ms) } static int -__mmplayer_gst_pending_seek(mm_player_t *player) +__mmplayer_gst_pending_seek(mmplayer_t *player) { - MMPlayerStateType current_state = MM_PLAYER_STATE_NONE; + mmplayer_state_e current_state = MM_PLAYER_STATE_NONE; int ret = MM_ERROR_NONE; MMPLAYER_FENTER(); @@ -1332,9 +1332,9 @@ __mmplayer_gst_pending_seek(mm_player_t *player) } static void -__mmplayer_gst_set_async(mm_player_t *player, gboolean async, enum MMPlayerSinkType type) +__mmplayer_gst_set_async(mmplayer_t *player, gboolean async, enum mmplayer_sink_type type) { - MMPlayerGstElement *videobin = NULL, *audiobin = NULL, *textbin = NULL; + mmplayer_gst_element_t *videobin = NULL, *audiobin = NULL, *textbin = NULL; MMPLAYER_RETURN_IF_FAIL(player && player->pipeline); @@ -1357,9 +1357,9 @@ __mmplayer_gst_set_async(mm_player_t *player, gboolean async, enum MMPlayerSinkT } static void -__mmplayer_drop_subtitle(mm_player_t *player, gboolean is_drop) +__mmplayer_drop_subtitle(mmplayer_t *player, gboolean is_drop) { - MMPlayerGstElement *textbin; + mmplayer_gst_element_t *textbin; MMPLAYER_FENTER(); MMPLAYER_RETURN_IF_FAIL(player && @@ -1392,7 +1392,7 @@ __mmplayer_drop_subtitle(mm_player_t *player, gboolean is_drop) } static void -__mmplayer_gst_handle_eos_message(mm_player_t *player, GstMessage *msg) +__mmplayer_gst_handle_eos_message(mmplayer_t *player, GstMessage *msg) { MMHandleType attrs = 0; gint count = 0; @@ -1451,7 +1451,7 @@ __mmplayer_gst_handle_eos_message(mm_player_t *player, GstMessage *msg) } static void -__mmplayer_gst_handle_error_message(mm_player_t *player, GstMessage *msg) +__mmplayer_gst_handle_error_message(mmplayer_t *player, GstMessage *msg) { GError *error = NULL; gchar *debug = NULL; @@ -1490,7 +1490,7 @@ __mmplayer_gst_handle_error_message(mm_player_t *player, GstMessage *msg) } static void -__mmplayer_gst_handle_buffering_message(mm_player_t *player, GstMessage *msg) +__mmplayer_gst_handle_buffering_message(mmplayer_t *player, GstMessage *msg) { MMMessageParamType msg_param = {0, }; int bRet = MM_ERROR_NONE; @@ -1609,9 +1609,9 @@ __mmplayer_gst_handle_buffering_message(mm_player_t *player, GstMessage *msg) } static void -__mmplayer_gst_handle_state_message(mm_player_t *player, GstMessage *msg) +__mmplayer_gst_handle_state_message(mmplayer_t *player, GstMessage *msg) { - MMPlayerGstElement *mainbin; + mmplayer_gst_element_t *mainbin; const GValue *voldstate, *vnewstate, *vpending; GstState oldstate = GST_STATE_NULL; GstState newstate = GST_STATE_NULL; @@ -1741,7 +1741,7 @@ __mmplayer_gst_handle_state_message(mm_player_t *player, GstMessage *msg) } static void -__mmplayer_gst_handle_element_message(mm_player_t *player, GstMessage *msg) +__mmplayer_gst_handle_element_message(mmplayer_t *player, GstMessage *msg) { const gchar *structure_name; gint count = 0, idx = 0; @@ -1779,7 +1779,7 @@ __mmplayer_gst_handle_element_message(mm_player_t *player, GstMessage *msg) count = g_list_length(player->adaptive_info.var_list); if (count > 0) { - VariantData *temp = NULL; + stream_variant_t *temp = NULL; /* print out for debug */ LOGD("num of variant_info %d", count); @@ -1867,9 +1867,9 @@ __mmplayer_gst_handle_element_message(mm_player_t *player, GstMessage *msg) } static void -__mmplayer_gst_handle_async_done_message(mm_player_t *player, GstMessage *msg) +__mmplayer_gst_handle_async_done_message(mmplayer_t *player, GstMessage *msg) { - MMPlayerGstElement *mainbin; + mmplayer_gst_element_t *mainbin; MMPLAYER_FENTER(); MMPLAYER_RETURN_IF_FAIL(player && player->pipeline && player->pipeline->mainbin); @@ -1933,7 +1933,7 @@ __mmplayer_gst_handle_async_done_message(mm_player_t *player, GstMessage *msg) static void __mmplayer_gst_bus_msg_callback(GstMessage *msg, gpointer data) { - mm_player_t *player = (mm_player_t *)(data); + mmplayer_t *player = (mmplayer_t *)(data); MMPLAYER_RETURN_IF_FAIL(player); MMPLAYER_RETURN_IF_FAIL(msg && GST_IS_MESSAGE(msg)); @@ -2063,7 +2063,7 @@ __mmplayer_gst_bus_msg_callback(GstMessage *msg, gpointer data) static GstBusSyncReply __mmplayer_gst_bus_sync_callback(GstBus *bus, GstMessage *message, gpointer data) { - mm_player_t *player = (mm_player_t *)data; + mmplayer_t *player = (mmplayer_t *)data; GstBusSyncReply reply = GST_BUS_DROP; if (!(player->pipeline && player->pipeline->mainbin)) { @@ -2120,7 +2120,7 @@ static void __mmplayer_gst_appsrc_feed_data_mem(GstElement *element, guint size, gpointer user_data) { GstElement *appsrc = element; - MMPlayerInputBuffer *buf = (MMPlayerInputBuffer *)user_data; + mmplayer_input_buffer_t *buf = (mmplayer_input_buffer_t *)user_data; GstBuffer *buffer = NULL; GstFlowReturn ret = GST_FLOW_OK; gint len = size; @@ -2157,7 +2157,7 @@ __mmplayer_gst_appsrc_feed_data_mem(GstElement *element, guint size, gpointer us static gboolean __mmplayer_gst_appsrc_seek_data_mem(GstElement *element, guint64 size, gpointer user_data) { - MMPlayerInputBuffer *buf = (MMPlayerInputBuffer *)user_data; + mmplayer_input_buffer_t *buf = (mmplayer_input_buffer_t *)user_data; MMPLAYER_RETURN_VAL_IF_FAIL(buf, FALSE); @@ -2169,8 +2169,8 @@ __mmplayer_gst_appsrc_seek_data_mem(GstElement *element, guint64 size, gpointer void __mmplayer_gst_appsrc_feed_data(GstElement *element, guint size, gpointer user_data) { - mm_player_t *player = (mm_player_t *)user_data; - MMPlayerStreamType type = MM_PLAYER_STREAM_TYPE_DEFAULT; + mmplayer_t *player = (mmplayer_t *)user_data; + mmplayer_stream_type_e type = MM_PLAYER_STREAM_TYPE_DEFAULT; guint64 current_level_bytes = 0; MMPLAYER_RETURN_IF_FAIL(player); @@ -2199,8 +2199,8 @@ __mmplayer_gst_appsrc_feed_data(GstElement *element, guint size, gpointer user_d void __mmplayer_gst_appsrc_enough_data(GstElement *element, gpointer user_data) { - mm_player_t *player = (mm_player_t *)user_data; - MMPlayerStreamType type = MM_PLAYER_STREAM_TYPE_DEFAULT; + mmplayer_t *player = (mmplayer_t *)user_data; + mmplayer_stream_type_e type = MM_PLAYER_STREAM_TYPE_DEFAULT; guint64 current_level_bytes = 0; MMPLAYER_RETURN_IF_FAIL(player); @@ -2231,8 +2231,8 @@ __mmplayer_gst_appsrc_enough_data(GstElement *element, gpointer user_data) gboolean __mmplayer_gst_appsrc_seek_data(GstElement *element, guint64 position, gpointer user_data) { - mm_player_t *player = (mm_player_t *)user_data; - MMPlayerStreamType type = MM_PLAYER_STREAM_TYPE_DEFAULT; + mmplayer_t *player = (mmplayer_t *)user_data; + mmplayer_stream_type_e type = MM_PLAYER_STREAM_TYPE_DEFAULT; MMPLAYER_RETURN_VAL_IF_FAIL(player, FALSE); @@ -2258,7 +2258,7 @@ __mmplayer_gst_appsrc_seek_data(GstElement *element, guint64 position, gpointer } static gboolean -__mmplayer_gst_create_es_decoder(mm_player_t *player, MMPlayerStreamType type, GstPad *srcpad) +__mmplayer_gst_create_es_decoder(mmplayer_t *player, mmplayer_stream_type_e type, GstPad *srcpad) { #define MAX_LEN_NAME 20 @@ -2266,9 +2266,9 @@ __mmplayer_gst_create_es_decoder(mm_player_t *player, MMPlayerStreamType type, G GstPad *sinkpad = NULL; gchar *prefix = NULL; gchar dec_name[MAX_LEN_NAME] = {0, }; - enum MainElementID elem_id = MMPLAYER_M_NUM; + main_element_id_e elem_id = MMPLAYER_M_NUM; - MMPlayerGstElement *mainbin = NULL; + mmplayer_gst_element_t *mainbin = NULL; GstElement *decodebin = NULL; GstCaps *dec_caps = NULL; @@ -2364,12 +2364,12 @@ ERROR: } static gboolean -__mmplayer_gst_create_es_path(mm_player_t *player, MMPlayerStreamType type, GstCaps *caps) +__mmplayer_gst_create_es_path(mmplayer_t *player, mmplayer_stream_type_e type, GstCaps *caps) { #define MAX_LEN_NAME 20 - MMPlayerGstElement *mainbin = NULL; + mmplayer_gst_element_t *mainbin = NULL; gchar *prefix = NULL; - enum MainElementID src_id = MMPLAYER_M_NUM, queue_id = MMPLAYER_M_NUM; + main_element_id_e src_id = MMPLAYER_M_NUM, queue_id = MMPLAYER_M_NUM; gchar src_name[MAX_LEN_NAME] = {0, }, queue_name[MAX_LEN_NAME] = {0, }; GstElement *src = NULL, *queue = NULL; @@ -2514,7 +2514,7 @@ __mmplayer_gst_rtp_dynamic_pad(GstElement *element, GstPad *pad, gpointer data) GstStructure *str = NULL; const gchar *name = NULL; - mm_player_t *player = (mm_player_t *)data; + mmplayer_t *player = (mmplayer_t *)data; MMPLAYER_FENTER(); @@ -2626,7 +2626,7 @@ ERROR: static void __mmplayer_gst_rtp_no_more_pads(GstElement *element, gpointer data) { - mm_player_t *player = (mm_player_t *)data; + mmplayer_t *player = (mmplayer_t *)data; MMPLAYER_FENTER(); @@ -2662,7 +2662,7 @@ __mmplayer_gst_rtp_no_more_pads(GstElement *element, gpointer data) } static GstElement * -__mmplayer_gst_make_rtsp_src(mm_player_t *player) +__mmplayer_gst_make_rtsp_src(mmplayer_t *player) { GstElement *element = NULL; gchar *user_agent = NULL; @@ -2704,7 +2704,7 @@ __mmplayer_gst_make_rtsp_src(mm_player_t *player) } static GstElement * -__mmplayer_gst_make_http_src(mm_player_t *player) +__mmplayer_gst_make_http_src(mmplayer_t *player) { GstElement *element = NULL; MMHandleType attrs = 0; @@ -2765,7 +2765,7 @@ __mmplayer_gst_make_http_src(mm_player_t *player) } static GstElement * -__mmplayer_gst_make_file_src(mm_player_t *player) +__mmplayer_gst_make_file_src(mmplayer_t *player) { GstElement *element = NULL; @@ -2793,7 +2793,7 @@ __mmplayer_gst_make_file_src(mm_player_t *player) static gboolean __mmplayer_gst_msg_push(GstBus *bus, GstMessage *msg, gpointer data) { - mm_player_t *player = (mm_player_t *)data; + mmplayer_t *player = (mmplayer_t *)data; g_return_val_if_fail(player, FALSE); g_return_val_if_fail(msg && GST_IS_MESSAGE(msg), FALSE); @@ -2812,7 +2812,7 @@ __mmplayer_gst_msg_push(GstBus *bus, GstMessage *msg, gpointer data) static gpointer __mmplayer_gst_bus_msg_thread(gpointer data) { - mm_player_t *player = (mm_player_t *)(data); + mmplayer_t *player = (mmplayer_t *)(data); GstMessage *msg = NULL; GstBus *bus = NULL; @@ -2855,7 +2855,7 @@ static gpointer __mmplayer_gst_bus_msg_thread(gpointer data) } static int -__mmplayer_gst_check_duration(mm_player_t *player, gint64 position) +__mmplayer_gst_check_duration(mmplayer_t *player, gint64 position) { gint64 dur_nsec = 0; @@ -2897,7 +2897,7 @@ __mmplayer_gst_check_duration(mm_player_t *player, gint64 position) } static gboolean -__mmplayer_gst_check_seekable(mm_player_t *player) +__mmplayer_gst_check_seekable(mmplayer_t *player) { GstQuery *query = NULL; gboolean seekable = FALSE; @@ -2925,7 +2925,7 @@ __mmplayer_gst_check_seekable(mm_player_t *player) } int -__mmplayer_gst_set_state(mm_player_t *player, GstElement *element, GstState state, gboolean async, gint timeout) +__mmplayer_gst_set_state(mmplayer_t *player, GstElement *element, GstState state, gboolean async, gint timeout) { GstState element_state = GST_STATE_VOID_PENDING; GstState element_pending_state = GST_STATE_VOID_PENDING; @@ -2981,7 +2981,7 @@ __mmplayer_gst_set_state(mm_player_t *player, GstElement *element, GstState sta } int -__mmplayer_gst_start(mm_player_t *player) +__mmplayer_gst_start(mmplayer_t *player) { int ret = MM_ERROR_NONE; gboolean async = FALSE; @@ -3030,7 +3030,7 @@ __mmplayer_gst_start(mm_player_t *player) } int -__mmplayer_gst_stop(mm_player_t *player) +__mmplayer_gst_stop(mmplayer_t *player) { GstStateChangeReturn change_ret = GST_STATE_CHANGE_SUCCESS; MMHandleType attrs = 0; @@ -3113,7 +3113,7 @@ __mmplayer_gst_stop(mm_player_t *player) } int -__mmplayer_gst_pause(mm_player_t *player, gboolean async) +__mmplayer_gst_pause(mmplayer_t *player, gboolean async) { int ret = MM_ERROR_NONE; @@ -3213,7 +3213,7 @@ EXIT: } int -__mmplayer_gst_resume(mm_player_t *player, gboolean async) +__mmplayer_gst_resume(mmplayer_t *player, gboolean async) { int ret = MM_ERROR_NONE; gint timeout = 0; @@ -3254,7 +3254,7 @@ EXIT: /* sending event to one of sinkelements */ gboolean -__mmplayer_gst_send_event_to_sink(mm_player_t *player, GstEvent *event) +__mmplayer_gst_send_event_to_sink(mmplayer_t *player, GstEvent *event) { GstEvent *event2 = NULL; GList *sinks = NULL; @@ -3344,7 +3344,7 @@ __mmplayer_gst_send_event_to_sink(mm_player_t *player, GstEvent *event) } gboolean -__mmplayer_gst_seek(mm_player_t *player, GstElement *element, gdouble rate, +__mmplayer_gst_seek(mmplayer_t *player, GstElement *element, gdouble rate, GstFormat format, GstSeekFlags flags, GstSeekType cur_type, gint64 cur, GstSeekType stop_type, gint64 stop) { @@ -3369,7 +3369,7 @@ __mmplayer_gst_seek(mm_player_t *player, GstElement *element, gdouble rate, } int -__mmplayer_gst_set_position(mm_player_t *player, gint64 position, gboolean internal_called) +__mmplayer_gst_set_position(mmplayer_t *player, gint64 position, gboolean internal_called) { int ret = MM_ERROR_NONE; gint64 pos_nsec = 0; @@ -3480,11 +3480,11 @@ SEEK_ERROR: } int -__mmplayer_gst_get_position(mm_player_t *player, gint64 *position) +__mmplayer_gst_get_position(mmplayer_t *player, gint64 *position) { #define TRICKPLAY_OFFSET GST_MSECOND - MMPlayerStateType current_state = MM_PLAYER_STATE_NONE; + mmplayer_state_e current_state = MM_PLAYER_STATE_NONE; gint64 pos_nsec = 0; gboolean ret = TRUE; @@ -3531,14 +3531,14 @@ __mmplayer_gst_get_position(mm_player_t *player, gint64 *position) } int -__mmplayer_gst_get_buffer_position(mm_player_t *player, int *start_pos, int *end_pos) +__mmplayer_gst_get_buffer_position(mmplayer_t *player, int *start_pos, int *end_pos) { #define STREAMING_IS_FINISHED 0 #define BUFFERING_MAX_PER 100 #define DEFAULT_PER_VALUE -1 #define CHECK_PERCENT_VALUE(a, min, max)(((a) > (min)) ? (((a) < (max)) ? (a) : (max)) : (min)) - MMPlayerGstElement *mainbin = NULL; + mmplayer_gst_element_t *mainbin = NULL; gint start_per = DEFAULT_PER_VALUE, end_per = DEFAULT_PER_VALUE; gint64 buffered_total = 0; gint64 position = 0; @@ -3661,7 +3661,7 @@ __mmplayer_gst_get_buffer_position(mm_player_t *player, int *start_pos, int *end } GstElement * -__mmplayer_gst_create_source(mm_player_t *player) +__mmplayer_gst_create_source(mmplayer_t *player) { GstElement *element = NULL; @@ -3693,7 +3693,7 @@ __mmplayer_gst_create_source(mm_player_t *player) } int -__mmplayer_gst_build_es_pipeline(mm_player_t *player) +__mmplayer_gst_build_es_pipeline(mmplayer_t *player) { MMHandleType attrs = 0; @@ -3728,14 +3728,14 @@ __mmplayer_gst_build_es_pipeline(mm_player_t *player) } int -__mmplayer_gst_build_pipeline(mm_player_t *player) +__mmplayer_gst_build_pipeline(mmplayer_t *player) { - MMPlayerGstElement *mainbin = NULL; + mmplayer_gst_element_t *mainbin = NULL; GstElement *src_elem = NULL; GstElement *autoplug_elem = NULL; GList *element_bucket = NULL; MMHandleType attrs = 0; - enum MainElementID autoplug_elem_id = MMPLAYER_M_NUM; + main_element_id_e autoplug_elem_id = MMPLAYER_M_NUM; MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player && player->pipeline && @@ -3908,10 +3908,10 @@ ERROR: } int -__mmplayer_gst_add_bus_watch(mm_player_t *player) +__mmplayer_gst_add_bus_watch(mmplayer_t *player) { GstBus *bus = NULL; - MMPlayerGstElement *mainbin = NULL; + mmplayer_gst_element_t *mainbin = NULL; MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player && player->pipeline && diff --git a/src/mm_player_ini.c b/src/mm_player_ini.c index dca9e1e..5bdec47 100644 --- a/src/mm_player_ini.c +++ b/src/mm_player_ini.c @@ -37,7 +37,7 @@ #ifdef MM_PLAYER_DEFAULT_INI static gboolean __generate_default_ini(void); #endif -static void __get_element_list(mm_player_ini_t *ini, gchar *str, int keyword_type); +static void __get_element_list(mmplayer_ini_t *ini, gchar *str, int keyword_type); static void __mm_player_ini_check_ini_status(void); @@ -109,7 +109,7 @@ static void __mm_player_ini_check_ini_status(void); } while (0) int -mm_player_ini_load(mm_player_ini_t *ini) +mm_player_ini_load(mmplayer_ini_t *ini) { dictionary *dict = NULL; gint idx = 0; @@ -134,7 +134,7 @@ mm_player_ini_load(mm_player_ini_t *ini) } /* get ini values */ - memset(ini, 0, sizeof(mm_player_ini_t)); + memset(ini, 0, sizeof(mmplayer_ini_t)); if (dict) { /* if dict is available */ @@ -302,7 +302,7 @@ mm_player_ini_load(mm_player_ini_t *ini) } int -mm_player_audio_effect_ini_load(mm_player_ini_t *ini) +mm_player_audio_effect_ini_load(mmplayer_ini_t *ini) { dictionary *dict_audioeffect = NULL; @@ -446,7 +446,7 @@ __generate_default_ini(void) #endif static void -__get_element_list(mm_player_ini_t *ini, gchar *str, int keyword_type) +__get_element_list(mmplayer_ini_t *ini, gchar *str, int keyword_type) { gchar **list = NULL; gchar **walk = NULL; diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c index 91b8523..fe5ef87 100644 --- a/src/mm_player_priv.c +++ b/src/mm_player_priv.c @@ -132,12 +132,12 @@ static sound_stream_info_h stream_info; /*--------------------------------------------------------------------------- | LOCAL FUNCTION PROTOTYPES: | ---------------------------------------------------------------------------*/ -static int __mmplayer_gst_create_pipeline(mm_player_t *player); -static int __mmplayer_gst_destroy_pipeline(mm_player_t *player); -static int __mmplayer_gst_create_text_pipeline(mm_player_t *player); -static int __mmplayer_gst_create_video_sink_bin(mm_player_t *player, GstCaps *caps, MMDisplaySurfaceType surface_type); -static int __mmplayer_gst_create_audio_sink_bin(mm_player_t *player); -static int __mmplayer_gst_create_text_sink_bin(mm_player_t *player); +static int __mmplayer_gst_create_pipeline(mmplayer_t *player); +static int __mmplayer_gst_destroy_pipeline(mmplayer_t *player); +static int __mmplayer_gst_create_text_pipeline(mmplayer_t *player); +static int __mmplayer_gst_create_video_sink_bin(mmplayer_t *player, GstCaps *caps, MMDisplaySurfaceType surface_type); +static int __mmplayer_gst_create_audio_sink_bin(mmplayer_t *player); +static int __mmplayer_gst_create_text_sink_bin(mmplayer_t *player); static GstPadProbeReturn __mmplayer_gst_selector_blocked(GstPad *pad, GstPadProbeInfo *info, gpointer data); static void __mmplayer_gst_decode_no_more_pads(GstElement *elem, gpointer data); @@ -149,60 +149,60 @@ static void __mmplayer_gst_decode_drained(GstElement *bin, gpointer data); static void __mmplayer_pipeline_complete(GstElement *decodebin, gpointer data); static gboolean __mmplayer_is_midi_type(gchar *str_caps); static gboolean __mmplayer_is_only_mp3_type(gchar *str_caps); -static void __mmplayer_set_audio_attrs(mm_player_t *player, GstCaps *caps); +static void __mmplayer_set_audio_attrs(mmplayer_t *player, GstCaps *caps); static gboolean __mmplayer_update_subtitle(GstElement *object, GstBuffer *buffer, GstPad *pad, gpointer data); -static void __mmplayer_release_misc(mm_player_t *player); -static void __mmplayer_release_misc_post(mm_player_t *player); -static gboolean __mmplayer_init_gstreamer(mm_player_t *player); +static void __mmplayer_release_misc(mmplayer_t *player); +static void __mmplayer_release_misc_post(mmplayer_t *player); +static gboolean __mmplayer_init_gstreamer(mmplayer_t *player); static void __mmplayer_video_stream_decoded_preroll_cb(GstElement *object, GstBuffer *buffer, GstPad *pad, gpointer data); static void __mmplayer_video_stream_decoded_render_cb(GstElement *object, GstBuffer *buffer, GstPad *pad, gpointer data); static GstPadProbeReturn __mmplayer_subtitle_adjust_position_probe(GstPad *pad, GstPadProbeInfo *info, gpointer u_data); -static int __mmplayer_change_selector_pad(mm_player_t *player, MMPlayerTrackType type, int index); - -static gboolean __mmplayer_check_subtitle(mm_player_t *player); -static int __mmplayer_handle_missed_plugin(mm_player_t *player); -static int __mmplayer_check_not_supported_codec(mm_player_t *player, const gchar *factory_class, const gchar *mime); -static void __mmplayer_add_sink(mm_player_t *player, GstElement *sink); -static void __mmplayer_del_sink(mm_player_t *player, GstElement *sink); -static void __mmplayer_release_signal_connection(mm_player_t *player, MMPlayerSignalType type); +static int __mmplayer_change_selector_pad(mmplayer_t *player, mmplayer_track_type_e type, int index); + +static gboolean __mmplayer_check_subtitle(mmplayer_t *player); +static int __mmplayer_handle_missed_plugin(mmplayer_t *player); +static int __mmplayer_check_not_supported_codec(mmplayer_t *player, const gchar *factory_class, const gchar *mime); +static void __mmplayer_add_sink(mmplayer_t *player, GstElement *sink); +static void __mmplayer_del_sink(mmplayer_t *player, GstElement *sink); +static void __mmplayer_release_signal_connection(mmplayer_t *player, mmplayer_signal_type_e type); static gpointer __mmplayer_gapless_play_thread(gpointer data); -static gboolean __mmplayer_add_dump_buffer_probe(mm_player_t *player, GstElement *element); +static gboolean __mmplayer_add_dump_buffer_probe(mmplayer_t *player, GstElement *element); static GstPadProbeReturn __mmplayer_dump_buffer_probe_cb(GstPad *pad, GstPadProbeInfo *info, gpointer u_data); static void __mmplayer_release_dump_list(GList *dump_list); -static int __mmplayer_gst_realize(mm_player_t *player); -static int __mmplayer_gst_unrealize(mm_player_t *player); -static int __mmplayer_gst_adjust_subtitle_position(mm_player_t *player, int format, int position); -static int __mmplayer_gst_set_message_callback(mm_player_t *player, MMMessageCallback callback, gpointer user_param); +static int __mmplayer_gst_realize(mmplayer_t *player); +static int __mmplayer_gst_unrealize(mmplayer_t *player); +static int __mmplayer_gst_adjust_subtitle_position(mmplayer_t *player, int position); +static int __mmplayer_gst_set_message_callback(mmplayer_t *player, MMMessageCallback callback, gpointer user_param); /* util */ -static gboolean __mmplayer_verify_gapless_play_path(mm_player_t *player); -static void __mmplayer_activate_next_source(mm_player_t *player, GstState target); -static void __mmplayer_check_pipeline(mm_player_t *player); -static gboolean __mmplayer_deactivate_selector(mm_player_t *player, MMPlayerTrackType type); -static void __mmplayer_deactivate_old_path(mm_player_t *player); -static int __mmplayer_gst_create_plain_text_elements(mm_player_t *player); +static gboolean __mmplayer_verify_gapless_play_path(mmplayer_t *player); +static void __mmplayer_activate_next_source(mmplayer_t *player, GstState target); +static void __mmplayer_check_pipeline(mmplayer_t *player); +static gboolean __mmplayer_deactivate_selector(mmplayer_t *player, mmplayer_track_type_e type); +static void __mmplayer_deactivate_old_path(mmplayer_t *player); +static int __mmplayer_gst_create_plain_text_elements(mmplayer_t *player); static guint32 _mmplayer_convert_fourcc_string_to_value(const gchar *format_name); static void __mmplayer_gst_caps_notify_cb(GstPad *pad, GParamSpec *unused, gpointer data); -static void __mmplayer_audio_stream_send_data(mm_player_t *player, mm_player_audio_stream_buff_t *a_buffer); -static void __mmplayer_initialize_storage_info(mm_player_t *player, MMPlayerPathType path_type); +static void __mmplayer_audio_stream_send_data(mmplayer_t *player, mmplayer_audio_stream_buff_t *a_buffer); +static void __mmplayer_initialize_storage_info(mmplayer_t *player, mmplayer_path_type_e path_type); static int __resource_release_cb(mm_resource_manager_h rm, mm_resource_manager_res_h res, void *user_data); -static gboolean __mmplayer_update_duration_value(mm_player_t *player); -static gboolean __mmplayer_update_audio_attrs(mm_player_t *player, MMHandleType attrs); -static gboolean __mmplayer_update_video_attrs(mm_player_t *player, MMHandleType attrs); -static gboolean __mmplayer_update_bitrate_attrs(mm_player_t *player, MMHandleType attrs); - -static void __mmplayer_copy_uri_and_set_type(MMPlayerParseProfile *data, const char *uri, int uri_type); -static int __mmplayer_set_mem_uri(MMPlayerParseProfile *data, char *path, void *param); -static int __mmplayer_set_file_uri(MMPlayerParseProfile *data, const char *uri); - -static MMPlayerVideoStreamDataType *__mmplayer_create_stream_from_pad(GstPad *pad); -static void __mmplayer_zerocopy_set_stride_elevation_bo(MMPlayerVideoStreamDataType *stream, GstMemory *mem); -static gboolean __mmplayer_swcodec_set_stride_elevation(MMPlayerVideoStreamDataType *stream); -static gboolean __mmplayer_swcodec_set_bo(mm_player_t *player, MMPlayerVideoStreamDataType *stream, GstMemory *mem); - -static void __mmplayer_set_pause_state(mm_player_t *player); -static void __mmplayer_set_playing_state(mm_player_t *player); +static gboolean __mmplayer_update_duration_value(mmplayer_t *player); +static gboolean __mmplayer_update_audio_attrs(mmplayer_t *player, MMHandleType attrs); +static gboolean __mmplayer_update_video_attrs(mmplayer_t *player, MMHandleType attrs); +static gboolean __mmplayer_update_bitrate_attrs(mmplayer_t *player, MMHandleType attrs); + +static void __mmplayer_copy_uri_and_set_type(mmplayer_parse_profile_t *data, const char *uri, int uri_type); +static int __mmplayer_set_mem_uri(mmplayer_parse_profile_t *data, char *path, void *param); +static int __mmplayer_set_file_uri(mmplayer_parse_profile_t *data, const char *uri); + +static mmplayer_video_decoded_data_info_t *__mmplayer_create_stream_from_pad(GstPad *pad); +static void __mmplayer_zerocopy_set_stride_elevation_bo(mmplayer_video_decoded_data_info_t *stream, GstMemory *mem); +static gboolean __mmplayer_swcodec_set_stride_elevation(mmplayer_video_decoded_data_info_t *stream); +static gboolean __mmplayer_swcodec_set_bo(mmplayer_t *player, mmplayer_video_decoded_data_info_t *stream, GstMemory *mem); + +static void __mmplayer_set_pause_state(mmplayer_t *player); +static void __mmplayer_set_playing_state(mmplayer_t *player); /*=========================================================================================== | | | FUNCTION DEFINITIONS | @@ -242,7 +242,7 @@ print_tag(const GstTagList *list, const gchar *tag, gpointer unused) /* This function should be called after the pipeline goes PAUSED or higher state. */ gboolean -__mmplayer_update_content_attrs(mm_player_t *player, enum content_attr_flag flag) +__mmplayer_update_content_attrs(mmplayer_t *player, enum content_attr_flag flag) { static gboolean has_duration = FALSE; static gboolean has_video_attrs = FALSE; @@ -316,7 +316,7 @@ __mmplayer_update_content_attrs(mm_player_t *player, enum content_attr_flag flag } MMStreamingType -__mmplayer_get_stream_service_type(mm_player_t *player) +__mmplayer_get_stream_service_type(mmplayer_t *player) { MMStreamingType streaming_type = STREAMING_SERVICE_NONE; @@ -356,7 +356,7 @@ __mmplayer_get_stream_service_type(mm_player_t *player) * it to applicaton by calling callback function */ void -__mmplayer_set_state(mm_player_t *player, int state) +__mmplayer_set_state(mmplayer_t *player, int state) { MMMessageParamType msg = {0, }; @@ -426,10 +426,10 @@ __mmplayer_set_state(mm_player_t *player, int state) } int -__mmplayer_check_state(mm_player_t *player, enum PlayerCommandState command) +__mmplayer_check_state(mmplayer_t *player, mmplayer_command_state_e command) { - MMPlayerStateType current_state = MM_PLAYER_STATE_NUM; - MMPlayerStateType pending_state = MM_PLAYER_STATE_NUM; + mmplayer_state_e current_state = MM_PLAYER_STATE_NUM; + mmplayer_state_e pending_state = MM_PLAYER_STATE_NUM; MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED); @@ -597,8 +597,8 @@ ALREADY_GOING: static gpointer __mmplayer_gapless_play_thread(gpointer data) { - mm_player_t *player = (mm_player_t *)data; - MMPlayerGstElement *mainbin = NULL; + mmplayer_t *player = (mmplayer_t *)data; + mmplayer_gst_element_t *mainbin = NULL; MMPLAYER_RETURN_VAL_IF_FAIL(player, NULL); @@ -652,7 +652,7 @@ __mmplayer_remove_g_source_from_context(GMainContext *context, guint source_id) void __mmplayer_bus_msg_thread_destroy(MMHandleType hplayer) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; GstMessage *msg = NULL; GQueue *queue = NULL; @@ -696,7 +696,7 @@ __mmplayer_bus_msg_thread_destroy(MMHandleType hplayer) } gboolean -__mmplayer_gst_remove_fakesink(mm_player_t *player, MMPlayerGstElement *fakesink) +__mmplayer_gst_remove_fakesink(mmplayer_t *player, mmplayer_gst_element_t *fakesink) { GstElement *parent = NULL; @@ -763,7 +763,7 @@ __mmplayer_gst_selector_blocked(GstPad *pad, GstPadProbeInfo *info, gpointer dat } static void -__mmplayer_gst_selector_update_start_time(mm_player_t *player, MMPlayerTrackType stream_type) +__mmplayer_gst_selector_update_start_time(mmplayer_t *player, mmplayer_track_type_e stream_type) { gint64 stop_running_time = 0; gint64 position_running_time = 0; @@ -827,11 +827,11 @@ __mmplayer_gst_selector_event_probe(GstPad *pad, GstPadProbeInfo *info, gpointer { GstPadProbeReturn ret = GST_PAD_PROBE_OK; GstEvent *event = GST_PAD_PROBE_INFO_DATA(info); - mm_player_t *player = (mm_player_t *)data; + mmplayer_t *player = (mmplayer_t *)data; GstCaps *caps = NULL; GstStructure *str = NULL; const gchar *name = NULL; - MMPlayerTrackType stream_type = MM_PLAYER_TRACK_TYPE_VIDEO; + mmplayer_track_type_e stream_type = MM_PLAYER_TRACK_TYPE_VIDEO; gboolean caps_ret = TRUE; if (GST_EVENT_IS_DOWNSTREAM(event) && @@ -972,7 +972,7 @@ ERROR: /* create fakesink for audio or video path witout audiobin or videobin */ static void -__mmplayer_gst_make_fakesink(mm_player_t *player, GstPad *pad, const gchar *name) +__mmplayer_gst_make_fakesink(mmplayer_t *player, GstPad *pad, const gchar *name) { GstElement *pipeline = NULL; GstElement *fakesink = NULL; @@ -1027,7 +1027,7 @@ EXIT: } static GstElement * -__mmplayer_gst_make_selector(mm_player_t *player, enum MainElementID elem_idx, MMPlayerTrackType stream_type) +__mmplayer_gst_make_selector(mmplayer_t *player, main_element_id_e elem_idx, mmplayer_track_type_e stream_type) { GstElement *pipeline = NULL; GstElement *selector = NULL; @@ -1070,7 +1070,7 @@ __mmplayer_gst_make_selector(mm_player_t *player, enum MainElementID elem_idx, M void __mmplayer_gst_decode_pad_added(GstElement *elem, GstPad *pad, gpointer data) { - mm_player_t *player = (mm_player_t *)data; + mmplayer_t *player = (mmplayer_t *)data; GstElement *selector = NULL; GstCaps *caps = NULL; GstStructure *str = NULL; @@ -1079,8 +1079,8 @@ __mmplayer_gst_decode_pad_added(GstElement *elem, GstPad *pad, gpointer data) gboolean first_track = FALSE; gboolean caps_ret = TRUE; - enum MainElementID elem_idx = MMPLAYER_M_NUM; - MMPlayerTrackType stream_type = MM_PLAYER_TRACK_TYPE_AUDIO; + main_element_id_e elem_idx = MMPLAYER_M_NUM; + mmplayer_track_type_e stream_type = MM_PLAYER_TRACK_TYPE_AUDIO; MMPLAYER_FENTER(); MMPLAYER_RETURN_IF_FAIL(elem && pad); @@ -1202,7 +1202,7 @@ ERROR: } static gboolean -__mmplayer_create_sink_path(mm_player_t *player, GstElement *selector, MMPlayerTrackType type) +__mmplayer_create_sink_path(mmplayer_t *player, GstElement *selector, mmplayer_track_type_e type) { GstPad *srcpad = NULL; @@ -1242,7 +1242,7 @@ __mmplayer_create_sink_path(mm_player_t *player, GstElement *selector, MMPlayerT } static void -__mmplayer_set_decode_track_info(mm_player_t *player, MMPlayerTrackType type) +__mmplayer_set_decode_track_info(mmplayer_t *player, mmplayer_track_type_e type) { MMHandleType attrs = 0; gint active_index = 0; @@ -1279,7 +1279,7 @@ __mmplayer_set_decode_track_info(mm_player_t *player, MMPlayerTrackType type) } static gboolean -__mmplayer_create_audio_sink_path(mm_player_t *player, GstElement *audio_selector) +__mmplayer_create_audio_sink_path(mmplayer_t *player, GstElement *audio_selector) { MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player && player->pipeline, FALSE); @@ -1318,7 +1318,7 @@ __mmplayer_create_audio_sink_path(mm_player_t *player, GstElement *audio_selecto } static gboolean -__mmplayer_create_text_sink_path(mm_player_t *player, GstElement *text_selector) +__mmplayer_create_text_sink_path(mmplayer_t *player, GstElement *text_selector) { MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player && text_selector, FALSE); @@ -1347,7 +1347,7 @@ __mmplayer_create_text_sink_path(mm_player_t *player, GstElement *text_selector) } static gboolean -__mmplayer_gst_set_queue2_buffering(mm_player_t *player) +__mmplayer_gst_set_queue2_buffering(mmplayer_t *player) { gint64 dur_bytes = 0L; @@ -1373,13 +1373,13 @@ __mmplayer_gst_set_queue2_buffering(mm_player_t *player) static void __mmplayer_gst_decode_no_more_pads(GstElement *elem, gpointer data) { - mm_player_t *player = NULL; + mmplayer_t *player = NULL; GstElement *video_selector = NULL; GstElement *audio_selector = NULL; GstElement *text_selector = NULL; MMPLAYER_FENTER(); - player = (mm_player_t *)data; + player = (mmplayer_t *)data; LOGD("no-more-pad signal handling"); @@ -1435,7 +1435,7 @@ EXIT: } static gboolean -__mmplayer_gst_add_sinkbin_to_pipeline(mm_player_t *player, GstElement *sinkbin, GstPad *pad, gboolean reusing, gchar *sink_pad_name) +__mmplayer_gst_add_sinkbin_to_pipeline(mmplayer_t *player, GstElement *sinkbin, GstPad *pad, gboolean reusing, gchar *sink_pad_name) { gboolean ret = FALSE; GstElement *pipeline = NULL; @@ -1499,7 +1499,7 @@ EXIT: static void __mmplayer_gst_create_sinkbin(GstElement *elem, GstPad *pad, gpointer data) { - mm_player_t *player = NULL; + mmplayer_t *player = NULL; GstCaps *caps = NULL; gchar *caps_str = NULL; GstStructure *str = NULL; @@ -1510,7 +1510,7 @@ __mmplayer_gst_create_sinkbin(GstElement *elem, GstPad *pad, gpointer data) gchar *sink_pad_name = "sink"; /* check handles */ - player = (mm_player_t *)data; + player = (mmplayer_t *)data; MMPLAYER_FENTER(); MMPLAYER_RETURN_IF_FAIL(elem && pad); @@ -1636,7 +1636,7 @@ ERROR: } static gboolean -__mmplayer_get_property_value_for_rotation(mm_player_t *player, int display_angle, int orientation, int *value) +__mmplayer_get_property_value_for_rotation(mmplayer_t *player, int display_angle, int orientation, int *value) { int required_angle = 0; /* Angle required for straight view */ int rotation_angle = 0; @@ -1691,7 +1691,7 @@ __mmplayer_get_property_value_for_rotation(mm_player_t *player, int display_angl } int -__mmplayer_video_param_check_video_sink_bin(mm_player_t *player) +__mmplayer_video_param_check_video_sink_bin(mmplayer_t *player) { /* check video sinkbin is created */ MMPLAYER_RETURN_VAL_IF_FAIL(player && @@ -1705,7 +1705,7 @@ __mmplayer_video_param_check_video_sink_bin(mm_player_t *player) } int -__mmplayer_get_video_angle(mm_player_t *player, int *display_angle, int *orientation) +__mmplayer_get_video_angle(mmplayer_t *player, int *display_angle, int *orientation) { int display_rotation = 0; gchar *org_orient = NULL; @@ -1765,7 +1765,7 @@ __mmplayer_get_video_angle(mm_player_t *player, int *display_angle, int *orienta } void -__mmplayer_video_param_set_display_rotation(mm_player_t *player) +__mmplayer_video_param_set_display_rotation(mmplayer_t *player) { int rotation_value = 0; int orientations = 0; // current supported angle values are 0, 90, 180, 270 @@ -1785,7 +1785,7 @@ __mmplayer_video_param_set_display_rotation(mm_player_t *player) } void -__mmplayer_video_param_set_display_visible(mm_player_t *player) +__mmplayer_video_param_set_display_visible(mmplayer_t *player) { MMHandleType attrs = 0; int visible = 0; @@ -1804,7 +1804,7 @@ __mmplayer_video_param_set_display_visible(mm_player_t *player) } void -__mmplayer_video_param_set_display_method(mm_player_t *player) +__mmplayer_video_param_set_display_method(mmplayer_t *player) { MMHandleType attrs = 0; int display_method = 0; @@ -1823,7 +1823,7 @@ __mmplayer_video_param_set_display_method(mm_player_t *player) } void -__mmplayer_video_param_set_video_roi_area(mm_player_t *player) +__mmplayer_video_param_set_video_roi_area(mmplayer_t *player) { MMHandleType attrs = 0; void *handle = NULL; @@ -1848,7 +1848,7 @@ __mmplayer_video_param_set_video_roi_area(mm_player_t *player) } void -__mmplayer_video_param_set_roi_area(mm_player_t *player) +__mmplayer_video_param_set_roi_area(mmplayer_t *player) { MMHandleType attrs = 0; void *handle = NULL; @@ -1887,7 +1887,7 @@ __mmplayer_video_param_set_roi_area(mm_player_t *player) } void -__mmplayer_video_param_set_display_overlay(mm_player_t *player) +__mmplayer_video_param_set_display_overlay(mmplayer_t *player) { MMHandleType attrs = 0; void *handle = NULL; @@ -1917,7 +1917,7 @@ __mmplayer_video_param_set_display_overlay(mm_player_t *player) } int -__mmplayer_update_wayland_videosink_video_param(mm_player_t *player, char *param_name) +__mmplayer_update_wayland_videosink_video_param(mmplayer_t *player, char *param_name) { gboolean update_all_param = FALSE; MMPLAYER_FENTER(); @@ -1952,7 +1952,7 @@ __mmplayer_update_wayland_videosink_video_param(mm_player_t *player, char *param } int -_mmplayer_update_video_param(mm_player_t *player, char *param_name) +_mmplayer_update_video_param(mmplayer_t *player, char *param_name) { MMHandleType attrs = 0; int surface_type = 0; @@ -1995,7 +1995,7 @@ int _mmplayer_set_audio_only(MMHandleType hplayer, bool audio_only) { gboolean disable_overlay = FALSE; - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int ret = MM_ERROR_NONE; MMPLAYER_FENTER(); @@ -2070,7 +2070,7 @@ ERROR: int _mmplayer_get_audio_only(MMHandleType hplayer, bool *paudio_only) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; gboolean disable_overlay = FALSE; MMPLAYER_FENTER(); @@ -2101,19 +2101,19 @@ int __mmplayer_gst_element_link_bucket(GList *element_bucket) { GList *bucket = element_bucket; - MMPlayerGstElement *element = NULL; - MMPlayerGstElement *prv_element = NULL; + mmplayer_gst_element_t *element = NULL; + mmplayer_gst_element_t *prv_element = NULL; gint successful_link_count = 0; MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(element_bucket, -1); - prv_element = (MMPlayerGstElement *)bucket->data; + prv_element = (mmplayer_gst_element_t *)bucket->data; bucket = bucket->next; for (; bucket; bucket = bucket->next) { - element = (MMPlayerGstElement *)bucket->data; + element = (mmplayer_gst_element_t *)bucket->data; if (element && element->gst) { if (prv_element && prv_element->gst) { @@ -2143,7 +2143,7 @@ int __mmplayer_gst_element_add_bucket_to_bin(GstBin *bin, GList *element_bucket) { GList *bucket = element_bucket; - MMPlayerGstElement *element = NULL; + mmplayer_gst_element_t *element = NULL; int successful_add_count = 0; MMPLAYER_FENTER(); @@ -2152,7 +2152,7 @@ __mmplayer_gst_element_add_bucket_to_bin(GstBin *bin, GList *element_bucket) MMPLAYER_RETURN_VAL_IF_FAIL(bin, 0); for (; bucket; bucket = bucket->next) { - element = (MMPlayerGstElement *)bucket->data; + element = (mmplayer_gst_element_t *)bucket->data; if (element && element->gst) { if (!gst_bin_add(bin, GST_ELEMENT(element->gst))) { @@ -2173,7 +2173,7 @@ __mmplayer_gst_element_add_bucket_to_bin(GstBin *bin, GList *element_bucket) static void __mmplayer_gst_caps_notify_cb(GstPad *pad, GParamSpec *unused, gpointer data) { - mm_player_t *player = (mm_player_t *)data; + mmplayer_t *player = (mmplayer_t *)data; GstCaps *caps = NULL; GstStructure *str = NULL; const char *name; @@ -2251,7 +2251,7 @@ ERROR: } while (0); void -__mmplayer_audio_stream_clear_buffer(mm_player_t *player, gboolean send_all) +__mmplayer_audio_stream_clear_buffer(mmplayer_t *player, gboolean send_all) { GList *l = NULL; @@ -2260,7 +2260,7 @@ __mmplayer_audio_stream_clear_buffer(mm_player_t *player, gboolean send_all) if (player->audio_stream_buff_list) { for (l = g_list_first(player->audio_stream_buff_list); l; l = g_list_next(l)) { - mm_player_audio_stream_buff_t *tmp = (mm_player_audio_stream_buff_t *)l->data; + mmplayer_audio_stream_buff_t *tmp = (mmplayer_audio_stream_buff_t *)l->data; if (tmp) { if (send_all) { LOGD("[%"G_GUINT64_FORMAT"] send remained data.", tmp->channel_mask); @@ -2278,9 +2278,9 @@ __mmplayer_audio_stream_clear_buffer(mm_player_t *player, gboolean send_all) } static void -__mmplayer_audio_stream_send_data(mm_player_t *player, mm_player_audio_stream_buff_t *a_buffer) +__mmplayer_audio_stream_send_data(mmplayer_t *player, mmplayer_audio_stream_buff_t *a_buffer) { - MMPlayerAudioStreamDataType audio_stream = { 0, }; + mmplayer_audio_decoded_data_info_t audio_stream = { 0, }; MMPLAYER_FENTER(); MMPLAYER_RETURN_IF_FAIL(player && player->audio_stream_render_cb); @@ -2302,7 +2302,7 @@ __mmplayer_audio_stream_send_data(mm_player_t *player, mm_player_audio_stream_bu static void __mmplayer_audio_stream_decoded_render_cb(GstElement *object, GstBuffer *buffer, GstPad *pad, gpointer data) { - mm_player_t *player = (mm_player_t *)data; + mmplayer_t *player = (mmplayer_t *)data; gint channel = 0; gint rate = 0; gint depth = 0; @@ -2310,7 +2310,7 @@ __mmplayer_audio_stream_decoded_render_cb(GstElement *object, GstBuffer *buffer, guint64 channel_mask = 0; void *a_data = NULL; gint a_size = 0; - mm_player_audio_stream_buff_t *a_buffer = NULL; + mmplayer_audio_stream_buff_t *a_buffer = NULL; GstMapInfo mapinfo = GST_MAP_INFO_INIT; GList *l = NULL; @@ -2336,7 +2336,7 @@ __mmplayer_audio_stream_decoded_render_cb(GstElement *object, GstBuffer *buffer, * The num of buffer list depends on the num of audio channels */ if (player->audio_stream_buff_list) { for (l = g_list_first(player->audio_stream_buff_list); l; l = g_list_next(l)) { - mm_player_audio_stream_buff_t *tmp = (mm_player_audio_stream_buff_t *)l->data; + mmplayer_audio_stream_buff_t *tmp = (mmplayer_audio_stream_buff_t *)l->data; if (tmp) { if (channel_mask == tmp->channel_mask) { /* LOGD("[%"G_GUINT64_FORMAT"] total: %d, data: %d, buffer: %d", channel_mask, tmp->data_size, a_size, tmp->buff_size); */ @@ -2370,7 +2370,7 @@ __mmplayer_audio_stream_decoded_render_cb(GstElement *object, GstBuffer *buffer, } /* create new audio stream data */ - a_buffer = (mm_player_audio_stream_buff_t *)g_try_malloc0(sizeof(mm_player_audio_stream_buff_t)); + a_buffer = (mmplayer_audio_stream_buff_t *)g_try_malloc0(sizeof(mmplayer_audio_stream_buff_t)); if (a_buffer == NULL) { LOGE("failed to alloc data."); goto DONE; @@ -2409,8 +2409,8 @@ DONE: static void __mmplayer_gst_audio_deinterleave_pad_added(GstElement *elem, GstPad *pad, gpointer data) { - mm_player_t *player = (mm_player_t *)data; - MMPlayerGstElement *audiobin = player->pipeline->audiobin; + mmplayer_t *player = (mmplayer_t *)data; + mmplayer_gst_element_t *audiobin = player->pipeline->audiobin; GstPad *sinkpad = NULL; GstElement *queue = NULL, *sink = NULL; @@ -2481,7 +2481,7 @@ ERROR: } void -__mmplayer_gst_set_pulsesink_property(mm_player_t *player, MMHandleType attrs) +__mmplayer_gst_set_pulsesink_property(mmplayer_t *player, MMHandleType attrs) { #define MAX_PROPS_LEN 128 gint latency_mode = 0; @@ -2543,9 +2543,9 @@ __mmplayer_gst_set_pulsesink_property(mm_player_t *player, MMHandleType attrs) } void -__mmplayer_gst_set_openalsink_property(mm_player_t *player) +__mmplayer_gst_set_openalsink_property(mmplayer_t *player) { - MMPlayerGstElement *audiobin = NULL; + mmplayer_gst_element_t *audiobin = NULL; MMPLAYER_FENTER(); MMPLAYER_RETURN_IF_FAIL(player && player->pipeline && player->pipeline->audiobin); @@ -2573,9 +2573,9 @@ __mmplayer_gst_set_openalsink_property(mm_player_t *player) } static int -__mmplayer_gst_fill_audio_bucket(mm_player_t *player, GList **bucket) +__mmplayer_gst_fill_audio_bucket(mmplayer_t *player, GList **bucket) { - MMPlayerGstElement *audiobin = NULL; + mmplayer_gst_element_t *audiobin = NULL; MMHandleType attrs = 0; GList *element_bucket = NULL; GstCaps *acaps = NULL; @@ -2784,10 +2784,10 @@ ERROR: } static int -__mmplayer_gst_create_audio_sink_bin(mm_player_t *player) +__mmplayer_gst_create_audio_sink_bin(mmplayer_t *player) { - MMPlayerGstElement *first_element = NULL; - MMPlayerGstElement *audiobin = NULL; + mmplayer_gst_element_t *first_element = NULL; + mmplayer_gst_element_t *audiobin = NULL; GstPad *pad = NULL; GstPad *ghostpad = NULL; GList *element_bucket = NULL; @@ -2797,7 +2797,7 @@ __mmplayer_gst_create_audio_sink_bin(mm_player_t *player) MMPLAYER_RETURN_VAL_IF_FAIL(player && player->pipeline, MM_ERROR_PLAYER_NOT_INITIALIZED); /* alloc handles */ - audiobin = (MMPlayerGstElement *)g_try_malloc0(sizeof(MMPlayerGstElement) * MMPLAYER_A_NUM); + audiobin = (mmplayer_gst_element_t *)g_try_malloc0(sizeof(mmplayer_gst_element_t) * MMPLAYER_A_NUM); if (!audiobin) { LOGE("failed to allocate memory for audiobin"); return MM_ERROR_PLAYER_NO_FREE_SPACE; @@ -2829,7 +2829,7 @@ __mmplayer_gst_create_audio_sink_bin(mm_player_t *player) goto ERROR; /* get first element's sinkpad for creating ghostpad */ - first_element = (MMPlayerGstElement *)element_bucket->data; + first_element = (mmplayer_gst_element_t *)element_bucket->data; if (!first_element) { LOGE("failed to get first elem"); goto ERROR; @@ -2904,7 +2904,7 @@ _mmplayer_convert_fourcc_string_to_value(const gchar *format_name) } int -_mmplayer_video_stream_release_bo(mm_player_t *player, void *bo) +_mmplayer_video_stream_release_bo(mmplayer_t *player, void *bo) { int ret = MM_ERROR_NONE; GList *l = NULL; @@ -2915,7 +2915,7 @@ _mmplayer_video_stream_release_bo(mm_player_t *player, void *bo) if (player->video_bo_list) { for (l = g_list_first(player->video_bo_list); l; l = g_list_next(l)) { - mm_player_video_bo_info_t *tmp = (mm_player_video_bo_info_t *)l->data; + mmplayer_video_bo_info_t *tmp = (mmplayer_video_bo_info_t *)l->data; if (tmp && tmp->bo == bo) { tmp->used = FALSE; LOGD("release bo %p", bo); @@ -2936,7 +2936,7 @@ _mmplayer_video_stream_release_bo(mm_player_t *player, void *bo) } static void -__mmplayer_video_stream_destroy_bo_list(mm_player_t *player) +__mmplayer_video_stream_destroy_bo_list(mmplayer_t *player) { GList *l = NULL; @@ -2947,7 +2947,7 @@ __mmplayer_video_stream_destroy_bo_list(mm_player_t *player) if (player->video_bo_list) { LOGD("destroy video_bo_list : %d", g_list_length(player->video_bo_list)); for (l = g_list_first(player->video_bo_list); l; l = g_list_next(l)) { - mm_player_video_bo_info_t *tmp = (mm_player_video_bo_info_t *)l->data; + mmplayer_video_bo_info_t *tmp = (mmplayer_video_bo_info_t *)l->data; if (tmp) { if (tmp->bo) tbm_bo_unref(tmp->bo); @@ -2965,7 +2965,7 @@ __mmplayer_video_stream_destroy_bo_list(mm_player_t *player) } static void * -__mmplayer_video_stream_get_bo(mm_player_t *player, int size) +__mmplayer_video_stream_get_bo(mmplayer_t *player, int size) { GList *l = NULL; MMPLAYER_RETURN_VAL_IF_FAIL(player, NULL); @@ -2994,7 +2994,7 @@ __mmplayer_video_stream_get_bo(mm_player_t *player, int size) } for (; idx < player->ini.num_of_video_bo; idx++) { - mm_player_video_bo_info_t *bo_info = g_new(mm_player_video_bo_info_t, 1); + mmplayer_video_bo_info_t *bo_info = g_new(mmplayer_video_bo_info_t, 1); if (!bo_info) { LOGE("Fail to alloc bo_info."); break; @@ -3025,7 +3025,7 @@ __mmplayer_video_stream_get_bo(mm_player_t *player, int size) while (TRUE) { /* get bo from list*/ for (l = g_list_first(player->video_bo_list); l; l = g_list_next(l)) { - mm_player_video_bo_info_t *tmp = (mm_player_video_bo_info_t *)l->data; + mmplayer_video_bo_info_t *tmp = (mmplayer_video_bo_info_t *)l->data; if (tmp && (tmp->used == FALSE)) { LOGD("found bo %p to use", tmp->bo); tmp->used = TRUE; @@ -3052,7 +3052,7 @@ __mmplayer_video_stream_get_bo(mm_player_t *player, int size) static void __mmplayer_video_stream_decoded_preroll_cb(GstElement *object, GstBuffer *buffer, GstPad *pad, gpointer data) { - mm_player_t *player = (mm_player_t *)data; + mmplayer_t *player = (mmplayer_t *)data; MMPLAYER_FENTER(); MMPLAYER_RETURN_IF_FAIL(player && player->video_stream_cb); @@ -3068,8 +3068,8 @@ __mmplayer_video_stream_decoded_preroll_cb(GstElement *object, GstBuffer *buffer static void __mmplayer_video_stream_decoded_render_cb(GstElement *object, GstBuffer *buffer, GstPad *pad, gpointer data) { - mm_player_t *player = (mm_player_t *)data; - MMPlayerVideoStreamDataType *stream = NULL; + mmplayer_t *player = (mmplayer_t *)data; + mmplayer_video_decoded_data_info_t *stream = NULL; GstMemory *mem = NULL; MMPLAYER_FENTER(); @@ -3138,9 +3138,9 @@ ERROR: } static void -__mmplayer_gst_set_video360_property(mm_player_t *player) +__mmplayer_gst_set_video360_property(mmplayer_t *player) { - MMPlayerGstElement *videobin = NULL; + mmplayer_gst_element_t *videobin = NULL; MMPLAYER_FENTER(); MMPLAYER_RETURN_IF_FAIL(player && player->pipeline && player->pipeline->videobin); @@ -3201,7 +3201,7 @@ __mmplayer_gst_set_video360_property(mm_player_t *player) } static int -__mmplayer_gst_create_video_filters(mm_player_t *player, MMDisplaySurfaceType surface_type, GList **bucket) +__mmplayer_gst_create_video_filters(mmplayer_t *player, MMDisplaySurfaceType surface_type, GList **bucket) { gchar *video_csc = "videoconvert"; /* default colorspace converter */ GList *element_bucket = NULL; @@ -3241,7 +3241,7 @@ ERROR: /* refer MMPLAYER_CREATE_ELEMENT */ } static gchar * -__mmplayer_get_videosink_factory_name(mm_player_t *player, MMDisplaySurfaceType surface_type) +__mmplayer_get_videosink_factory_name(mmplayer_t *player, MMDisplaySurfaceType surface_type) { gchar *factory_name = NULL; @@ -3265,10 +3265,10 @@ __mmplayer_get_videosink_factory_name(mm_player_t *player, MMDisplaySurfaceType } static int -__mmplayer_gst_set_videosink_property(mm_player_t *player, MMDisplaySurfaceType surface_type) +__mmplayer_gst_set_videosink_property(mmplayer_t *player, MMDisplaySurfaceType surface_type) { gchar *factory_name = NULL; - MMPlayerGstElement *videobin = NULL; + mmplayer_gst_element_t *videobin = NULL; MMHandleType attrs; int gapless = 0; @@ -3349,19 +3349,19 @@ __mmplayer_gst_set_videosink_property(mm_player_t *player, MMDisplaySurfaceType * - video overlay surface(arm/x86) : tizenwlsink */ static int -__mmplayer_gst_create_video_sink_bin(mm_player_t *player, GstCaps *caps, MMDisplaySurfaceType surface_type) +__mmplayer_gst_create_video_sink_bin(mmplayer_t *player, GstCaps *caps, MMDisplaySurfaceType surface_type) { GstPad *pad = NULL; GList *element_bucket = NULL; - MMPlayerGstElement *first_element = NULL; - MMPlayerGstElement *videobin = NULL; + mmplayer_gst_element_t *first_element = NULL; + mmplayer_gst_element_t *videobin = NULL; gchar *videosink_factory_name = NULL; MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player && player->pipeline, MM_ERROR_PLAYER_NOT_INITIALIZED); /* alloc handles */ - videobin = (MMPlayerGstElement *)g_try_malloc0(sizeof(MMPlayerGstElement) * MMPLAYER_V_NUM); + videobin = (mmplayer_gst_element_t *)g_try_malloc0(sizeof(mmplayer_gst_element_t) * MMPLAYER_V_NUM); if (!videobin) return MM_ERROR_PLAYER_NO_FREE_SPACE; @@ -3403,7 +3403,7 @@ __mmplayer_gst_create_video_sink_bin(mm_player_t *player, GstCaps *caps, MMDispl } /* get first element's sinkpad for creating ghostpad */ - first_element = (MMPlayerGstElement *)element_bucket->data; + first_element = (mmplayer_gst_element_t *)element_bucket->data; if (!first_element) { LOGE("failed to get first element from bucket"); goto ERROR; @@ -3448,10 +3448,10 @@ ERROR: } static int -__mmplayer_gst_create_plain_text_elements(mm_player_t *player) +__mmplayer_gst_create_plain_text_elements(mmplayer_t *player) { GList *element_bucket = NULL; - MMPlayerGstElement *textbin = player->pipeline->textbin; + mmplayer_gst_element_t *textbin = player->pipeline->textbin; MMPLAYER_CREATE_ELEMENT(textbin, MMPLAYER_T_QUEUE, "queue", "text_queue", TRUE, player); MMPLAYER_CREATE_ELEMENT(textbin, MMPLAYER_T_IDENTITY, "identity", "text_identity", TRUE, player); @@ -3536,9 +3536,9 @@ ERROR: } static int -__mmplayer_gst_create_text_sink_bin(mm_player_t *player) +__mmplayer_gst_create_text_sink_bin(mmplayer_t *player) { - MMPlayerGstElement *textbin = NULL; + mmplayer_gst_element_t *textbin = NULL; GList *element_bucket = NULL; int surface_type = 0; gint i = 0; @@ -3548,7 +3548,7 @@ __mmplayer_gst_create_text_sink_bin(mm_player_t *player) MMPLAYER_RETURN_VAL_IF_FAIL(player && player->pipeline, MM_ERROR_PLAYER_NOT_INITIALIZED); /* alloc handles */ - textbin = (MMPlayerGstElement *)g_try_malloc0(sizeof(MMPlayerGstElement) * MMPLAYER_T_NUM); + textbin = (mmplayer_gst_element_t *)g_try_malloc0(sizeof(mmplayer_gst_element_t) * MMPLAYER_T_NUM); if (!textbin) { LOGE("failed to allocate memory for textbin"); return MM_ERROR_PLAYER_NO_FREE_SPACE; @@ -3623,10 +3623,10 @@ ERROR: } static int -__mmplayer_gst_create_text_pipeline(mm_player_t *player) +__mmplayer_gst_create_text_pipeline(mmplayer_t *player) { - MMPlayerGstElement *mainbin = NULL; - MMPlayerGstElement *textbin = NULL; + mmplayer_gst_element_t *mainbin = NULL; + mmplayer_gst_element_t *textbin = NULL; MMHandleType attrs = 0; GstElement *subsrc = NULL; GstElement *subparse = NULL; @@ -3801,7 +3801,7 @@ ERROR: gboolean __mmplayer_update_subtitle(GstElement *object, GstBuffer *buffer, GstPad *pad, gpointer data) { - mm_player_t *player = (mm_player_t *)data; + mmplayer_t *player = (mmplayer_t *)data; MMMessageParamType msg = {0, }; GstClockTime duration = 0; gpointer text = NULL; @@ -3860,7 +3860,7 @@ __mmplayer_update_subtitle(GstElement *object, GstBuffer *buffer, GstPad *pad, g static GstPadProbeReturn __mmplayer_subtitle_adjust_position_probe(GstPad *pad, GstPadProbeInfo *info, gpointer u_data) { - mm_player_t *player = (mm_player_t *)u_data; + mmplayer_t *player = (mmplayer_t *)u_data; GstClockTime cur_timestamp = 0; gint64 adjusted_timestamp = 0; GstBuffer *buffer = gst_pad_probe_info_get_buffer(info); @@ -3895,7 +3895,7 @@ __mmplayer_subtitle_adjust_position_probe(GstPad *pad, GstPadProbeInfo *info, gp } static int -__mmplayer_gst_adjust_subtitle_position(mm_player_t *player, int format, int position) +__mmplayer_gst_adjust_subtitle_position(mmplayer_t *player, int position) { MMPLAYER_FENTER(); @@ -3909,23 +3909,10 @@ __mmplayer_gst_adjust_subtitle_position(mm_player_t *player, int format, int pos return MM_ERROR_NONE; } - switch (format) { - case MM_PLAYER_POS_FORMAT_TIME: - { - /* check current postion */ - player->adjust_subtitle_pos = position; + /* check current postion */ + player->adjust_subtitle_pos = position; - LOGD("save adjust_subtitle_pos in player") ; - } - break; - - default: - { - LOGW("invalid format."); - MMPLAYER_FLEAVE(); - return MM_ERROR_INVALID_ARGUMENT; - } - } + LOGD("save adjust_subtitle_pos in player"); MMPLAYER_FLEAVE(); @@ -3942,10 +3929,10 @@ __mmplayer_gst_adjust_subtitle_position(mm_player_t *player, int format, int pos * @see */ static int -__mmplayer_gst_create_pipeline(mm_player_t *player) +__mmplayer_gst_create_pipeline(mmplayer_t *player) { int ret = MM_ERROR_NONE; - MMPlayerGstElement *mainbin = NULL; + mmplayer_gst_element_t *mainbin = NULL; MMHandleType attrs = 0; MMPLAYER_FENTER(); @@ -3964,12 +3951,12 @@ __mmplayer_gst_create_pipeline(mm_player_t *player) goto INIT_ERROR; } - player->pipeline = (MMPlayerGstPipelineInfo *)g_malloc0(sizeof(MMPlayerGstPipelineInfo)); + player->pipeline = (mmplayer_pipeline_info_t *)g_malloc0(sizeof(mmplayer_pipeline_info_t)); if (player->pipeline == NULL) goto INIT_ERROR; /* create mainbin */ - mainbin = (MMPlayerGstElement *)g_try_malloc0(sizeof(MMPlayerGstElement) * MMPLAYER_M_NUM); + mainbin = (mmplayer_gst_element_t *)g_try_malloc0(sizeof(mmplayer_gst_element_t) * MMPLAYER_M_NUM); if (mainbin == NULL) goto INIT_ERROR; @@ -4016,7 +4003,7 @@ INIT_ERROR: } static void -__mmplayer_reset_gapless_state(mm_player_t *player) +__mmplayer_reset_gapless_state(mmplayer_t *player) { MMPLAYER_FENTER(); MMPLAYER_RETURN_IF_FAIL(player @@ -4024,14 +4011,14 @@ __mmplayer_reset_gapless_state(mm_player_t *player) && player->pipeline->audiobin && player->pipeline->audiobin[MMPLAYER_A_BIN].gst); - memset(&player->gapless, 0, sizeof(mm_player_gapless_t)); + memset(&player->gapless, 0, sizeof(mmplayer_gapless_t)); MMPLAYER_FLEAVE(); return; } static int -__mmplayer_gst_destroy_pipeline(mm_player_t *player) +__mmplayer_gst_destroy_pipeline(mmplayer_t *player) { gint timeout = 0; int ret = MM_ERROR_NONE; @@ -4068,16 +4055,16 @@ __mmplayer_gst_destroy_pipeline(mm_player_t *player) /* cleanup gst stuffs */ if (player->pipeline) { - MMPlayerGstElement *mainbin = player->pipeline->mainbin; + mmplayer_gst_element_t *mainbin = player->pipeline->mainbin; GstTagList *tag_list = player->pipeline->tag_list; /* first we need to disconnect all signal hander */ __mmplayer_release_signal_connection(player, MM_PLAYER_SIGNAL_TYPE_ALL); if (mainbin) { - MMPlayerGstElement *audiobin = player->pipeline->audiobin; - MMPlayerGstElement *videobin = player->pipeline->videobin; - MMPlayerGstElement *textbin = player->pipeline->textbin; + mmplayer_gst_element_t *audiobin = player->pipeline->audiobin; + mmplayer_gst_element_t *videobin = player->pipeline->videobin; + mmplayer_gst_element_t *textbin = player->pipeline->textbin; GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(mainbin[MMPLAYER_M_PIPE].gst)); gst_bus_set_sync_handler(bus, NULL, NULL, NULL); gst_object_unref(bus); @@ -4147,7 +4134,7 @@ __mmplayer_gst_destroy_pipeline(mm_player_t *player) } static int -__mmplayer_gst_realize(mm_player_t *player) +__mmplayer_gst_realize(mmplayer_t *player) { gint timeout = 0; int ret = MM_ERROR_NONE; @@ -4187,7 +4174,7 @@ __mmplayer_gst_realize(mm_player_t *player) } static int -__mmplayer_gst_unrealize(mm_player_t *player) +__mmplayer_gst_unrealize(mmplayer_t *player) { int ret = MM_ERROR_NONE; @@ -4220,7 +4207,7 @@ __mmplayer_gst_unrealize(mm_player_t *player) } static int -__mmplayer_gst_set_message_callback(mm_player_t *player, MMMessageCallback callback, gpointer user_param) +__mmplayer_gst_set_message_callback(mmplayer_t *player, MMMessageCallback callback, gpointer user_param) { MMPLAYER_FENTER(); @@ -4240,7 +4227,7 @@ __mmplayer_gst_set_message_callback(mm_player_t *player, MMMessageCallback callb } int -__mmplayer_parse_profile(const char *uri, void *param, MMPlayerParseProfile *data) +__mmplayer_parse_profile(const char *uri, void *param, mmplayer_parse_profile_t *data) { int ret = MM_ERROR_NONE; char *path = NULL; @@ -4251,7 +4238,7 @@ __mmplayer_parse_profile(const char *uri, void *param, MMPlayerParseProfile *dat MMPLAYER_RETURN_VAL_IF_FAIL(data, MM_ERROR_PLAYER_INTERNAL); MMPLAYER_RETURN_VAL_IF_FAIL((strlen(uri) <= MM_MAX_URL_LEN), MM_ERROR_PLAYER_INVALID_URI); - memset(data, 0, sizeof(MMPlayerParseProfile)); + memset(data, 0, sizeof(mmplayer_parse_profile_t)); if (strstr(uri, "es_buff://")) { __mmplayer_copy_uri_and_set_type(data, uri, MM_PLAYER_URI_TYPE_MS_BUFF); @@ -4289,7 +4276,7 @@ __mmplayer_parse_profile(const char *uri, void *param, MMPlayerParseProfile *dat } static gboolean -__mmplayer_can_do_interrupt(mm_player_t *player) +__mmplayer_can_do_interrupt(mmplayer_t *player) { if (!player || !player->pipeline || !player->attrs) { LOGW("not initialized"); @@ -4341,7 +4328,7 @@ static int __resource_release_cb(mm_resource_manager_h rm, mm_resource_manager_res_h res, void *user_data) { - mm_player_t *player = NULL; + mmplayer_t *player = NULL; MMPLAYER_FENTER(); @@ -4349,7 +4336,7 @@ __resource_release_cb(mm_resource_manager_h rm, mm_resource_manager_res_h res, LOGE("- user_data is null"); return FALSE; } - player = (mm_player_t *)user_data; + player = (mmplayer_t *)user_data; /* do something to release resource here. * player stop and interrupt forwarding */ @@ -4388,7 +4375,7 @@ __resource_release_cb(mm_resource_manager_h rm, mm_resource_manager_res_h res, } static void -__mmplayer_initialize_video_roi(mm_player_t *player) +__mmplayer_initialize_video_roi(mmplayer_t *player) { player->video_roi.scale_x = 0.0; player->video_roi.scale_y = 0.0; @@ -4402,7 +4389,7 @@ _mmplayer_create_player(MMHandleType handle) int ret = MM_ERROR_PLAYER_INTERNAL; bool enabled = false; - mm_player_t *player = MM_PLAYER_CAST(handle); + mmplayer_t *player = MM_PLAYER_CAST(handle); MMPLAYER_FENTER(); @@ -4570,7 +4557,7 @@ ERROR: } static gboolean -__mmplayer_init_gstreamer(mm_player_t *player) +__mmplayer_init_gstreamer(mmplayer_t *player) { static gboolean initialized = FALSE; static const int max_argc = 50; @@ -4674,7 +4661,7 @@ ERROR: } static void -__mmplayer_check_async_state_transition(mm_player_t *player) +__mmplayer_check_async_state_transition(mmplayer_t *player) { GstState element_state = GST_STATE_VOID_PENDING; GstState element_pending_state = GST_STATE_VOID_PENDING; @@ -4721,7 +4708,7 @@ __mmplayer_check_async_state_transition(mm_player_t *player) int _mmplayer_destroy(MMHandleType handle) { - mm_player_t *player = MM_PLAYER_CAST(handle); + mmplayer_t *player = MM_PLAYER_CAST(handle); MMPLAYER_FENTER(); @@ -4800,7 +4787,7 @@ _mmplayer_destroy(MMHandleType handle) int _mmplayer_realize(MMHandleType hplayer) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; char *uri = NULL; void *param = NULL; MMHandleType attrs = 0; @@ -4903,7 +4890,7 @@ _mmplayer_realize(MMHandleType hplayer) int _mmplayer_unrealize(MMHandleType hplayer) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int ret = MM_ERROR_NONE; MMPLAYER_FENTER(); @@ -4961,7 +4948,7 @@ _mmplayer_unrealize(MMHandleType hplayer) int _mmplayer_set_message_callback(MMHandleType hplayer, MMMessageCallback callback, gpointer user_param) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED); @@ -4971,7 +4958,7 @@ _mmplayer_set_message_callback(MMHandleType hplayer, MMMessageCallback callback, int _mmplayer_get_state(MMHandleType hplayer, int *state) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_RETURN_VAL_IF_FAIL(state, MM_ERROR_INVALID_ARGUMENT); @@ -4982,9 +4969,9 @@ _mmplayer_get_state(MMHandleType hplayer, int *state) int -_mmplayer_set_volume(MMHandleType hplayer, MMPlayerVolumeType volume) +_mmplayer_set_volume(MMHandleType hplayer, mmplayer_volume_type_t volume) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; GstElement *vol_element = NULL; int i = 0; @@ -5036,9 +5023,9 @@ _mmplayer_set_volume(MMHandleType hplayer, MMPlayerVolumeType volume) } int -_mmplayer_get_volume(MMHandleType hplayer, MMPlayerVolumeType *volume) +_mmplayer_get_volume(MMHandleType hplayer, mmplayer_volume_type_t *volume) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int i = 0; MMPLAYER_FENTER(); @@ -5058,7 +5045,7 @@ _mmplayer_get_volume(MMHandleType hplayer, MMPlayerVolumeType *volume) int _mmplayer_set_mute(MMHandleType hplayer, int mute) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; GstElement *vol_element = NULL; MMPLAYER_FENTER(); @@ -5098,7 +5085,7 @@ _mmplayer_set_mute(MMHandleType hplayer, int mute) int _mmplayer_get_mute(MMHandleType hplayer, int *pmute) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); @@ -5122,7 +5109,7 @@ _mmplayer_get_mute(MMHandleType hplayer, int *pmute) int _mmplayer_set_videostream_changed_cb(MMHandleType hplayer, mm_player_stream_changed_callback callback, void *user_param) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); @@ -5140,7 +5127,7 @@ _mmplayer_set_videostream_changed_cb(MMHandleType hplayer, mm_player_stream_chan int _mmplayer_set_audiostream_changed_cb(MMHandleType hplayer, mm_player_stream_changed_callback callback, void *user_param) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); @@ -5158,7 +5145,7 @@ _mmplayer_set_audiostream_changed_cb(MMHandleType hplayer, mm_player_stream_chan int _mmplayer_set_audiostream_cb(MMHandleType hplayer, bool sync, mm_player_audio_stream_callback callback, void *user_param) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); @@ -5177,7 +5164,7 @@ _mmplayer_set_audiostream_cb(MMHandleType hplayer, bool sync, mm_player_audio_st int _mmplayer_set_videostream_cb(MMHandleType hplayer, mm_player_video_stream_callback callback, void *user_param) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); @@ -5200,7 +5187,7 @@ _mmplayer_set_videostream_cb(MMHandleType hplayer, mm_player_video_stream_callba int _mmplayer_start(MMHandleType hplayer) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; gint ret = MM_ERROR_NONE; MMPLAYER_FENTER(); @@ -5232,7 +5219,7 @@ _mmplayer_start(MMHandleType hplayer) * Because GST_ERROR_MESSAGE is posted by other plugin internally. */ int -__mmplayer_handle_missed_plugin(mm_player_t *player) +__mmplayer_handle_missed_plugin(mmplayer_t *player) { MMMessageParamType msg_param; memset(&msg_param, 0, sizeof(MMMessageParamType)); @@ -5309,7 +5296,7 @@ __mmplayer_handle_missed_plugin(mm_player_t *player) } static void -__mmplayer_check_pipeline(mm_player_t *player) +__mmplayer_check_pipeline(mmplayer_t *player) { GstState element_state = GST_STATE_VOID_PENDING; GstState element_pending_state = GST_STATE_VOID_PENDING; @@ -5336,7 +5323,7 @@ __mmplayer_check_pipeline(mm_player_t *player) int _mmplayer_stop(MMHandleType hplayer) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int ret = MM_ERROR_NONE; MMPLAYER_FENTER(); @@ -5370,7 +5357,7 @@ _mmplayer_stop(MMHandleType hplayer) int _mmplayer_pause(MMHandleType hplayer) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; gint64 pos_nsec = 0; gboolean async = FALSE; gint ret = MM_ERROR_NONE; @@ -5450,7 +5437,7 @@ _mmplayer_pause(MMHandleType hplayer) int _mmplayer_abort_pause(MMHandleType hplayer) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int ret = MM_ERROR_NONE; MMPLAYER_FENTER(); @@ -5477,7 +5464,7 @@ _mmplayer_abort_pause(MMHandleType hplayer) int _mmplayer_resume(MMHandleType hplayer) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int ret = MM_ERROR_NONE; gboolean async = FALSE; @@ -5516,12 +5503,12 @@ _mmplayer_resume(MMHandleType hplayer) int _mmplayer_set_playspeed(MMHandleType hplayer, float rate, bool streaming) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; gint64 pos_nsec = 0; int ret = MM_ERROR_NONE; int mute = FALSE; signed long long start = 0, stop = 0; - MMPlayerStateType current_state = MM_PLAYER_STATE_NONE; + mmplayer_state_e current_state = MM_PLAYER_STATE_NONE; MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player && player->pipeline, MM_ERROR_PLAYER_NOT_INITIALIZED); @@ -5583,7 +5570,7 @@ _mmplayer_set_playspeed(MMHandleType hplayer, float rate, bool streaming) int _mmplayer_set_position(MMHandleType hplayer, gint64 position) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int ret = MM_ERROR_NONE; MMPLAYER_FENTER(); @@ -5603,7 +5590,7 @@ _mmplayer_set_position(MMHandleType hplayer, gint64 position) int _mmplayer_get_position(MMHandleType hplayer, gint64 *position) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int ret = MM_ERROR_NONE; MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED); @@ -5616,7 +5603,7 @@ _mmplayer_get_position(MMHandleType hplayer, gint64 *position) int _mmplayer_get_duration(MMHandleType hplayer, gint64 *duration) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int ret = MM_ERROR_NONE; MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED); @@ -5632,7 +5619,7 @@ _mmplayer_get_duration(MMHandleType hplayer, gint64 *duration) int _mmplayer_get_buffer_position(MMHandleType hplayer, int *start_pos, int *end_pos) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int ret = MM_ERROR_NONE; MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED); @@ -5643,16 +5630,16 @@ _mmplayer_get_buffer_position(MMHandleType hplayer, int *start_pos, int *end_pos } int -_mmplayer_adjust_subtitle_postion(MMHandleType hplayer, int format, int position) +_mmplayer_adjust_subtitle_postion(MMHandleType hplayer, int position) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int ret = MM_ERROR_NONE; MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED); - ret = __mmplayer_gst_adjust_subtitle_position(player, format, position); + ret = __mmplayer_gst_adjust_subtitle_position(player, position); MMPLAYER_FLEAVE(); @@ -5686,7 +5673,7 @@ __mmplayer_is_only_mp3_type(gchar *str_caps) } static void -__mmplayer_set_audio_attrs(mm_player_t *player, GstCaps *caps) +__mmplayer_set_audio_attrs(mmplayer_t *player, GstCaps *caps) { GstStructure *caps_structure = NULL; gint samplerate = 0; @@ -5708,7 +5695,7 @@ __mmplayer_set_audio_attrs(mm_player_t *player, GstCaps *caps) } static void -__mmplayer_update_content_type_info(mm_player_t *player) +__mmplayer_update_content_type_info(mmplayer_t *player) { MMPLAYER_FENTER(); MMPLAYER_RETURN_IF_FAIL(player && player->type); @@ -5754,7 +5741,7 @@ void __mmplayer_typefind_have_type(GstElement *tf, guint probability, GstCaps *caps, gpointer data) { - mm_player_t *player = (mm_player_t *)data; + mmplayer_t *player = (mmplayer_t *)data; GstPad *pad = NULL; MMPLAYER_FENTER(); @@ -5812,7 +5799,7 @@ __mmplayer_typefind_have_type(GstElement *tf, guint probability, } GstElement * -__mmplayer_gst_make_decodebin(mm_player_t *player) +__mmplayer_gst_make_decodebin(mmplayer_t *player) { GstElement *decodebin = NULL; @@ -5865,12 +5852,12 @@ ERROR: } static GstElement * -__mmplayer_gst_make_queue2(mm_player_t *player) +__mmplayer_gst_make_queue2(mmplayer_t *player) { GstElement *queue2 = NULL; gint64 dur_bytes = 0L; - MMPlayerGstElement *mainbin = NULL; - MuxedBufferType type = MUXED_BUFFER_TYPE_MEM_QUEUE; + mmplayer_gst_element_t *mainbin = NULL; + muxed_buffer_type_e type = MUXED_BUFFER_TYPE_MEM_QUEUE; MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player && player->pipeline && player->pipeline->mainbin, NULL); @@ -5909,9 +5896,9 @@ __mmplayer_gst_make_queue2(mm_player_t *player) } gboolean -__mmplayer_gst_create_decoder(mm_player_t *player, GstPad *srcpad, const GstCaps *caps) +__mmplayer_gst_create_decoder(mmplayer_t *player, GstPad *srcpad, const GstCaps *caps) { - MMPlayerGstElement *mainbin = NULL; + mmplayer_gst_element_t *mainbin = NULL; GstElement *decodebin = NULL; GstElement *queue2 = NULL; GstPad *sinkpad = NULL; @@ -6068,7 +6055,7 @@ ERROR: } static int -__mmplayer_check_not_supported_codec(mm_player_t *player, const gchar *factory_class, const gchar *mime) +__mmplayer_check_not_supported_codec(mmplayer_t *player, const gchar *factory_class, const gchar *mime) { MMPLAYER_FENTER(); @@ -6125,7 +6112,7 @@ DONE: static void __mmplayer_pipeline_complete(GstElement *decodebin, gpointer data) { - mm_player_t *player = (mm_player_t *)data; + mmplayer_t *player = (mmplayer_t *)data; MMPLAYER_FENTER(); @@ -6177,9 +6164,9 @@ __mmplayer_check_profile(void) } static gboolean -__mmplayer_get_next_uri(mm_player_t *player) +__mmplayer_get_next_uri(mmplayer_t *player) { - MMPlayerParseProfile profile; + mmplayer_parse_profile_t profile; gint uri_idx = 0; guint num_of_list = 0; char *uri = NULL; @@ -6228,7 +6215,7 @@ __mmplayer_get_next_uri(mm_player_t *player) } static gboolean -__mmplayer_verify_gapless_play_path(mm_player_t *player) +__mmplayer_verify_gapless_play_path(mmplayer_t *player) { #define REPEAT_COUNT_INFINITELY -1 #define REPEAT_COUNT_MIN 2 @@ -6312,7 +6299,7 @@ ERROR: } static void -__mmplayer_initialize_gapless_play(mm_player_t *player) +__mmplayer_initialize_gapless_play(mmplayer_t *player) { int i; @@ -6370,14 +6357,14 @@ __mmplayer_initialize_gapless_play(mm_player_t *player) } static void -__mmplayer_activate_next_source(mm_player_t *player, GstState target) +__mmplayer_activate_next_source(mmplayer_t *player, GstState target) { - MMPlayerGstElement *mainbin = NULL; + mmplayer_gst_element_t *mainbin = NULL; MMMessageParamType msg_param = {0,}; GstElement *element = NULL; MMHandleType attrs = 0; char *uri = NULL; - enum MainElementID elem_idx = MMPLAYER_M_NUM; + main_element_id_e elem_idx = MMPLAYER_M_NUM; MMPLAYER_FENTER(); @@ -6503,12 +6490,12 @@ ERROR: } static gboolean -__mmplayer_deactivate_selector(mm_player_t *player, MMPlayerTrackType type) +__mmplayer_deactivate_selector(mmplayer_t *player, mmplayer_track_type_e type) { - mm_player_selector_t *selector = &player->selector[type]; - MMPlayerGstElement *sinkbin = NULL; - enum MainElementID selectorId = MMPLAYER_M_NUM; - enum MainElementID sinkId = MMPLAYER_M_NUM; + mmplayer_selector_t *selector = &player->selector[type]; + mmplayer_gst_element_t *sinkbin = NULL; + main_element_id_e selectorId = MMPLAYER_M_NUM; + main_element_id_e sinkId = MMPLAYER_M_NUM; GstPad *srcpad = NULL; GstPad *sinkpad = NULL; gboolean send_notice = FALSE; @@ -6593,7 +6580,7 @@ __mmplayer_deactivate_selector(mm_player_t *player, MMPlayerTrackType type) } static void -__mmplayer_deactivate_old_path(mm_player_t *player) +__mmplayer_deactivate_old_path(mmplayer_t *player) { MMPLAYER_FENTER(); MMPLAYER_RETURN_IF_FAIL(player); @@ -6639,7 +6626,7 @@ int _mmplayer_set_uri(MMHandleType hplayer, const char *uri) { int result = MM_ERROR_NONE; - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED); @@ -6660,7 +6647,7 @@ _mmplayer_set_uri(MMHandleType hplayer, const char *uri) int _mmplayer_set_next_uri(MMHandleType hplayer, const char *uri, bool is_first_path) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; guint num_of_list = 0; MMPLAYER_FENTER(); @@ -6718,7 +6705,7 @@ _mmplayer_set_next_uri(MMHandleType hplayer, const char *uri, bool is_first_path int _mmplayer_get_next_uri(MMHandleType hplayer, char **uri) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; char *next_uri = NULL; guint num_of_list = 0; @@ -6749,7 +6736,7 @@ static void __mmplayer_gst_decode_unknown_type(GstElement *elem, GstPad *pad, GstCaps *caps, gpointer data) { - mm_player_t *player = (mm_player_t *)data; + mmplayer_t *player = (mmplayer_t *)data; const gchar *klass = NULL; const gchar *mime = NULL; gchar *caps_str = NULL; @@ -6771,7 +6758,7 @@ static gboolean __mmplayer_gst_decode_autoplug_continue(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer data) { - mm_player_t *player = (mm_player_t *)data; + mmplayer_t *player = (mmplayer_t *)data; const char *mime = NULL; gboolean ret = TRUE; @@ -6816,7 +6803,7 @@ __mmplayer_gst_decode_autoplug_continue(GstElement *bin, GstPad *pad, } static gboolean -__mmplayer_is_audio_offload_device_type(mm_player_t *player) +__mmplayer_is_audio_offload_device_type(mmplayer_t *player) { gboolean ret = TRUE; GDBusConnection *conn = NULL; @@ -6880,9 +6867,9 @@ DONE: return ret; } -static void __mmplayer_rebuild_audio_pipeline(mm_player_t *player) +static void __mmplayer_rebuild_audio_pipeline(mmplayer_t *player) { - MMPlayerStateType current_state = MM_PLAYER_STATE_NONE; + mmplayer_state_e current_state = MM_PLAYER_STATE_NONE; gint64 position = 0; MMPLAYER_RETURN_IF_FAIL(player && player->attrs && @@ -6915,7 +6902,7 @@ static void __mmplayer_rebuild_audio_pipeline(mm_player_t *player) void __mmplayer_audio_device_connected_cb(MMSoundDevice_t device_h, bool is_connected, void *user_data) { - mm_player_t *player = (mm_player_t *)user_data; + mmplayer_t *player = (mmplayer_t *)user_data; mm_sound_device_type_e dev_type = MM_SOUND_DEVICE_TYPE_BUILTIN_SPEAKER; gboolean is_supportable = FALSE; @@ -6946,7 +6933,7 @@ void __mmplayer_audio_device_connected_cb(MMSoundDevice_t device_h, bool is_conn } static gboolean -__mmplayer_add_audio_device_connected_cb(mm_player_t *player) +__mmplayer_add_audio_device_connected_cb(mmplayer_t *player) { unsigned int id = 0; @@ -6968,7 +6955,7 @@ __mmplayer_add_audio_device_connected_cb(mm_player_t *player) } static gboolean -__mmplayer_can_build_audio_offload_path(mm_player_t *player) +__mmplayer_can_build_audio_offload_path(mmplayer_t *player) { gboolean ret = FALSE; GstElementFactory *factory = NULL; @@ -7012,7 +6999,7 @@ DONE: } static GstAutoplugSelectResult -__mmplayer_check_codec_info(mm_player_t *player, const char *klass, GstCaps *caps, char *factory_name) +__mmplayer_check_codec_info(mmplayer_t *player, const char *klass, GstCaps *caps, char *factory_name) { GstAutoplugSelectResult ret = GST_AUTOPLUG_SELECT_TRY; int idx = 0; @@ -7133,7 +7120,7 @@ __mmplayer_gst_decode_autoplug_select(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *factory, gpointer data) { GstAutoplugSelectResult result = GST_AUTOPLUG_SELECT_TRY; - mm_player_t *player = (mm_player_t *)data; + mmplayer_t *player = (mmplayer_t *)data; gchar *factory_name = NULL; gchar *caps_str = NULL; @@ -7262,7 +7249,7 @@ static void __mmplayer_gst_decode_pad_removed(GstElement *elem, GstPad *new_pad, gpointer data) { - //mm_player_t *player = (mm_player_t *)data; + //mmplayer_t *player = (mmplayer_t *)data; GstCaps *caps = NULL; LOGD("[Decodebin2] pad-removed signal"); @@ -7285,7 +7272,7 @@ __mmplayer_gst_decode_pad_removed(GstElement *elem, GstPad *new_pad, static void __mmplayer_gst_decode_drained(GstElement *bin, gpointer data) { - mm_player_t *player = (mm_player_t *)data; + mmplayer_t *player = (mmplayer_t *)data; GstIterator *iter = NULL; GValue item = { 0, }; GstPad *pad = NULL; @@ -7359,7 +7346,7 @@ __mmplayer_gst_decode_drained(GstElement *bin, gpointer data) void __mmplayer_gst_element_added(GstElement *bin, GstElement *element, gpointer data) { - mm_player_t *player = (mm_player_t *)data; + mmplayer_t *player = (mmplayer_t *)data; const gchar *klass = NULL; gchar *factory_name = NULL; @@ -7439,7 +7426,7 @@ __mmplayer_gst_element_added(GstElement *bin, GstElement *element, gpointer data } static void -__mmplayer_release_misc(mm_player_t *player) +__mmplayer_release_misc(mmplayer_t *player) { int i; bool cur_mode = player->set_mode.rich_audio; @@ -7486,7 +7473,7 @@ __mmplayer_release_misc(mm_player_t *player) player->has_closed_caption = FALSE; player->set_mode.media_packet_video_stream = false; player->profile.uri_type = MM_PLAYER_URI_TYPE_NONE; - memset(&player->set_mode, 0, sizeof(MMPlayerSetMode)); + memset(&player->set_mode, 0, sizeof(mmplayer_setting_mode_t)); /* recover mode */ player->set_mode.rich_audio = cur_mode; @@ -7545,7 +7532,7 @@ __mmplayer_release_misc(mm_player_t *player) } static void -__mmplayer_release_misc_post(mm_player_t *player) +__mmplayer_release_misc_post(mmplayer_t *player) { char *original_uri = NULL; MMPLAYER_FENTER(); @@ -7607,7 +7594,7 @@ __mmplayer_release_misc_post(mm_player_t *player) } gboolean -__mmplayer_check_subtitle(mm_player_t *player) +__mmplayer_check_subtitle(mmplayer_t *player) { MMHandleType attrs = 0; char *subtitle_uri = NULL; @@ -7634,7 +7621,7 @@ __mmplayer_check_subtitle(mm_player_t *player) } void -__mmplayer_cancel_eos_timer(mm_player_t *player) +__mmplayer_cancel_eos_timer(mmplayer_t *player) { MMPLAYER_RETURN_IF_FAIL(player); @@ -7648,7 +7635,7 @@ __mmplayer_cancel_eos_timer(mm_player_t *player) } static void -__mmplayer_add_sink(mm_player_t *player, GstElement *sink) +__mmplayer_add_sink(mmplayer_t *player, GstElement *sink) { MMPLAYER_FENTER(); @@ -7661,7 +7648,7 @@ __mmplayer_add_sink(mm_player_t *player, GstElement *sink) } static void -__mmplayer_del_sink(mm_player_t *player, GstElement *sink) +__mmplayer_del_sink(mmplayer_t *player, GstElement *sink) { MMPLAYER_FENTER(); @@ -7674,10 +7661,10 @@ __mmplayer_del_sink(mm_player_t *player, GstElement *sink) } void -__mmplayer_add_signal_connection(mm_player_t *player, GObject *object, - MMPlayerSignalType type, const gchar *signal, GCallback cb_funct, gpointer u_data) +__mmplayer_add_signal_connection(mmplayer_t *player, GObject *object, + mmplayer_signal_type_e type, const gchar *signal, GCallback cb_funct, gpointer u_data) { - MMPlayerSignalItem *item = NULL; + mmplayer_signal_item_t *item = NULL; MMPLAYER_FENTER(); MMPLAYER_RETURN_IF_FAIL(player); @@ -7687,7 +7674,7 @@ __mmplayer_add_signal_connection(mm_player_t *player, GObject *object, return; } - item = (MMPlayerSignalItem *)g_try_malloc(sizeof(MMPlayerSignalItem)); + item = (mmplayer_signal_item_t *)g_try_malloc(sizeof(mmplayer_signal_item_t)); if (!item) { LOGE("cannot connect signal [%s]", signal); return; @@ -7719,10 +7706,10 @@ __mmplayer_add_signal_connection(mm_player_t *player, GObject *object, * g_signal_handler_disconnect(instance, id); */ static void -__mmplayer_release_signal_connection(mm_player_t *player, MMPlayerSignalType type) +__mmplayer_release_signal_connection(mmplayer_t *player, mmplayer_signal_type_e type) { GList *sig_list = NULL; - MMPlayerSignalItem *item = NULL; + mmplayer_signal_item_t *item = NULL; MMPLAYER_FENTER(); @@ -7763,7 +7750,7 @@ __mmplayer_release_signal_connection(mm_player_t *player, MMPlayerSignalType typ int _mmplayer_change_videosink(MMHandleType handle, MMDisplaySurfaceType surface_type, void *display_overlay) { - mm_player_t *player = 0; + mmplayer_t *player = 0; int prev_display_surface_type = 0; void *prev_display_overlay = NULL; @@ -7822,7 +7809,7 @@ _mmplayer_change_videosink(MMHandleType handle, MMDisplaySurfaceType surface_typ int _mmplayer_set_subtitle_silent(MMHandleType hplayer, int silent) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); @@ -7839,10 +7826,10 @@ _mmplayer_set_subtitle_silent(MMHandleType hplayer, int silent) } int -_mmplayer_sync_subtitle_pipeline(mm_player_t *player) +_mmplayer_sync_subtitle_pipeline(mmplayer_t *player) { - MMPlayerGstElement *mainbin = NULL; - MMPlayerGstElement *textbin = NULL; + mmplayer_gst_element_t *mainbin = NULL; + mmplayer_gst_element_t *textbin = NULL; GstStateChangeReturn ret = GST_STATE_CHANGE_FAILURE; GstState current_state = GST_STATE_VOID_PENDING; GstState element_state = GST_STATE_VOID_PENDING; @@ -7943,14 +7930,14 @@ ERROR: } static int -__mmplayer_change_external_subtitle_language(mm_player_t *player, const char *filepath) +__mmplayer_change_external_subtitle_language(mmplayer_t *player, const char *filepath) { GstStateChangeReturn ret = GST_STATE_CHANGE_FAILURE; GstState current_state = GST_STATE_VOID_PENDING; MMHandleType attrs = 0; - MMPlayerGstElement *mainbin = NULL; - MMPlayerGstElement *textbin = NULL; + mmplayer_gst_element_t *mainbin = NULL; + mmplayer_gst_element_t *textbin = NULL; gchar *subtitle_uri = NULL; int result = MM_ERROR_NONE; @@ -8057,7 +8044,7 @@ int _mmplayer_set_external_subtitle_path(MMHandleType hplayer, const char *filepath) { int result = MM_ERROR_NONE; - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; char *path = NULL; MMPLAYER_FENTER(); @@ -8125,13 +8112,13 @@ _mmplayer_set_external_subtitle_path(MMHandleType hplayer, const char *filepath) } static int -__mmplayer_change_selector_pad(mm_player_t *player, MMPlayerTrackType type, int index) +__mmplayer_change_selector_pad(mmplayer_t *player, mmplayer_track_type_e type, int index) { int result = MM_ERROR_NONE; gchar *change_pad_name = NULL; GstPad *sinkpad = NULL; - MMPlayerGstElement *mainbin = NULL; - enum MainElementID elem_idx = MMPLAYER_M_NUM; + mmplayer_gst_element_t *mainbin = NULL; + main_element_id_e elem_idx = MMPLAYER_M_NUM; GstCaps *caps = NULL; gint total_track_num = 0; @@ -8208,11 +8195,11 @@ EXIT: } int -_mmplayer_change_track_language(MMHandleType hplayer, MMPlayerTrackType type, int index) +_mmplayer_change_track_language(MMHandleType hplayer, mmplayer_track_type_e type, int index) { int result = MM_ERROR_NONE; - mm_player_t *player = NULL; - MMPlayerGstElement *mainbin = NULL; + mmplayer_t *player = NULL; + mmplayer_gst_element_t *mainbin = NULL; gint current_active_index = 0; @@ -8222,7 +8209,7 @@ _mmplayer_change_track_language(MMHandleType hplayer, MMPlayerTrackType type, in MMPLAYER_FENTER(); - player = (mm_player_t *)hplayer; + player = (mmplayer_t *)hplayer; MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED); if (!player->pipeline) { @@ -8279,7 +8266,7 @@ EXIT: int _mmplayer_get_subtitle_silent(MMHandleType hplayer, int *silent) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); @@ -8296,7 +8283,7 @@ _mmplayer_get_subtitle_silent(MMHandleType hplayer, int *silent) } static gboolean -__mmplayer_add_dump_buffer_probe(mm_player_t *player, GstElement *element) +__mmplayer_add_dump_buffer_probe(mmplayer_t *player, GstElement *element) { MMPLAYER_RETURN_VAL_IF_FAIL(player, FALSE); MMPLAYER_RETURN_VAL_IF_FAIL(element, FALSE); @@ -8309,8 +8296,8 @@ __mmplayer_add_dump_buffer_probe(mm_player_t *player, GstElement *element) for (idx = 0; player->ini.dump_element_keyword[idx][0] != '\0'; idx++) { if (g_strrstr(factory_name, player->ini.dump_element_keyword[idx])) { LOGD("dump [%s] sink pad", player->ini.dump_element_keyword[idx]); - mm_player_dump_t *dump_s; - dump_s = g_try_malloc(sizeof(mm_player_dump_t)); + mmplayer_dump_t *dump_s; + dump_s = g_try_malloc(sizeof(mmplayer_dump_t)); if (dump_s == NULL) { LOGE("malloc fail"); return FALSE; @@ -8366,7 +8353,7 @@ __mmplayer_release_dump_list(GList *dump_list) return; for (; d_list; d_list = g_list_next(d_list)) { - mm_player_dump_t *dump_s = d_list->data; + mmplayer_dump_t *dump_s = d_list->data; if (dump_s->dump_pad) { if (dump_s->probe_handle_id) gst_pad_remove_probe(dump_s->dump_pad, dump_s->probe_handle_id); @@ -8385,7 +8372,7 @@ __mmplayer_release_dump_list(GList *dump_list) int _mmplayer_has_closed_caption(MMHandleType hplayer, bool *exist) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); @@ -8414,7 +8401,7 @@ _mm_player_video_stream_internal_buffer_unref(void *buffer) int _mmplayer_get_timeout(MMHandleType hplayer, int *timeout) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); @@ -8435,7 +8422,7 @@ _mmplayer_get_timeout(MMHandleType hplayer, int *timeout) int _mmplayer_get_num_of_video_out_buffers(MMHandleType hplayer, int *num, int *extra_num) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); @@ -8452,7 +8439,7 @@ _mmplayer_get_num_of_video_out_buffers(MMHandleType hplayer, int *num, int *extr } static void -__mmplayer_initialize_storage_info(mm_player_t *player, MMPlayerPathType path_type) +__mmplayer_initialize_storage_info(mmplayer_t *player, mmplayer_path_type_e path_type) { int i = 0; MMPLAYER_FENTER(); @@ -8478,7 +8465,7 @@ int _mmplayer_manage_external_storage_state(MMHandleType hplayer, int id, int state) { int ret = MM_ERROR_NONE; - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMMessageParamType msg_param = {0, }; MMPLAYER_FENTER(); @@ -8517,7 +8504,7 @@ int _mmplayer_get_adaptive_variant_info(MMHandleType hplayer, int *num, char **var_info) { int ret = MM_ERROR_NONE; - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int idx = 0, total = 0; gchar *result = NULL, *tmp = NULL; @@ -8533,7 +8520,7 @@ _mmplayer_get_adaptive_variant_info(MMHandleType hplayer, int *num, char **var_i result = g_strdup(""); for (idx = 0 ; idx < total ; idx++) { - VariantData *v_data = NULL; + stream_variant_t *v_data = NULL; v_data = g_list_nth_data(player->adaptive_info.var_list, idx); if (v_data) { @@ -8560,7 +8547,7 @@ int _mmplayer_set_max_adaptive_variant_limit(MMHandleType hplayer, int bandwidth, int width, int height) { int ret = MM_ERROR_NONE; - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED); @@ -8588,7 +8575,7 @@ int _mmplayer_get_max_adaptive_variant_limit(MMHandleType hplayer, int *bandwidth, int *width, int *height) { int ret = MM_ERROR_NONE; - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED); @@ -8608,7 +8595,7 @@ int _mmplayer_get_streaming_buffering_time(MMHandleType hplayer, int *prebuffer_ms, int *rebuffer_ms) { int ret = MM_ERROR_NONE; - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player && player->streamer, MM_ERROR_PLAYER_NOT_INITIALIZED); @@ -8629,10 +8616,10 @@ _mmplayer_get_streaming_buffering_time(MMHandleType hplayer, int *prebuffer_ms, } int -_mmplayer_set_codec_type(MMHandleType hplayer, MMPlayerStreamType stream_type, MMPlayerVideoCodecType codec_type) +_mmplayer_set_codec_type(MMHandleType hplayer, mmplayer_stream_type_e stream_type, mmplayer_video_codec_type_e codec_type) { #define IDX_FIRST_SW_CODEC 0 - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; const char *attr_name = (stream_type == MM_PLAYER_STREAM_TYPE_AUDIO) ? (MM_PLAYER_AUDIO_CODEC_TYPE) : (MM_PLAYER_VIDEO_CODEC_TYPE); MMHandleType attrs = 0; @@ -8691,7 +8678,7 @@ _mmplayer_set_codec_type(MMHandleType hplayer, MMPlayerStreamType stream_type, M int _mmplayer_set_replaygain_enabled(MMHandleType hplayer, bool enabled) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; GstElement *rg_vol_element = NULL; MMPLAYER_FENTER(); @@ -8726,7 +8713,7 @@ _mmplayer_set_replaygain_enabled(MMHandleType hplayer, bool enabled) int _mmplayer_is_replaygain_enabled(MMHandleType hplayer, bool *enabled) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; GstElement *rg_vol_element = NULL; gboolean enable = FALSE; @@ -8760,7 +8747,7 @@ _mmplayer_is_replaygain_enabled(MMHandleType hplayer, bool *enabled) int _mmplayer_set_video_roi_area(MMHandleType hplayer, double scale_x, double scale_y, double scale_width, double scale_height) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMHandleType attrs = 0; void *handle = NULL; int ret = MM_ERROR_NONE; @@ -8803,7 +8790,7 @@ _mmplayer_set_video_roi_area(MMHandleType hplayer, double scale_x, double scale_ int _mmplayer_get_video_roi_area(MMHandleType hplayer, double *scale_x, double *scale_y, double *scale_width, double *scale_height) { - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; int ret = MM_ERROR_NONE; MMPLAYER_FENTER(); @@ -8823,7 +8810,7 @@ _mmplayer_get_video_roi_area(MMHandleType hplayer, double *scale_x, double *scal } static gboolean -__mmplayer_update_duration_value(mm_player_t *player) +__mmplayer_update_duration_value(mmplayer_t *player) { gboolean ret = FALSE; gint64 dur_nsec = 0; @@ -8852,7 +8839,7 @@ __mmplayer_update_duration_value(mm_player_t *player) } static gboolean -__mmplayer_update_audio_attrs(mm_player_t *player, MMHandleType attrs) +__mmplayer_update_audio_attrs(mmplayer_t *player, MMHandleType attrs) { /* update audio params NOTE : We need original audio params and it can be only obtained from src pad of audio @@ -8902,7 +8889,7 @@ __mmplayer_update_audio_attrs(mm_player_t *player, MMHandleType attrs) } static gboolean -__mmplayer_update_video_attrs(mm_player_t *player, MMHandleType attrs) +__mmplayer_update_video_attrs(mmplayer_t *player, MMHandleType attrs) { LOGD("try to update video attrs"); @@ -8957,7 +8944,7 @@ __mmplayer_update_video_attrs(mm_player_t *player, MMHandleType attrs) } static gboolean -__mmplayer_update_bitrate_attrs(mm_player_t *player, MMHandleType attrs) +__mmplayer_update_bitrate_attrs(mmplayer_t *player, MMHandleType attrs) { gboolean ret = FALSE; guint64 data_size = 0; @@ -9006,14 +8993,14 @@ __mmplayer_update_bitrate_attrs(mm_player_t *player, MMHandleType attrs) } static void -__mmplayer_copy_uri_and_set_type(MMPlayerParseProfile *data, const char *uri, int uri_type) +__mmplayer_copy_uri_and_set_type(mmplayer_parse_profile_t *data, const char *uri, int uri_type) { strncpy(data->uri, uri, MM_MAX_URL_LEN - 1); data->uri_type = uri_type; } static int -__mmplayer_set_mem_uri(MMPlayerParseProfile *data, char *path, void *param) +__mmplayer_set_mem_uri(mmplayer_parse_profile_t *data, char *path, void *param) { int ret = MM_ERROR_PLAYER_INVALID_URI; int mem_size = 0; @@ -9077,7 +9064,7 @@ __mmplayer_set_mem_uri(MMPlayerParseProfile *data, char *path, void *param) } static int -__mmplayer_set_file_uri(MMPlayerParseProfile *data, const char *uri) +__mmplayer_set_file_uri(mmplayer_parse_profile_t *data, const char *uri) { gchar *location = NULL; GError *err = NULL; @@ -9126,14 +9113,14 @@ __mmplayer_set_file_uri(MMPlayerParseProfile *data, const char *uri) return ret; } -static MMPlayerVideoStreamDataType * +static mmplayer_video_decoded_data_info_t * __mmplayer_create_stream_from_pad(GstPad *pad) { GstCaps *caps = NULL; GstStructure *structure = NULL; unsigned int fourcc = 0; const gchar *string_format = NULL; - MMPlayerVideoStreamDataType *stream = NULL; + mmplayer_video_decoded_data_info_t *stream = NULL; gint width, height; MMPixelFormatType format; @@ -9159,7 +9146,7 @@ __mmplayer_create_stream_from_pad(GstPad *pad) return NULL; } - stream = (MMPlayerVideoStreamDataType *)g_try_malloc0(sizeof(MMPlayerVideoStreamDataType)); + stream = (mmplayer_video_decoded_data_info_t *)g_try_malloc0(sizeof(mmplayer_video_decoded_data_info_t)); if (!stream) { LOGE("failed to alloc mem for video data"); return NULL; @@ -9173,7 +9160,7 @@ __mmplayer_create_stream_from_pad(GstPad *pad) } static void -__mmplayer_zerocopy_set_stride_elevation_bo(MMPlayerVideoStreamDataType *stream, GstMemory *mem) +__mmplayer_zerocopy_set_stride_elevation_bo(mmplayer_video_decoded_data_info_t *stream, GstMemory *mem) { unsigned int pitch = 0; int index = 0; @@ -9188,7 +9175,7 @@ __mmplayer_zerocopy_set_stride_elevation_bo(MMPlayerVideoStreamDataType *stream, } static gboolean -__mmplayer_swcodec_set_stride_elevation(MMPlayerVideoStreamDataType *stream) +__mmplayer_swcodec_set_stride_elevation(mmplayer_video_decoded_data_info_t *stream) { if (stream->format == MM_PIXEL_FORMAT_I420) { int ret = TBM_SURFACE_ERROR_NONE; @@ -9224,7 +9211,7 @@ __mmplayer_swcodec_set_stride_elevation(MMPlayerVideoStreamDataType *stream) } static gboolean -__mmplayer_swcodec_set_bo(mm_player_t *player, MMPlayerVideoStreamDataType *stream, GstMemory *mem) +__mmplayer_swcodec_set_bo(mmplayer_t *player, mmplayer_video_decoded_data_info_t *stream, GstMemory *mem) { tbm_bo_handle thandle; gboolean is_mapped; @@ -9307,7 +9294,7 @@ ERROR: } static void -__mmplayer_set_pause_state(mm_player_t *player) +__mmplayer_set_pause_state(mmplayer_t *player) { if (player->sent_bos) return; @@ -9321,7 +9308,7 @@ __mmplayer_set_pause_state(mm_player_t *player) } static void -__mmplayer_set_playing_state(mm_player_t *player) +__mmplayer_set_playing_state(mmplayer_t *player) { gchar *audio_codec = NULL; diff --git a/src/mm_player_streaming.c b/src/mm_player_streaming.c index e8dbf02..4e567db 100644 --- a/src/mm_player_streaming.c +++ b/src/mm_player_streaming.c @@ -45,39 +45,39 @@ typedef struct { gdouble high_watermark; } streaming_buffer_info_t; -static void streaming_set_buffer_watermark(mm_player_streaming_t *streamer, BufferType type, gdouble low_watermark, gdouble high_watermark); -static void streaming_set_queue2_queue_type(mm_player_streaming_t *streamer, MuxedBufferType type); -static void streaming_set_buffer_size(mm_player_streaming_t *streamer, BufferType type, guint buffering_bytes, gint buffering_time); -static void streaming_update_buffering_status(mm_player_streaming_t *streamer, GstMessage *buffering_msg, gint64 position); -static void streaming_get_current_bitrate_info(mm_player_streaming_t *streamer, +static void streaming_set_buffer_watermark(mmplayer_streaming_t *streamer, buffer_type_e type, gdouble low_watermark, gdouble high_watermark); +static void streaming_set_queue2_queue_type(mmplayer_streaming_t *streamer, muxed_buffer_type_e type); +static void streaming_set_buffer_size(mmplayer_streaming_t *streamer, buffer_type_e type, guint buffering_bytes, gint buffering_time); +static void streaming_update_buffering_status(mmplayer_streaming_t *streamer, GstMessage *buffering_msg, gint64 position); +static void streaming_get_current_bitrate_info(mmplayer_streaming_t *streamer, GstMessage *buffering_msg, streaming_content_info_t content_info, streaming_bitrate_info_t *bitrate_info); static void -streaming_handle_fixed_buffering_mode(mm_player_streaming_t *streamer, +streaming_handle_fixed_buffering_mode(mmplayer_streaming_t *streamer, gint byte_out_rate, gint fixed_buffering_time, streaming_buffer_info_t *buffer_info); static void -streaming_handle_adaptive_buffering_mode(mm_player_streaming_t *streamer, +streaming_handle_adaptive_buffering_mode(mmplayer_streaming_t *streamer, streaming_content_info_t content_info, streaming_bitrate_info_t bitrate_info, streaming_buffer_info_t *buffer_info, gint expected_play_time); static void -streaming_update_buffer_setting(mm_player_streaming_t *streamer, +streaming_update_buffer_setting(mmplayer_streaming_t *streamer, GstMessage *buffering_msg, guint64 content_size, gint64 position, gint64 duration); -mm_player_streaming_t *__mm_player_streaming_create(void) +mmplayer_streaming_t *__mm_player_streaming_create(void) { - mm_player_streaming_t *streamer = NULL; + mmplayer_streaming_t *streamer = NULL; MMPLAYER_FENTER(); - streamer = (mm_player_streaming_t *)g_try_malloc0(sizeof(mm_player_streaming_t)); + streamer = (mmplayer_streaming_t *)g_try_malloc0(sizeof(mmplayer_streaming_t)); if (!streamer) { LOGE("fail to create streaming player handle.."); return NULL; @@ -100,7 +100,7 @@ static void streaming_buffer_initialize(streaming_buffer_t *buffer_handle, gbool buffer_handle->is_live = FALSE; } -void __mm_player_streaming_initialize(mm_player_streaming_t *streamer, gboolean buffer_init) +void __mm_player_streaming_initialize(mmplayer_streaming_t *streamer, gboolean buffer_init) { MMPLAYER_FENTER(); MMPLAYER_RETURN_IF_FAIL(streamer); @@ -133,7 +133,7 @@ void __mm_player_streaming_initialize(mm_player_streaming_t *streamer, gboolean return; } -void __mm_player_streaming_destroy(mm_player_streaming_t *streamer) +void __mm_player_streaming_destroy(mmplayer_streaming_t *streamer) { MMPLAYER_FENTER(); @@ -145,7 +145,7 @@ void __mm_player_streaming_destroy(mm_player_streaming_t *streamer) } void __mm_player_streaming_set_content_bitrate( - mm_player_streaming_t *streamer, guint max_bitrate, guint avg_bitrate) + mmplayer_streaming_t *streamer, guint max_bitrate, guint avg_bitrate) { gboolean is_update = FALSE; @@ -176,7 +176,7 @@ void __mm_player_streaming_set_content_bitrate( return; } -static void streaming_calc_watermark(mm_player_streaming_t *streamer, +static void streaming_calc_watermark(mmplayer_streaming_t *streamer, guint expected_play_bytes, gint expected_play_time, gdouble *low_wm, gdouble *high_wm) { #define PORTION_OF_HIGH_WM 1.1 /* need to compensate about low level */ @@ -244,8 +244,8 @@ static void streaming_calc_watermark(mm_player_streaming_t *streamer, LOGD("new watermark value [%f ~ %f]", *low_wm, *high_wm); } -static void streaming_set_buffer_watermark(mm_player_streaming_t *streamer, - BufferType type, gdouble low_watermark, gdouble high_watermark) +static void streaming_set_buffer_watermark(mmplayer_streaming_t *streamer, + buffer_type_e type, gdouble low_watermark, gdouble high_watermark) { streaming_buffer_t *buffer_handle = NULL; gchar *factory_name = NULL; @@ -289,7 +289,7 @@ static void streaming_set_buffer_watermark(mm_player_streaming_t *streamer, return; } -static void streaming_set_queue2_queue_type(mm_player_streaming_t *streamer, MuxedBufferType type) +static void streaming_set_queue2_queue_type(mmplayer_streaming_t *streamer, muxed_buffer_type_e type) { streaming_buffer_t *buffer_handle = NULL; guint64 buffer_size = 0; /* bytes */ @@ -323,8 +323,8 @@ static void streaming_set_queue2_queue_type(mm_player_streaming_t *streamer, Mux return; } -static void streaming_set_buffer_size(mm_player_streaming_t *streamer, - BufferType type, guint buffering_bytes, gint buffering_time) +static void streaming_set_buffer_size(mmplayer_streaming_t *streamer, + buffer_type_e type, guint buffering_bytes, gint buffering_time) { streaming_buffer_t *buffer_handle = NULL; @@ -376,8 +376,8 @@ static void streaming_set_buffer_size(mm_player_streaming_t *streamer, return; } -void __mm_player_streaming_set_queue2(mm_player_streaming_t *streamer, GstElement *buffer, - gboolean use_buffering, MuxedBufferType type, guint64 content_size) +void __mm_player_streaming_set_queue2(mmplayer_streaming_t *streamer, GstElement *buffer, + gboolean use_buffering, muxed_buffer_type_e type, guint64 content_size) { guint queue_size_bytes = 0; guint queue_size_time = 0; @@ -426,7 +426,7 @@ void __mm_player_streaming_set_queue2(mm_player_streaming_t *streamer, GstElemen return; } -void __mm_player_streaming_sync_property(mm_player_streaming_t *streamer, GstElement *decodebin) +void __mm_player_streaming_sync_property(mmplayer_streaming_t *streamer, GstElement *decodebin) { streaming_buffer_t *buffer_handle = NULL; @@ -450,7 +450,7 @@ void __mm_player_streaming_sync_property(mm_player_streaming_t *streamer, GstEle streamer->need_sync = FALSE; } -void __mm_player_streaming_set_multiqueue(mm_player_streaming_t *streamer, GstElement *buffer) +void __mm_player_streaming_set_multiqueue(mmplayer_streaming_t *streamer, GstElement *buffer) { streaming_buffer_t *buffer_handle = NULL; gdouble high_wm = 0.0, low_wm = 0.0; @@ -481,7 +481,7 @@ void __mm_player_streaming_set_multiqueue(mm_player_streaming_t *streamer, GstEl return; } -static void streaming_get_current_bitrate_info(mm_player_streaming_t *streamer, +static void streaming_get_current_bitrate_info(mmplayer_streaming_t *streamer, GstMessage *buffering_msg, streaming_content_info_t content_info, streaming_bitrate_info_t *bitrate_info) { GstQuery *query = NULL; @@ -545,7 +545,7 @@ static void streaming_get_current_bitrate_info(mm_player_streaming_t *streamer, (*bitrate_info).time_rate = buffer_buffering_time; } -static void streaming_handle_fixed_buffering_mode(mm_player_streaming_t *streamer, +static void streaming_handle_fixed_buffering_mode(mmplayer_streaming_t *streamer, gint byte_out_rate, gint expected_play_time, streaming_buffer_info_t *buffer_info) { streaming_buffer_t *buffer_handle = NULL; @@ -576,7 +576,7 @@ static void streaming_handle_fixed_buffering_mode(mm_player_streaming_t *streame (*buffer_info).low_watermark = low_wm; } -static void streaming_handle_adaptive_buffering_mode(mm_player_streaming_t *streamer, +static void streaming_handle_adaptive_buffering_mode(mmplayer_streaming_t *streamer, streaming_content_info_t content_info, streaming_bitrate_info_t bitrate_info, streaming_buffer_info_t *buffer_info, gint expected_play_time) { @@ -655,11 +655,11 @@ static void streaming_handle_adaptive_buffering_mode(mm_player_streaming_t *stre (*buffer_info).low_watermark = low_wm; } -static void streaming_update_buffer_setting(mm_player_streaming_t *streamer, +static void streaming_update_buffer_setting(mmplayer_streaming_t *streamer, GstMessage *buffering_msg, guint64 content_size, gint64 position, gint64 duration) { streaming_buffer_t *buffer_handle = NULL; - MMPlayerBufferingMode buffering_mode = MM_PLAYER_BUFFERING_MODE_ADAPTIVE; + mmplayer_buffering_mode_e buffering_mode = MM_PLAYER_BUFFERING_MODE_ADAPTIVE; gint expected_play_time = DEFAULT_REBUFFERING_TIME; streaming_buffer_info_t buffer_info = {0,}; @@ -733,7 +733,7 @@ static void streaming_update_buffer_setting(mm_player_streaming_t *streamer, streamer->need_sync = TRUE; } -static void streaming_adjust_min_threshold(mm_player_streaming_t *streamer, gint64 position) +static void streaming_adjust_min_threshold(mmplayer_streaming_t *streamer, gint64 position) { #define DEFAULT_TIME_PAD 1000 /* ms */ gint playing_time = 0; @@ -767,7 +767,7 @@ static void streaming_adjust_min_threshold(mm_player_streaming_t *streamer, gint streamer->default_val.prev_pos = position; } -static void streaming_update_buffering_status(mm_player_streaming_t *streamer, GstMessage *buffering_msg, gint64 position) +static void streaming_update_buffering_status(mmplayer_streaming_t *streamer, GstMessage *buffering_msg, gint64 position) { gint buffer_percent = 0; @@ -812,7 +812,7 @@ static void streaming_update_buffering_status(mm_player_streaming_t *streamer, G } } -void __mm_player_streaming_buffering(mm_player_streaming_t *streamer, GstMessage *buffering_msg, +void __mm_player_streaming_buffering(mmplayer_streaming_t *streamer, GstMessage *buffering_msg, guint64 content_size, gint64 position, gint64 duration) { MMPLAYER_FENTER(); diff --git a/src/mm_player_tracks.c b/src/mm_player_tracks.c index 4720051..7240b65 100644 --- a/src/mm_player_tracks.c +++ b/src/mm_player_tracks.c @@ -30,17 +30,17 @@ /*--------------------------------------------------------------------------------------- | LOCAL FUNCTION PROTOTYPES: | ---------------------------------------------------------------------------------------*/ -static int __mmplayer_track_get_language(mm_player_t *player, MMPlayerTrackType type, gint stream_index, gchar **code); +static int __mmplayer_track_get_language(mmplayer_t *player, mmplayer_track_type_e type, gint stream_index, gchar **code); /*======================================================================================= | FUNCTION DEFINITIONS | =======================================================================================*/ int -_mmplayer_get_track_count(MMHandleType hplayer, MMPlayerTrackType type, int *count) +_mmplayer_get_track_count(MMHandleType hplayer, mmplayer_track_type_e type, int *count) { int ret = MM_ERROR_NONE; - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMHandleType attrs = 0; MMPLAYER_FENTER(); @@ -81,10 +81,10 @@ _mmplayer_get_track_count(MMHandleType hplayer, MMPlayerTrackType type, int *co } int -_mmplayer_select_track(MMHandleType hplayer, MMPlayerTrackType type, int index) +_mmplayer_select_track(MMHandleType hplayer, mmplayer_track_type_e type, int index) { int ret = MM_ERROR_NONE; - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMPLAYER_FENTER(); MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED); @@ -95,7 +95,7 @@ _mmplayer_select_track(MMHandleType hplayer, MMPlayerTrackType type, int index) if (type == MM_PLAYER_TRACK_TYPE_TEXT && player->subtitle_language_list) { /* external subtitle */ GstElement *subparse = NULL; - MMPlayerLangStruct *temp = NULL; + mmplayer_lang_info_t *temp = NULL; guint num_of_list = 0; if (!player->pipeline || !player->pipeline->textbin[MMPLAYER_T_FAKE_SINK].gst) { @@ -156,10 +156,10 @@ EXIT: } int -_mmplayer_get_current_track(MMHandleType hplayer, MMPlayerTrackType type, int *index) +_mmplayer_get_current_track(MMHandleType hplayer, mmplayer_track_type_e type, int *index) { int ret = MM_ERROR_NONE; - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; MMHandleType attrs = 0; gint count = 0; @@ -217,10 +217,10 @@ EXIT: } int -_mmplayer_get_track_language_code(MMHandleType hplayer, MMPlayerTrackType type, int index, char **code) +_mmplayer_get_track_language_code(MMHandleType hplayer, mmplayer_track_type_e type, int index, char **code) { int ret = MM_ERROR_NONE; - mm_player_t *player = (mm_player_t *)hplayer; + mmplayer_t *player = (mmplayer_t *)hplayer; gchar *lang_code = NULL; MMPLAYER_FENTER(); @@ -230,7 +230,7 @@ _mmplayer_get_track_language_code(MMHandleType hplayer, MMPlayerTrackType type, MMPLAYER_SUBTITLE_INFO_LOCK(player); if (type == MM_PLAYER_TRACK_TYPE_TEXT && player->subtitle_language_list) { /* external subtitle */ - MMPlayerLangStruct *language_list = NULL; + mmplayer_lang_info_t *language_list = NULL; lang_code = (gchar *)g_malloc0(LANGUAGE_CODE_SIZE * sizeof(char)); @@ -268,9 +268,9 @@ EXIT: } void -__mmplayer_track_initialize(mm_player_t *player) +__mmplayer_track_initialize(mmplayer_t *player) { - MMPlayerTrackType type = MM_PLAYER_TRACK_TYPE_AUDIO; + mmplayer_track_type_e type = MM_PLAYER_TRACK_TYPE_AUDIO; MMPLAYER_FENTER(); @@ -284,9 +284,9 @@ __mmplayer_track_initialize(mm_player_t *player) } void -__mmplayer_track_destroy(mm_player_t *player) +__mmplayer_track_destroy(mmplayer_t *player) { - MMPlayerTrackType type = MM_PLAYER_TRACK_TYPE_AUDIO; + mmplayer_track_type_e type = MM_PLAYER_TRACK_TYPE_AUDIO; MMHandleType attrs = 0; MMPLAYER_FENTER(); @@ -310,7 +310,7 @@ __mmplayer_track_destroy(mm_player_t *player) } void -__mmplayer_track_update_selector_info(mm_player_t *player, MMPlayerTrackType type, GstPad *sinkpad) +__mmplayer_track_update_selector_info(mmplayer_t *player, mmplayer_track_type_e type, GstPad *sinkpad) { MMPLAYER_FENTER(); @@ -321,11 +321,11 @@ __mmplayer_track_update_selector_info(mm_player_t *player, MMPlayerTrackType typ } void -__mmplayer_track_update_text_attr_info(mm_player_t *player, GstMessage *msg) +__mmplayer_track_update_text_attr_info(mmplayer_t *player, GstMessage *msg) { MMHandleType attrs = 0; const GValue *lang_list = NULL; - MMPlayerLangStruct *temp = NULL; + mmplayer_lang_info_t *temp = NULL; gchar *current_lang = NULL; gint track_index = INVALID_TRACK_INDEX; guint track_count = 0, index = 0; @@ -395,7 +395,7 @@ EXIT: } static int -__mmplayer_track_get_language(mm_player_t *player, MMPlayerTrackType type, gint stream_index, gchar **code) +__mmplayer_track_get_language(mmplayer_t *player, mmplayer_track_type_e type, gint stream_index, gchar **code) { GstTagList *tag_list = NULL; gchar *tag = NULL; diff --git a/src/mm_player_utils.c b/src/mm_player_utils.c index 496156a..52b58f1 100644 --- a/src/mm_player_utils.c +++ b/src/mm_player_utils.c @@ -73,7 +73,7 @@ __get_state_name(int state) } gboolean -__is_rtsp_streaming(mm_player_t *player) +__is_rtsp_streaming(mmplayer_t *player) { MMPLAYER_RETURN_VAL_IF_FAIL(player, FALSE); @@ -81,7 +81,7 @@ __is_rtsp_streaming(mm_player_t *player) } gboolean -__is_http_streaming(mm_player_t *player) +__is_http_streaming(mmplayer_t *player) { MMPLAYER_RETURN_VAL_IF_FAIL(player, FALSE); @@ -89,7 +89,7 @@ __is_http_streaming(mm_player_t *player) } gboolean -__is_streaming(mm_player_t *player) +__is_streaming(mmplayer_t *player) { MMPLAYER_RETURN_VAL_IF_FAIL(player, FALSE); @@ -98,7 +98,7 @@ __is_streaming(mm_player_t *player) } gboolean -__is_live_streaming(mm_player_t *player) +__is_live_streaming(mmplayer_t *player) { MMPLAYER_RETURN_VAL_IF_FAIL(player, FALSE); @@ -106,7 +106,7 @@ __is_live_streaming(mm_player_t *player) } gboolean -__is_http_live_streaming(mm_player_t *player) +__is_http_live_streaming(mmplayer_t *player) { MMPLAYER_RETURN_VAL_IF_FAIL(player, FALSE); @@ -114,7 +114,7 @@ __is_http_live_streaming(mm_player_t *player) } gboolean -__is_dash_streaming(mm_player_t *player) +__is_dash_streaming(mmplayer_t *player) { MMPLAYER_RETURN_VAL_IF_FAIL(player, FALSE); @@ -122,7 +122,7 @@ __is_dash_streaming(mm_player_t *player) } gboolean -__is_smooth_streaming(mm_player_t *player) +__is_smooth_streaming(mmplayer_t *player) { MMPLAYER_RETURN_VAL_IF_FAIL(player, FALSE); @@ -130,7 +130,7 @@ __is_smooth_streaming(mm_player_t *player) } gboolean -__is_ms_buff_src(mm_player_t *player) +__is_ms_buff_src(mmplayer_t *player) { MMPLAYER_RETURN_VAL_IF_FAIL(player, FALSE); @@ -138,7 +138,7 @@ __is_ms_buff_src(mm_player_t *player) } gboolean -__has_suffix(mm_player_t *player, const gchar *suffix) +__has_suffix(mmplayer_t *player, const gchar *suffix) { MMPLAYER_RETURN_VAL_IF_FAIL(player, FALSE); MMPLAYER_RETURN_VAL_IF_FAIL(suffix, FALSE); @@ -160,7 +160,7 @@ __has_suffix(mm_player_t *player, const gchar *suffix) } gboolean -__mmplayer_post_message(mm_player_t *player, enum MMMessageType msgtype, MMMessageParamType *param) +__mmplayer_post_message(mmplayer_t *player, enum MMMessageType msgtype, MMMessageParamType *param) { MMPLAYER_RETURN_VAL_IF_FAIL(player, FALSE); @@ -175,7 +175,7 @@ __mmplayer_post_message(mm_player_t *player, enum MMMessageType msgtype, MMMessa } gboolean -__mmplayer_dump_pipeline_state(mm_player_t *player) +__mmplayer_dump_pipeline_state(mmplayer_t *player) { GstIterator *iter = NULL; gboolean done = FALSE; @@ -515,7 +515,7 @@ static int _util_storage_supported_cb(int storage_id, storage_type_e type, storage_state_e state, const char *path, void *user_data) { - MMPlayerStorageInfo *storage_info = (MMPlayerStorageInfo *)user_data; + mmplayer_storage_info_t *storage_info = (mmplayer_storage_info_t *)user_data; MMPLAYER_RETURN_VAL_IF_FAIL(storage_info, FALSE); @@ -529,7 +529,7 @@ _util_storage_supported_cb(int storage_id, storage_type_e type, } bool -util_get_storage_info(const char *path, MMPlayerStorageInfo *storage_info) +util_get_storage_info(const char *path, mmplayer_storage_info_t *storage_info) { int ret = 0; const char *file_path = path; diff --git a/unittest/gtest_mm_player_priv.cpp b/unittest/gtest_mm_player_priv.cpp index 30c43a6..00c7f4d 100644 --- a/unittest/gtest_mm_player_priv.cpp +++ b/unittest/gtest_mm_player_priv.cpp @@ -37,10 +37,10 @@ MMPlayerPriv::~MMPlayerPriv() int MMPlayerPriv::Create(void) { int ret = MM_ERROR_NONE; - mm_player_t *new_player = NULL; + mmplayer_t *new_player = NULL; /* alloc player structure */ - new_player = (mm_player_t *)g_malloc0(sizeof(mm_player_t)); + new_player = (mmplayer_t *)g_malloc0(sizeof(mmplayer_t)); /* create player lock */ g_mutex_init(&new_player->cmd_lock); @@ -82,10 +82,10 @@ int MMPlayerPriv::Destroy(void) MMPLAYER_CMD_UNLOCK(priv_player); - g_mutex_clear(&((mm_player_t *)priv_player)->cmd_lock); - g_mutex_clear(&((mm_player_t *)priv_player)->playback_lock); + g_mutex_clear(&((mmplayer_t *)priv_player)->cmd_lock); + g_mutex_clear(&((mmplayer_t *)priv_player)->playback_lock); - memset((mm_player_t *)priv_player, 0x00, sizeof(mm_player_t)); + memset((mmplayer_t *)priv_player, 0x00, sizeof(mmplayer_t)); /* free player */ g_free((void *)priv_player); @@ -99,7 +99,7 @@ int MMPlayerPriv::SetUri(const gchar *uri) int ret = MM_ERROR_NONE; MMPLAYER_CMD_LOCK(priv_player); - ret= _mmplayer_set_uri(priv_player, uri); + ret = _mmplayer_set_uri(priv_player, uri); MMPLAYER_CMD_UNLOCK(priv_player); return ret; @@ -127,7 +127,7 @@ int MMPlayerPriv::Unrealize(void) return ret; } -int MMPlayerPriv::GetCurrentState(MMPlayerStateType *state) +int MMPlayerPriv::GetCurrentState(mmplayer_state_e *state) { int ret = MM_ERROR_NONE; @@ -140,9 +140,9 @@ int MMPlayerPriv::GetCurrentState(MMPlayerStateType *state) int MMPlayerPriv::ParseProfile(const gchar *uri, int *uri_type) { int ret = MM_ERROR_NONE; - MMPlayerParseProfile profile; + mmplayer_parse_profile_t profile; - memset((void *)&profile, 0, sizeof(MMPlayerParseProfile)); + memset((void *)&profile, 0, sizeof(mmplayer_parse_profile_t)); ret = __mmplayer_parse_profile(uri, NULL, &profile); if (uri_type) diff --git a/unittest/include/gtest_mm_player_priv.h b/unittest/include/gtest_mm_player_priv.h index 9dec326..d99b320 100644 --- a/unittest/include/gtest_mm_player_priv.h +++ b/unittest/include/gtest_mm_player_priv.h @@ -26,7 +26,7 @@ class MMPlayerPriv { private: - mm_player_t *priv_player; + mmplayer_t *priv_player; public: MMPlayerPriv(); @@ -37,7 +37,7 @@ public: int SetUri(const gchar *uri); int Realize(void); int Unrealize(void); - int GetCurrentState(MMPlayerStateType *state); + int GetCurrentState(mmplayer_state_e *state); int ParseProfile(const gchar *uri, int *uri_type); }; diff --git a/unittest/unittest.cpp b/unittest/unittest.cpp index e47eb5b..157fdeb 100644 --- a/unittest/unittest.cpp +++ b/unittest/unittest.cpp @@ -87,7 +87,7 @@ void MMPlayerPrivTest::SetUp() void MMPlayerPrivTest::TearDown() { int ret = MM_ERROR_NONE; - MMPlayerStateType state = MM_PLAYER_STATE_NULL; + mmplayer_state_e state = MM_PLAYER_STATE_NULL; ret = priv_player.GetCurrentState(&state); if (ret != MM_ERROR_NONE)