[Reform] Apply Coding Style
authorreview-bot <reviewbot@samsung.com>
Wed, 25 Oct 2023 08:40:29 +0000 (17:40 +0900)
committerreview-bot <reviewbot@samsung.com>
Wed, 25 Oct 2023 08:40:29 +0000 (17:40 +0900)
14 files changed:
include/esplusplayer_capi/buffer.h
include/esplusplayer_capi/display.h
include/esplusplayer_capi/drm.h
include/esplusplayer_capi/error.h
include/esplusplayer_capi/esplusplayer_capi.h
include/esplusplayer_capi/event.h
include/esplusplayer_capi/latency.h
include/esplusplayer_capi/state.h
include/esplusplayer_capi/stream.h
include/esplusplayer_capi/submitdatatype.h
include/esplusplayer_capi/submitstatus.h
include/mixer_capi/display.h
include/mixer_capi/error.h
include/mixer_capi/mixer_capi.h

index 5e754d6948f8655870904c3ea61893743f6d90af..7a7a4dc8cfa8a8b5e8b2a3e691c66983bda96e45 100755 (executable)
@@ -40,21 +40,21 @@ extern "C" {
 typedef enum esplusplayer_buffer_status {
   ESPLUSPLAYER_BUFFER_STATUS_UNDERRUN,
   ESPLUSPLAYER_BUFFER_STATUS_OVERRUN
-}esplusplayer_buffer_status;
+} esplusplayer_buffer_status;
 
 /**
  * @brief  Enumerations for video decoded buffer type
  * ESPLUSPLAYER_DECODED_VIDEO_FRAME_BUFFER_TYPE_SCALE:
  * decoded video frame will be croped and scaled, then sent to
  * user by media_packet_video_decoded_cb, only support hw decoder now
-*/
+ */
 typedef enum esplusplayer_decoded_video_frame_buffer_type {
   ESPLUSPLAYER_DECODED_VIDEO_FRAME_BUFFER_TYPE_NONE,
   ESPLUSPLAYER_DECODED_VIDEO_FRAME_BUFFER_TYPE_COPY,
   ESPLUSPLAYER_DECODED_VIDEO_FRAME_BUFFER_TYPE_REFERENCE,
   ESPLUSPLAYER_DECODED_VIDEO_FRAME_BUFFER_TYPE_SCALE,
   ESPLUSPLAYER_DECODED_VIDEO_FRAME_BUFFER_TYPE_MANUAL_COPY
-}esplusplayer_decoded_video_frame_buffer_type;
+} esplusplayer_decoded_video_frame_buffer_type;
 
 /**
  * @brief  Enumerations for buffer size option
@@ -74,7 +74,7 @@ typedef enum esplusplayer_buffer_option {
   ESPLUSPLAYER_BUFFER_VIDEO_MAX_BYTE_SIZE,
   ESPLUSPLAYER_BUFFER_AUDIO_MIN_BYTE_THRESHOLD,
   ESPLUSPLAYER_BUFFER_VIDEO_MIN_BYTE_THRESHOLD
-}esplusplayer_buffer_option;
+} esplusplayer_buffer_option;
 
 /**
  * @brief  video decoded buffer struct
@@ -107,7 +107,8 @@ typedef struct {
    */
   uint64_t pts;
   /**
-   * @description   system time of decoder input or output buffer, in millisecond
+   * @description   system time of decoder input or output buffer, in
+   * millisecond
    */
   uint64_t system_time;
 } esplusplayer_decoder_buffer_time;
index f85299f6c1855833c9436da45131bdf8664c9e10..d3d32258cae6cf8597e3d3256973214b9dcccb0f 100755 (executable)
@@ -45,7 +45,7 @@ typedef enum esplusplayer_display_mode {
   ESPLUSPLAYER_DISPLAY_MODE_CROPPED_FULL,
   ESPLUSPLAYER_DISPLAY_MODE_ORIGIN_OR_LETTER,
   ESPLUSPLAYER_DISPLAY_MODE_DST_ROI
-}esplusplayer_display_mode;
+} esplusplayer_display_mode;
 
 /**
  * @brief  Enumerations for the display type
@@ -55,7 +55,7 @@ typedef enum esplusplayer_display_type {
   ESPLUSPLAYER_DISPLAY_TYPE_OVERLAY,
   ESPLUSPLAYER_DISPLAY_TYPE_EVAS,
   ESPLUSPLAYER_DISPLAY_TYPE_MIXER
-}esplusplayer_display_type;
+} esplusplayer_display_type;
 
 /**
  * @brief  Enumerations for the display rotation type
@@ -65,7 +65,7 @@ typedef enum esplusplayer_display_rotation_type {
   ESPLUSPLAYER_DISPLAY_ROTATION_TYPE_90,
   ESPLUSPLAYER_DISPLAY_ROTATION_TYPE_180,
   ESPLUSPLAYER_DISPLAY_ROTATION_TYPE_270
-}esplusplayer_display_rotation_type;
+} esplusplayer_display_rotation_type;
 
 #ifdef __cplusplus
 }  // extern "C"
index e5090693ad2baa1a9a68d6dd3e293f03dd345a2a..075c637452325a8149cbaff13c27b8dde2ee0778 100755 (executable)
@@ -45,7 +45,7 @@ typedef enum esplusplayer_drm_type {
   ESPLUSPLAYER_DRM_TYPE_MARLIN,
   ESPLUSPLAYER_DRM_TYPE_VERIMATRIX,
   ESPLUSPLAYER_DRM_TYPE_WV_MODULAR
-}esplusplayer_drm_type;
+} esplusplayer_drm_type;
 
 /**
  * @brief  Enumerations for the algorithm encrypted
@@ -55,7 +55,7 @@ typedef enum esplusplayer_drmb_es_cipher_algorithm {
   ESPLUSPLAYER_DRMB_ES_CIPHER_ALGORITHM_RC4 = 0,
   ESPLUSPLAYER_DRMB_ES_CIPHER_ALGORITHM_AES128_CTR = 1,
   ESPLUSPLAYER_DRMB_ES_CIPHER_ALGORITHM_AES128_CBC = 2
-}esplusplayer_drmb_es_cipher_algorithm;
+} esplusplayer_drmb_es_cipher_algorithm;
 
 /**
  * @brief  Enumerations for the algorithm encrypted
@@ -69,7 +69,7 @@ typedef enum esplusplayer_drmb_es_media_format {
   ESPLUSPLAYER_DRMB_ES_MEDIA_FORMAT_FMP4_VIDEO = 5,
   ESPLUSPLAYER_DRMB_ES_MEDIA_FORMAT_CLEAN_AUDIO = 6,
   ESPLUSPLAYER_DRMB_ES_MEDIA_FORMAT_PES = 7
-}esplusplayer_drmb_es_media_format;
+} esplusplayer_drmb_es_media_format;
 
 /**
  * @brief  Enumerations for the phase for cipher
@@ -79,7 +79,7 @@ typedef enum esplusplayer_drmb_es_cipher_phase {
   ESPLUSPLAYER_DRMB_ES_CIPHER_PHASE_INIT = 1,
   ESPLUSPLAYER_DRMB_ES_CIPHER_PHASE_UPDATE = 2,
   ESPLUSPLAYER_DRMB_ES_CIPHER_PHASE_FINAL = 3
-}esplusplayer_drmb_es_cipher_phase;
+} esplusplayer_drmb_es_cipher_phase;
 
 /**
  * @brief  Subsample information structure for encrypted es
index 769efd09946893ead174c59be047efcbfc5f73b9..8075a54f9a3ded41730a30642a90946ba1a0d1bc 100755 (executable)
@@ -45,23 +45,39 @@ extern "C" {
  */
 typedef enum esplusplayer_error_type {
   ESPLUSPLAYER_ERROR_TYPE_NONE = TIZEN_ERROR_NONE, /**< Successful */
-  ESPLUSPLAYER_ERROR_TYPE_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY, /**< Out of memory */
-  ESPLUSPLAYER_ERROR_TYPE_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid parameter */
-  ESPLUSPLAYER_ERROR_TYPE_INVALID_OPERATION = TIZEN_ERROR_INVALID_OPERATION, /**< Invalid operation */
-  ESPLUSPLAYER_ERROR_TYPE_INVALID_STATE  = ESPLUSPLAYER_ERROR_CLASS | 0x02, /**< Invalid state */
-  ESPLUSPLAYER_ERROR_TYPE_NOT_SUPPORTED_AUDIO_CODEC = ESPLUSPLAYER_ERROR_CLASS | 0x0e, /**< Not supported audio codec but video can be played (Since 4.0)*/
-  ESPLUSPLAYER_ERROR_TYPE_NOT_SUPPORTED_VIDEO_CODEC = ESPLUSPLAYER_ERROR_CLASS | 0x0f, /**< Not supported video codec but audio can be played (Since 4.0)*/
-  ESPLUSPLAYER_ERROR_TYPE_NOT_SUPPORTED_FILE = ESPLUSPLAYER_ERROR_CLASS | 0x03, /**< File format not supported */
-  ESPLUSPLAYER_ERROR_TYPE_CONNECTION_FAILED = ESPLUSPLAYER_ERROR_CLASS | 0x06, /**< Streaming connection failed */
-  ESPLUSPLAYER_ERROR_TYPE_DRM_EXPIRED = ESPLUSPLAYER_ERROR_CLASS | 0x08, /**< Expired license */
-  ESPLUSPLAYER_ERROR_TYPE_DRM_NO_LICENSE = ESPLUSPLAYER_ERROR_CLASS | 0x09, /**< No license */
-  ESPLUSPLAYER_ERROR_TYPE_DRM_FUTURE_USE = ESPLUSPLAYER_ERROR_CLASS | 0x0a, /**< License for future use */
-  ESPLUSPLAYER_ERROR_TYPE_NOT_PERMITTED = ESPLUSPLAYER_ERROR_CLASS | 0x0b, /**< Format not permitted */
+  ESPLUSPLAYER_ERROR_TYPE_OUT_OF_MEMORY =
+      TIZEN_ERROR_OUT_OF_MEMORY, /**< Out of memory */
+  ESPLUSPLAYER_ERROR_TYPE_INVALID_PARAMETER =
+      TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid parameter */
+  ESPLUSPLAYER_ERROR_TYPE_INVALID_OPERATION =
+      TIZEN_ERROR_INVALID_OPERATION, /**< Invalid operation */
+  ESPLUSPLAYER_ERROR_TYPE_INVALID_STATE =
+      ESPLUSPLAYER_ERROR_CLASS | 0x02, /**< Invalid state */
+  ESPLUSPLAYER_ERROR_TYPE_NOT_SUPPORTED_AUDIO_CODEC =
+      ESPLUSPLAYER_ERROR_CLASS |
+      0x0e, /**< Not supported audio codec but video can be played (Since 4.0)*/
+  ESPLUSPLAYER_ERROR_TYPE_NOT_SUPPORTED_VIDEO_CODEC =
+      ESPLUSPLAYER_ERROR_CLASS |
+      0x0f, /**< Not supported video codec but audio can be played (Since 4.0)*/
+  ESPLUSPLAYER_ERROR_TYPE_NOT_SUPPORTED_FILE =
+      ESPLUSPLAYER_ERROR_CLASS | 0x03, /**< File format not supported */
+  ESPLUSPLAYER_ERROR_TYPE_CONNECTION_FAILED =
+      ESPLUSPLAYER_ERROR_CLASS | 0x06, /**< Streaming connection failed */
+  ESPLUSPLAYER_ERROR_TYPE_DRM_EXPIRED =
+      ESPLUSPLAYER_ERROR_CLASS | 0x08, /**< Expired license */
+  ESPLUSPLAYER_ERROR_TYPE_DRM_NO_LICENSE =
+      ESPLUSPLAYER_ERROR_CLASS | 0x09, /**< No license */
+  ESPLUSPLAYER_ERROR_TYPE_DRM_FUTURE_USE =
+      ESPLUSPLAYER_ERROR_CLASS | 0x0a, /**< License for future use */
+  ESPLUSPLAYER_ERROR_TYPE_NOT_PERMITTED =
+      ESPLUSPLAYER_ERROR_CLASS | 0x0b, /**< Format not permitted */
 
-  ESPLUSPLAYER_ERROR_TYPE_DRM_DECRYPTION_FAILED = ESPLUSPLAYER_CUSTOM_ERROR_CLASS | 0x05, /**< drm decryption failed */
-  ESPLUSPLAYER_ERROR_TYPE_NOT_SUPPORTED_FORMAT = ESPLUSPLAYER_CUSTOM_ERROR_CLASS | 0x08,/**< format not supported */
+  ESPLUSPLAYER_ERROR_TYPE_DRM_DECRYPTION_FAILED =
+      ESPLUSPLAYER_CUSTOM_ERROR_CLASS | 0x05, /**< drm decryption failed */
+  ESPLUSPLAYER_ERROR_TYPE_NOT_SUPPORTED_FORMAT =
+      ESPLUSPLAYER_CUSTOM_ERROR_CLASS | 0x08, /**< format not supported */
   ESPLUSPLAYER_ERROR_TYPE_UNKNOWN
-}esplusplayer_error_type;
+} esplusplayer_error_type;
 
 #ifdef __cplusplus
 }  // extern "C"
index d3d90fa3730943877eeab4954b6b0b0286d563b0..bdc5b5b42632b2c02da9aee25bf584373947825a 100755 (executable)
@@ -93,7 +93,7 @@ typedef enum esplusplayer_adaptive_info_type {
   ESPLUSPLAYER_ADAPT_INFO_TYPE_DROPPED_FRAMES,
   ESPLUSPLAYER_ADAPT_INFO_TYPE_DROPPED_VIDEO_FRAMES_FOR_CATCHUP,
   ESPLUSPLAYER_ADAPT_INFO_TYPE_DROPPED_AUDIO_FRAMES_FOR_CATCHUP,
-}esplusplayer_adaptive_info_type;
+} esplusplayer_adaptive_info_type;
 
 /**
  * @brief   Enumerations for low latency mode
@@ -172,7 +172,7 @@ typedef enum esplusplayer_low_latency_mode {
    */
   ESPLUSPLAYER_LOW_LATENCY_MODE_ENABLE_GAME_MODE_WITH_FIXED_RESOLUTION =
       ESPLUSPLAYER_LOW_LATENCY_MODE_ENABLE_GAME_MODE | 0x4000,
-}esplusplayer_low_latency_mode;
+} esplusplayer_low_latency_mode;
 
 /**
  * @brief   Enumerations for esplusplayer audio codec type
@@ -186,7 +186,7 @@ typedef enum esplusplayer_audio_codec_type {
    * @description   sorfware codec can only be selected
    */
   ESPLUSPLAYER_AUDIO_CODEC_TYPE_SW
-}esplusplayer_audio_codec_type;
+} esplusplayer_audio_codec_type;
 
 /**
  * @brief   Enumerations for esplusplayer video codec type
@@ -208,7 +208,7 @@ typedef enum esplusplayer_video_codec_type {
   */
   ESPLUSPLAYER_VIDEO_CODEC_TYPE_HW_N_DECODING
 
-}esplusplayer_video_codec_type;
+} esplusplayer_video_codec_type;
 /**
  * @brief   Enumerations for esplusplayer audio easing type
  * @version 3.0
@@ -230,7 +230,7 @@ typedef enum esplusplayer_audio_easing_type {
    * @description audio easing function type is none
    */
   ESPLUSPLAYER_AUDIO_EASING_NONE
-}esplusplayer_audio_easing_type;
+} esplusplayer_audio_easing_type;
 
 /**
  * @brief   Enumerations for esplusplayer resource type
@@ -241,7 +241,7 @@ typedef enum esplusplayer_rsc_type {
    * @description video renderer type
    */
   ESPLUSPLAYER_RSC_TYPE_VIDEO_RENDERER
-}esplusplayer_rsc_type;
+} esplusplayer_rsc_type;
 
 /**
  * @brief   Enumerations for advanced video quality type
@@ -263,7 +263,7 @@ typedef enum esplusplayer_advanced_picture_quality_type {
    * @version 4.0
    */
   ESPLUSPLAYER_ADVANCED_PICTURE_QUALITY_AIRPLAY_MIRRORING
-}esplusplayer_advanced_picture_quality_type;
+} esplusplayer_advanced_picture_quality_type;
 
 /**
  * @brief   Enumerations for audio resource type
@@ -282,7 +282,7 @@ typedef enum esplusplayer_audio_resource_type {
    * @description only audio out to simple mix out resource
    */
   ESPLUSPLAYER_AUDIO_RESOURCE_SIMPLE_MIX_OUT
-}esplusplayer_audio_resource_type;
+} esplusplayer_audio_resource_type;
 
 /**
  * @brief   Enumerations for buffer level of simple mix out
@@ -301,7 +301,7 @@ typedef enum esplusplayer_simple_mix_out_buffer_level {
    * @description buffer level is high
    */
   ESPLUSPLAYER_SIMPLE_MIX_OUT_BUFFER_HIGH
-}esplusplayer_simple_mix_out_buffer_level;
+} esplusplayer_simple_mix_out_buffer_level;
 
 /**
  * @brief  ESPlusplayer easing target volume, duration, type information
@@ -413,7 +413,7 @@ typedef enum esplusplayer_rsc_alloc_policy {
    * @version 6.0
    */
   ESPLUSPLAYER_RSC_ALLOC_EXCLUSIVE_NO_EXPLICIT
-}esplusplayer_rsc_alloc_policy;
+} esplusplayer_rsc_alloc_policy;
 
 /**
  * @brief Enumerations for the status of getting decoded video frame
@@ -434,7 +434,7 @@ typedef enum esplusplayer_get_decoded_video_frame_status_type {
    * @brief  internal error
    */
   ESPLUSPLAYER_GET_DECVIDEOFRAME_STATUS_UNKNOWN
-}esplusplayer_get_decoded_video_frame_status_type;
+} esplusplayer_get_decoded_video_frame_status_type;
 
 /**
  * @brief Enumerations for the video scan type
@@ -451,7 +451,7 @@ typedef enum esplusplayer_video_scan_type {
    * mode.
    */
   ESPLUSPLAYER_VIDEO_SCAN_TYPE_INTERLACED,
-}esplusplayer_video_scan_type;
+} esplusplayer_video_scan_type;
 
 /**
  * @brief Enumerations for the time unit type
@@ -466,7 +466,7 @@ typedef enum esplusplayer_time_unit_type {
    * @description the timeunit will be us.
    */
   ESPLUSPLAYER_TIME_UNIT_US,
-}esplusplayer_time_unit_type;
+} esplusplayer_time_unit_type;
 
 /**
  * @brief  Enumerations for the video stream rotation type
@@ -477,7 +477,7 @@ typedef enum esplusplayer_video_stream_rotation_type {
   ESPLUSPLAYER_VIDEO_ROTATION_90,
   ESPLUSPLAYER_VIDEO_ROTATION_180,
   ESPLUSPLAYER_VIDEO_ROTATION_270
-}esplusplayer_video_stream_rotation_type;
+} esplusplayer_video_stream_rotation_type;
 
 /**
  * @brief     Create a esplusplayer handle.
@@ -3830,8 +3830,8 @@ int esplusplayer_set_app_info_ex(esplusplayer_handle handle,
 /**
  * @brief     Set the rotate angle of the video stream.
  * This API is used for rotate camera, e.g Pogo-Pin camera
- * In Pogo-Pin Camera Video Call scenario, just provide the rotate angle to encoder 
- * and AIFW
+ * In Pogo-Pin Camera Video Call scenario, just provide the rotate angle to
+ * encoder and AIFW
  * @remark    This API will not actually rotate the video display
  * @param     [in] handle : esplusplayer handle.
  * @param     [in] rotation : the rotate angle of the video.
index e3ac69a393900e4fc491f6121ca82a0aba37c10d..75db54780e4286cd791fc1bf532876004607196a 100755 (executable)
@@ -63,7 +63,7 @@ typedef enum esplusplayer_event_type {
    * or ESPLUSPLAYER_LOW_LATENCY_MODE_DISABLE_PREROLL mode.
    */
   ESPLUSPLAYER_EVENT_REQUESTED_FIRST_RENDER_FRAME,
-}esplusplayer_event_type;
+} esplusplayer_event_type;
 
 #ifdef __cplusplus
 }  // extern "C"
index 4d8fb390e38fbee6e5fa4a6e54783d8468267288..ece77a751de297dcc4ee4025e33f5326594d083e 100755 (executable)
@@ -39,7 +39,7 @@ typedef enum esplusplayer_catch_up_speed {
   ESPLUSPLAYER_CATCH_UP_SPEED_SLOW, /**< catch up speed is slow */
   ESPLUSPLAYER_CATCH_UP_SPEED_MID,  /**< catch up speed is normal */
   ESPLUSPLAYER_CATCH_UP_SPEED_FAST  /**< catch up speed is fast */
-}esplusplayer_catch_up_speed;
+} esplusplayer_catch_up_speed;
 
 /**
  * @brief   Enumerations for esplusplayer latency status
@@ -48,7 +48,7 @@ typedef enum esplusplayer_latency_status {
   ESPLUSPLAYER_LATENCY_LOW, /**< latency status is low */
   ESPLUSPLAYER_LATENCY_MID, /**< latency status is middle */
   ESPLUSPLAYER_LATENCY_HIGH /**< latency status is high */
-}esplusplayer_latency_status;
+} esplusplayer_latency_status;
 
 #ifdef __cplusplus
 }  // extern "C"
index f87b89fd4697c4edd44eb924f5f998ad0970ab6c..ad3fdbfc2bee49ee2aeeac9ca7ab4eccbd49fb70 100755 (executable)
@@ -41,9 +41,9 @@ typedef enum esplusplayer_state {
                                stopped*/
   ESPLUSPLAYER_STATE_READY, /**<Player is ready to play(start)*/
   ESPLUSPLAYER_STATE_PLAYING, /**<Player is playing media*/
-  ESPLUSPLAYER_STATE_PAUSED,    /**<Player is playing media*/
+  ESPLUSPLAYER_STATE_PAUSED,  /**<Player is playing media*/
   ESPLUSPLAYER_STATE_MAX
-}esplusplayer_state;
+} esplusplayer_state;
 
 #ifdef __cplusplus
 }  // extern "C"
index c125c6fe23057a3838993b9bc7a78ec455c603de..c261b9eac0edbdf9e896d0dc6aba6a7221078b41 100755 (executable)
@@ -41,7 +41,7 @@ typedef enum esplusplayer_stream_type {
   ESPLUSPLAYER_STREAM_TYPE_AUDIO,
   ESPLUSPLAYER_STREAM_TYPE_VIDEO,
   ESPLUSPLAYER_STREAM_TYPE_MAX
-}esplusplayer_stream_type;
+} esplusplayer_stream_type;
 
 /**
  * @brief   Enumerations for audio mime type
@@ -72,7 +72,7 @@ typedef enum esplusplayer_audio_mime_type {
   ESPLUSPLAYER_AUDIO_MIME_TYPE_AC4,
   ESPLUSPLAYER_AUDIO_MIME_TYPE_MPEGH,
   ESPLUSPLAYER_AUDIO_MIME_TYPE_FLAC
-}esplusplayer_audio_mime_type;
+} esplusplayer_audio_mime_type;
 
 /**
  * @brief   Enumerations for video mime type
@@ -92,7 +92,7 @@ typedef enum esplusplayer_video_mime_type {
   ESPLUSPLAYER_VIDEO_MIME_TYPE_WMV3,
   ESPLUSPLAYER_VIDEO_MIME_TYPE_AV1,
   ESPLUSPLAYER_VIDEO_MIME_TYPE_MJPEG
-}esplusplayer_video_mime_type;
+} esplusplayer_video_mime_type;
 
 /**
  * @brief   Audio stream information structure
index f1bf64c9ceab4c0a0641abd1ee73cbaaa8d6f407..454edb7ac3fbf561215e3fde29669ce559f75729 100755 (executable)
@@ -39,7 +39,7 @@ typedef enum esplusplayer_submit_data_type {
   ESPLUSPLAYER_SUBMIT_DATA_TYPE_CLEAN_DATA,
   ESPLUSPLAYER_SUBMIT_DATA_TYPE_ENCRYPTED_DATA,
   ESPLUSPLAYER_SUBMIT_DATA_TYPE_TRUSTZONE_DATA,
-}esplusplayer_submit_data_type;
+} esplusplayer_submit_data_type;
 
 #ifdef __cplusplus
 }  // extern "C"
index e38c00cff7070b77eaf43b978ca49d5655fb1cab..3fd4c5998ca94b156592f4b38341cb7889efb904 100755 (executable)
@@ -41,7 +41,7 @@ typedef enum esplusplayer_submit_status {
   ESPLUSPLAYER_SUBMIT_STATUS_OUT_OF_MEMORY,
   ESPLUSPLAYER_SUBMIT_STATUS_FULL,
   ESPLUSPLAYER_SUBMIT_STATUS_SUCCESS
-}esplusplayer_submit_status;
+} esplusplayer_submit_status;
 
 #ifdef __cplusplus
 }  // extern "C"
index 539ce7f5698084f935272edec62f3dec17c2459f..ac88f84e65cf3a18d122daad2c4f813dc4bb0f78 100755 (executable)
@@ -45,7 +45,7 @@ typedef enum mixer_display_mode {
   MIXER_DISPLAY_MODE_CROPPED_FULL,
   MIXER_DISPLAY_MODE_ORIGIN_OR_LETTER,
   MIXER_DISPLAY_MODE_DST_ROI
-}mixer_display_mode;
+} mixer_display_mode;
 
 /**
  * @brief  Enumerations for the display type
@@ -53,7 +53,7 @@ typedef enum mixer_display_mode {
 typedef enum mixer_display_type {
   MIXER_DISPLAY_TYPE_NONE,
   MIXER_DISPLAY_TYPE_OVERLAY,
-}mixer_display_type;
+} mixer_display_type;
 
 #ifdef __cplusplus
 }  // extern "C"
index 8f39a452e88d18d6c4cf1d502b1f5a910480b276..ad85c5ae543d6c0f5d7786e25abe63b3010064b8 100755 (executable)
@@ -42,9 +42,11 @@ extern "C" {
  */
 typedef enum mixer_error_type {
   MIXER_ERROR_TYPE_NONE = TIZEN_ERROR_NONE, /**< Successful */
-  MIXER_ERROR_TYPE_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid parameter */
-  MIXER_ERROR_TYPE_INVALID_OPERATION = TIZEN_ERROR_INVALID_OPERATION, /**< Invalid operation */
-}mixer_error_type;
+  MIXER_ERROR_TYPE_INVALID_PARAMETER =
+      TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid parameter */
+  MIXER_ERROR_TYPE_INVALID_OPERATION =
+      TIZEN_ERROR_INVALID_OPERATION, /**< Invalid operation */
+} mixer_error_type;
 
 #ifdef __cplusplus
 }  // extern "C"
index fd5b913578b8f3a9a152c035607d774ffa3522a4..10796d23b0ee366650042a22f9b83c17594e80da 100755 (executable)
@@ -28,8 +28,8 @@
 #ifndef __ESPLUSPLAYER_MIXER_CAPI_MIXER_CAPI_H__
 #define __ESPLUSPLAYER_MIXER_CAPI_MIXER_CAPI_H__
 
-#include "mixer_capi/error.h"
 #include "mixer_capi/display.h"
+#include "mixer_capi/error.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -48,8 +48,9 @@ typedef void* mixer_ticket_h;
 typedef enum mixer_rsc_alloc_mode {
   MIXER_RSC_ALLOC_MODE_DEFAULT,  /**< Main -> Sub -> S/W */
   MIXER_RSC_ALLOC_MODE_NDECODER, /**< Only N decoder */
-  MIXER_RSC_ALLOC_MODE_DISABLE /**< Mixer is NOT involved in resource allocation */
-}mixer_rsc_alloc_mode;
+  MIXER_RSC_ALLOC_MODE_DISABLE /**< Mixer is NOT involved in resource allocation
+                                */
+} mixer_rsc_alloc_mode;
 
 /**
  * @brief     Create a mixer handle
@@ -168,13 +169,13 @@ int mixer_set_display_mode(mixer_handle handle, mixer_display_mode mode);
  * @code
       // The ROI of mixer means display area in tv screen.
       // The ROI of each player means display area in mixer's ROI.
-      
-      mixer_set_display_mode(mixer, MIXER_DISPLAY_MODE_DST_ROI);      
+
+      mixer_set_display_mode(mixer, MIXER_DISPLAY_MODE_DST_ROI);
       mixer_set_display_roi(mixer, 0, 0, 1920, 1080);
 
-      esplusplayer_set_display_roi(player1, 20, 20, 700, 400);      
+      esplusplayer_set_display_roi(player1, 20, 20, 700, 400);
       esplusplayer_set_display_roi(player2, 20, 20, 700, 400);
-      
+
       mixer_commit(mixer);
  * @endcode
  * @pre       Before set display ROI, #MIXER_DISPLAY_MODE_DST_ROI must be set
@@ -189,30 +190,30 @@ int mixer_set_display_mode(mixer_handle handle, mixer_display_mode mode);
 int mixer_set_display_roi(mixer_handle handle, const int x, const int y,
                           const int width, const int height);
 
- /**
 * @brief     Applies geometry changes on mixed frame
 * @param     [in] handle : Mixer handle
 * @return    @c one of mixer_error_type values will be returned
 * @pre       set display roi api was called for players which are connected to
 *            Mixer.
 * @post      All the geometry changes will be applied to mixed frame.
 * @exception   None
 * @see       mixer_set_display_roi()
 */
- int mixer_commit(mixer_handle handle);
-
- /**
 * @brief     Set Resource allocation policy
 * @param     [in] handle : Mixer handle
 * @param     [in] mode : Resource allocation policy
 * @return    @c one of mixer_error_type values will be returned
 * @pre       This api should be called before setting player's display type to
 *            mixer type.
 * @post      None
 * @exception None
 */
- int mixer_set_rsc_alloc_mode(mixer_handle handle,
-                              const mixer_rsc_alloc_mode mode);
+/**
+ * @brief     Applies geometry changes on mixed frame
+ * @param     [in] handle : Mixer handle
+ * @return    @c one of mixer_error_type values will be returned
+ * @pre       set display roi api was called for players which are connected to
+ *            Mixer.
+ * @post      All the geometry changes will be applied to mixed frame.
+ * @exception   None
+ * @see       mixer_set_display_roi()
+ */
+int mixer_commit(mixer_handle handle);
+
+/**
+ * @brief     Set Resource allocation policy
+ * @param     [in] handle : Mixer handle
+ * @param     [in] mode : Resource allocation policy
+ * @return    @c one of mixer_error_type values will be returned
+ * @pre       This api should be called before setting player's display type to
+ *            mixer type.
+ * @post      None
+ * @exception None
+ */
+int mixer_set_rsc_alloc_mode(mixer_handle handle,
+                             const mixer_rsc_alloc_mode mode);
 
 /**
  * @brief     Disable audio focus setting.
@@ -302,4 +303,3 @@ int mixer_set_resource_conflicted_cb(
 #endif
 
 #endif  // __ESPLUSPLAYER_MIXER_CAPI_MIXER_CAPI_H__
-