[0.3.89] resolve api grouping error and update doxygen 98/174098/2 submit/tizen/20180329.023850
authorEunhae Choi <eunhae1.choi@samsung.com>
Wed, 28 Mar 2018 05:24:14 +0000 (14:24 +0900)
committerEunhae Choi <eunhae1.choi@samsung.com>
Wed, 28 Mar 2018 06:41:03 +0000 (15:41 +0900)
Change-Id: I4aa2f381d6519edca31fee07f71500ff95a3e613

doc/player_doc.h
include/player.h
include/player_internal.h
packaging/capi-media-player.spec

index 29eb32ded6642d02c350395e95d700113df0fea7..e707952bb57d080c56346c495b2d298a39edae9e 100644 (file)
  * </tr>
  * <tr>
  *    <td>player_destroy()</td>
- *    <td>ANY</td>
- *    <td>-</td>
+ *    <td>IDLE/ READY/ PLAYING/ PAUSED</td>
+ *    <td>This function must be called after player_create()</td>
  * </tr>
  * <tr>
  *    <td>player_prepare()</td>
  * </tr>
  * <tr>
  *    <td>player_unprepare()</td>
- *    <td>READY/PAUSED/PLAYING</td>
- *    <td>This function must be called after player_stop() or player_start() or player_pause()</td>
+ *    <td>READY/ PLAYING/ PAUSED</td>
+ *    <td>This function must be called after player_prepare()</td>
  * </tr>
  * <tr>
  *    <td>player_start()</td>
  *    <td>This function must be called after player_create()</td>
  * </tr>
  * <tr>
- *    <td>player_unset_completed_cb()<BR> player_unset_interrupted_cb()<BR> player_unset_error_cb()<BR> player_unset_buffering_cb()<BR> player_unset_subtitle_updated_cb()</td>
+ *    <td>player_set_video_stream_changed_cb()<BR>player_set_media_stream_seek_cb()<BR>player_set_media_stream_buffer_status_cb()<BR>player_set_media_packet_video_frame_decoded_cb()</td>
+ *    <td>IDLE</td>
+ *    <td>This function must be called before player_prepare()</td>
+ * </tr>
+ * <tr>
+ *    <td>player_unset_completed_cb()<BR> player_unset_interrupted_cb()<BR> player_unset_error_cb()<BR> player_unset_buffering_cb()<BR> player_unset_subtitle_updated_cb()<BR>player_unset_video_stream_changed_cb()<BR>player_unset_media_stream_seek_cb()<BR>player_unset_media_stream_buffer_status_cb()</td>
  *    <td>IDLE/ READY/ PLAYING/ PAUSED</td>
  *    <td>This function must be called after register callback functions such as player_set_completed_cb()</td>
  * </tr>
  * <tr>
+ *    <td>player_unset_media_packet_video_frame_decoded_cb()</td>
+ *    <td>IDLE/ READY</td>
+ *    <td>This function must be called after player_set_media_packet_video_frame_decoded_cb()</td>
+ * </tr>
+ * <tr>
  *    <td>player_get_state()</td>
  *    <td>ANY</td>
  *    <td>-</td>
  * </tr>
  * <tr>
  *    <td>player_set_subtitle_path()</td>
- *    <td>IDLE</td>
- *    <td>This function must be called before player_prepare() </td>
+ *    <td>IDLE/ READY/ PLAYING/ PAUSED</td>
+ *    <td>This function must be called before player_create() </td>
  * </tr>
  * <tr>
  *    <td>player_set_volume()</td>
  * <tr>
  *    <td>player_set_sound_stream_info()</td>
  *    <td>IDLE</td>
- *    <td>This function must be called after player_create()</td>
+ *    <td>This function must be called before player_prepare()</td>
  * </tr>
  * <tr>
  *    <td>player_set_sound_type()</td>
  *    <td>IDLE</td>
- *    <td>This function must be called after player_create()</td>
+ *    <td>This function must be called before player_prepare()</td>
  * </tr>
  * <tr>
  *    <td>player_set_mute()</td>
  *    <td>READY/ PLAYING/ PAUSED</td>
  *    <td>This function must be called after player_prepare()</td>
  * </tr>
+ * <tr>
+ *    <td>player_set_subtitle_position_offset()</td>
+ *    <td>PLAYING/ PAUSED</td>
+ *    <td>This function must be called after player_start()</td>
+ * </tr>
+ * <tr>
+ *    <td>player_get_current_track()<BR>player_get_track_language_code()<BR>player_get_track_count()<BR>player_select_track()</td>
+ *    <td>READY/ PLAYING/ PAUSED</td>
+ *    <td>This function must be called after player_prepare()</td>
+ * </tr>
+ * <tr>
+ *    <td>player_set_audio_only()</td>
+ *    <td>READY/ PLAYING/ PAUSED</td>
+ *    <td>This function must be called after player_prepare()</td>
+ * </tr>
+ * <tr>
+ *    <td>player_set_streaming_buffering_time()</td>
+ *    <td>IDLE</td>
+ *    <td>This function must be called before player_prepare()</td>
+ * </tr>
  * </table></div>
  *
  * @subsection CAPI_MEDIA_PLAYER_LIFE_CYCLE_ASYNCHRONOUS_OPERATIONS Asynchronous Operations
  *        <td>player_media_packet_video_decoded_cb()</td>
  *        <td>called when a video frame is decoded </td>
  *     </tr>
+ *     <tr>
+ *        <td>player_set_media_stream_seek_cb()</td>
+ *        <td>player_unset_media_stream_seek_cb()</td>
+ *        <td>player_media_stream_seek_cb()</td>
+ *        <td>called when seeking is occurred during playback with external media buffer</td>
+ *     </tr>
+ *     <tr>
+ *        <td>player_set_media_stream_buffer_status_cb()</td>
+ *        <td>player_unset_media_stream_buffer_status_cb()</td>
+ *        <td>player_media_stream_buffer_status_cb()</td>
+ *        <td>called when the buffer underrun or overflow is detected during playback with external media buffer</td>
+ *     </tr>
+ *     <tr>
+ *        <td>player_set_video_stream_changed_cb()</td>
+ *        <td>player_unset_video_stream_changed_cb()</td>
+ *        <td>player_video_stream_changed_cb()</td>
+ *        <td>called when the video stream info is changed </td>
+ *     </tr>
 
  *</table></div>
  *
  *
  * @section CAPI_MEDIA_PLAYER_AUDIO_EFFECT_MODULE_MODULE_OVERVIEW Overview
  * The Audio effect API allows you to apply effects to the player:
- * - Equalizer
+ * - Equalizer \n
  *
  *
 */
  *
 */
 
+/**
+ * @ingroup CAPI_MEDIA_PLAYER_MODULE
+ * @defgroup CAPI_MEDIA_PLAYER_STREAMING_MODULE Streaming
+ * @brief The @ref CAPI_MEDIA_PLAYER_STREAMING_MODULE API provides functions for streaming playback and buffering controlling.
+ * @section CAPI_MEDIA_PLAYER_STREAMING_MODULE_HEADER Required Header
+ *    \#include <player.h>
+ *
+ * @section CAPI_MEDIA_PLAYER_STREAMING_MODULE_OVERVIEW Overview
+ * The streaming API allows you to set and get various properties to setup network connection and control buffering scheme:
+ * - connection information, such as cookie, user_agent.
+ * - buffering information, such as time, percent, progress.
+ * - variant information of adaptive streaming content, such as bandwidth, resolution.
+ *
+*/
+
+/**
+ * @ingroup CAPI_MEDIA_PLAYER_MODULE
+ * @defgroup CAPI_MEDIA_PLAYER_360_MODULE Video360
+ * @brief The @ref CAPI_MEDIA_PLAYER_360_MODULE API provides functions for 360 video playback and controlling the attributes.
+ * @section CAPI_MEDIA_PLAYER_360_MODULE_HEADER Required Header
+ *    \#include <player.h>
+ *
+ * @section CAPI_MEDIA_PLAYER_360_MODULE_OVERVIEW Overview
+ * The Player stream information API allows you to get media stream information, including:
+ * - Content metadata, such as the tile, artist, album title and genre.
+ * - Audio stream information, such as audio codec type, sample rate, channels, and bit rate.
+ * - Video stream information, such as video codec type, video width and height.
+ *
+*/
+
 #endif /* __TIZEN_MEDIA_PLAYER_DOC_H__ */
index 717a2dfec27970b3e5aba6cf1912f0ec95a03d6b..3cca9b0ce4adc73797061cd7bf44a97310967a5a 100644 (file)
@@ -175,6 +175,15 @@ typedef enum {
        PLAYER_MEDIA_STREAM_BUFFER_OVERFLOW, /**< The buffer level is over than the threshold */
 } player_media_stream_buffer_status_e;
 
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup CAPI_MEDIA_PLAYER_DISPLAY_MODULE
+ * @{
+ */
+
 /**
  * @brief The player display handle.
  * @since_tizen @if WEARABLE 2.3.1 @else 2.3 @endif
@@ -189,15 +198,6 @@ typedef void* player_display_h;
 #define GET_DISPLAY(x) (void*)(x)
 #endif
 
-/**
- * @}
- */
-
-/**
- * @addtogroup CAPI_MEDIA_PLAYER_DISPLAY_MODULE
- * @{
- */
-
 /**
  * @brief Enumeration for display rotation type.
  * @since_tizen @if WEARABLE 2.3.1 @else 2.3 @endif
@@ -344,25 +344,6 @@ typedef void (*player_interrupted_cb)(player_interrupted_code_e code, void *user
  */
 typedef void (*player_error_cb)(int error_code, void *user_data);
 
-/**
- * @brief Called when the buffering percentage of the media playback is updated.
- * @details If the buffer is full, it will return 100%.
- * @since_tizen @if WEARABLE 2.3.1 @else 2.3 @endif
- * @param[in] percent     The percentage of buffering completed (0~100)
- * @param[in] user_data   The user data passed from the callback registration function
- * @see player_set_buffering_cb()
- * @see player_unset_buffering_cb()
- */
-typedef void (*player_buffering_cb)(int percent, void *user_data);
-
-/**
- * @brief Called when progressive download is started or completed.
- * @since_tizen @if WEARABLE 2.3.1 @else 2.3 @endif
- * @param[in] type        The message type for progressive download
- * @param[in] user_data   The user data passed from the callback registration function
- */
-typedef void (*player_pd_message_cb)(player_pd_message_type_e type, void *user_data);
-
 /**
  * @brief Called when the video is captured.
  * @since_tizen @if WEARABLE 2.3.1 @else 2.3 @endif
@@ -412,6 +393,15 @@ typedef void (*player_media_stream_buffer_status_cb) (player_media_stream_buffer
  */
 typedef void (*player_media_stream_seek_cb) (unsigned long long offset, void *user_data);
 
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup CAPI_MEDIA_PLAYER_STREAM_INFO_MODULE
+ * @{
+ */
+
 /**
  * @brief Called to notify the video stream changed.
  * @details The video stream changing is detected just before rendering operation.
@@ -427,6 +417,34 @@ typedef void (*player_media_stream_seek_cb) (unsigned long long offset, void *us
  */
 typedef void (*player_video_stream_changed_cb) (int width, int height, int fps, int bit_rate, void *user_data);
 
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup CAPI_MEDIA_PLAYER_STREAMING_MODULE
+ * @{
+ */
+
+/**
+ * @brief Called when the buffering percentage of the media playback is updated.
+ * @details If the buffer is full, it will return 100%.
+ * @since_tizen @if WEARABLE 2.3.1 @else 2.3 @endif
+ * @param[in] percent     The percentage of buffering completed (0~100)
+ * @param[in] user_data   The user data passed from the callback registration function
+ * @see player_set_buffering_cb()
+ * @see player_unset_buffering_cb()
+ */
+typedef void (*player_buffering_cb)(int percent, void *user_data);
+
+/**
+ * @brief Called when progressive download is started or completed.
+ * @since_tizen @if WEARABLE 2.3.1 @else 2.3 @endif
+ * @param[in] type        The message type for progressive download
+ * @param[in] user_data   The user data passed from the callback registration function
+ */
+typedef void (*player_pd_message_cb)(player_pd_message_type_e type, void *user_data);
+
 /**
  * @brief Called to notify the streaming variant information.
  * @details The adaptive streaming protocol(hls, mpeg dash) can support variant stream condition.
@@ -440,6 +458,15 @@ typedef void (*player_video_stream_changed_cb) (int width, int height, int fps,
  */
 typedef void (*player_adaptive_variant_cb) (int bandwidth, int width, int height, void *user_data);
 
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup CAPI_MEDIA_PLAYER_MODULE
+ * @{
+ */
+
 /**
  * @brief Creates a player handle for playing multimedia content.
  * @since_tizen @if WEARABLE 2.3.1 @else 2.3 @endif
@@ -1677,6 +1704,15 @@ int player_audio_effect_equalizer_is_available(player_h player, bool *available)
  */
 int player_capture_video(player_h player, player_video_captured_cb callback, void *user_data);
 
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup CAPI_MEDIA_PLAYER_STREAMING_MODULE
+ * @{
+ */
+
 /**
  * @brief Sets the cookie for streaming playback.
  * @since_tizen @if WEARABLE 2.3.1 @else 2.3 @endif
@@ -1733,6 +1769,15 @@ int player_set_streaming_user_agent(player_h player, const char *user_agent, int
  */
 int player_get_streaming_download_progress(player_h player, int *start, int *current);
 
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup CAPI_MEDIA_PLAYER_MODULE
+ * @{
+ */
+
 /**
  * @brief Sets a callback function to be invoked when the playback is finished.
  * @since_tizen @if WEARABLE 2.3.1 @else 2.3 @endif
@@ -1825,6 +1870,15 @@ int player_set_error_cb(player_h player, player_error_cb callback, void *user_da
  */
 int player_unset_error_cb(player_h player);
 
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup CAPI_MEDIA_PLAYER_STREAMING_MODULE
+ * @{
+ */
+
 /**
  * @brief Sets a callback function to be invoked when there is a change in the buffering status of a media stream.
  * @since_tizen @if WEARABLE 2.3.1 @else 2.3 @endif
@@ -1930,6 +1984,15 @@ int player_set_progressive_download_message_cb(player_h player, player_pd_messag
  */
 int player_unset_progressive_download_message_cb(player_h player) TIZEN_DEPRECATED_API;
 
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup CAPI_MEDIA_PLAYER_MODULE
+ * @{
+ */
+
 /**
  * @brief Sets the playback rate.
  * @details The default value is @c 1.0.
@@ -2030,6 +2093,16 @@ int player_unset_subtitle_updated_cb(player_h player);
  */
 int player_set_subtitle_position_offset(player_h player, int millisecond);
 
+/**
+ * @}
+ */
+
+
+/**
+ * @addtogroup CAPI_MEDIA_PLAYER_STREAM_INFO_MODULE
+ * @{
+ */
+
 /**
  * @brief Sets a callback function to be invoked when video stream is changed.
  * @since_tizen @if WEARABLE 3.0 @else 2.4 @endif
@@ -2065,6 +2138,16 @@ int player_set_video_stream_changed_cb(player_h player, player_video_stream_chan
  */
 int player_unset_video_stream_changed_cb(player_h player);
 
+/**
+ * @}
+ */
+
+
+/**
+ * @addtogroup CAPI_MEDIA_PLAYER_MODULE
+ * @{
+ */
+
 /**
  * @brief Gets current track index.
  * @details Index starts from 0.
@@ -2133,6 +2216,15 @@ int player_get_track_count(player_h player, player_stream_type_e type, int *coun
  */
 int player_select_track(player_h player, player_stream_type_e type, int index);
 
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup CAPI_MEDIA_PLAYER_STREAMING_MODULE
+ * @{
+ */
+
 /**
  * @brief Retrieves all the streaming variant information.
  * @since_tizen 4.0
@@ -2192,6 +2284,15 @@ int player_set_max_adaptive_variant_limit(player_h player, int bandwidth, int wi
  */
 int player_get_max_adaptive_variant_limit(player_h player, int *bandwidth, int *width, int *height);
 
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup CAPI_MEDIA_PLAYER_MODULE
+ * @{
+ */
+
 /**
  * @brief Sets the audio only mode.
  * @details This function is used to disable or enable video rendering during playback.
@@ -2224,6 +2325,15 @@ int player_set_audio_only(player_h player, bool audio_only);
  */
 int player_is_audio_only(player_h player, bool *audio_only);
 
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup CAPI_MEDIA_PLAYER_STREAMING_MODULE
+ * @{
+ */
+
 /**
  * @brief Sets the streaming buffering time.
  * @since_tizen 4.0
@@ -2258,6 +2368,15 @@ int player_set_streaming_buffering_time(player_h player, int prebuffer_ms, int r
  */
 int player_get_streaming_buffering_time(player_h player, int *prebuffer_ms, int *rebuffer_ms);
 
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup CAPI_MEDIA_PLAYER_360_MODULE
+ * @{
+ */
+
 /**
  * @brief Gets information whether the current content of the player is spherical.
  * @since_tizen 5.0
index 71d92ff02b5d9f9519e757bf721961c5e0caf1b5..1cd57cc2703957d273f2a2bfa9eead4e6666bf6f 100644 (file)
@@ -27,8 +27,8 @@ extern "C" {
  */
 
 /**
- * @addtogroup CAPI_MEDIA_PLAYER_MODULE
- * @{
+ * @brief Enumeration for wayland window type.
+ * @since_tizen 3.0
  */
 typedef enum {
        ELM_WAYLAND_WIN = 1,
@@ -620,11 +620,6 @@ int player_set_codec_type(player_h player, player_stream_type_e stream_type, pla
  */
 int player_get_codec_type(player_h player, player_stream_type_e stream_type, player_codec_type_e *pcodec_type);
 
-
-/**
- * @}
- */
-
 #ifdef __cplusplus
 }
 #endif
index aef3fe762b6303de4843ee65989409c4137d3a90..167ff3d4376f39332bfa54b70cea0925015c8d29 100644 (file)
@@ -1,6 +1,6 @@
 Name:       capi-media-player
 Summary:    A Media Player API
-Version:    0.3.88
+Version:    0.3.89
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0