Merge "[ACR-1448] add api to set audio codec type" into tizen accepted/tizen_5.5_unified_mobile_hotfix tizen_5.5_mobile_hotfix accepted/tizen/5.5/unified/20191031.025642 accepted/tizen/5.5/unified/mobile/hotfix/20201027.064037 accepted/tizen/unified/20190923.110322 submit/tizen/20190920.072750 submit/tizen_5.5/20191031.000002 submit/tizen_5.5_mobile_hotfix/20201026.185102 tizen_5.5.m2_release
authoreunhae choi <eunhae1.choi@samsung.com>
Fri, 20 Sep 2019 07:26:47 +0000 (07:26 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 20 Sep 2019 07:26:47 +0000 (07:26 +0000)
1  2 
include/player.h

index c7e82e925b70c8ffea49eaa5af7a958592791bdc,55fd7401ee75ef0afaf22bb26d774b2738285330..df2021350fe50363553da0cd5bffe1975d2c9e64
@@@ -154,12 -155,21 +155,21 @@@ typedef enum 
   * @see player_set_media_packet_audio_frame_decoded_cb()
   */
  typedef enum {
 -      PLAYER_AUDIO_EXTRACT_DEFAULT                        = 0x00,   /**< Sync with the playback clock and multichannel audio stream */
 -      PLAYER_AUDIO_EXTRACT_NO_SYNC_WITH_CLOCK             = 0x01,   /**< No sync with the playback clock */
 -      PLAYER_AUDIO_EXTRACT_DEINTERLEAVE                   = 0x02,   /**< Splits one interleaved multichannel audio stream into many mono audio streams */
 -      PLAYER_AUDIO_EXTRACT_NO_SYNC_AND_DEINTERLEAVE       = 0x03,   /**< No sync with clock and splits into mono streams */
 +      PLAYER_AUDIO_EXTRACT_DEFAULT                        = 0x00,   /**< Synchronized multichannel audio stream with the playback clock */
 +      PLAYER_AUDIO_EXTRACT_NO_SYNC_WITH_CLOCK             = 0x01,   /**< No synchronized multichannel audio stream with the playback clock */
 +      PLAYER_AUDIO_EXTRACT_DEINTERLEAVE                   = 0x02,   /**< Synchronized mono audio stream with the playback clock */
 +      PLAYER_AUDIO_EXTRACT_NO_SYNC_AND_DEINTERLEAVE       = 0x03,   /**< No synchronized mono audio stream with playback clock */
  } player_audio_extract_option_e;
  
+ /**
+  * @brief Enumeration for codec type.
+  * @since_tizen 5.5
+  */
+ typedef enum {
+       PLAYER_CODEC_TYPE_HW,           /**< This is an optional flag for using the H/W codec */
+       PLAYER_CODEC_TYPE_SW,           /**< This is an optional flag for using the S/W codec */
+ } player_codec_type_e;
  /**
   * @}
   */
@@@ -1137,8 -1157,10 +1157,10 @@@ int player_set_media_packet_audio_frame
                player_audio_extract_option_e opt, player_media_packet_audio_decoded_cb callback, void *user_data);
  
  /**
 - * @brief Unsets the media packet audio frame decoded callback function.
 + * @brief Unsets the callback notifying the decoded audio data.
   * @since_tizen 5.5
+  * @remarks Depending on the audio codec type or by enabling audio offload,
+  *          this function could be unavailable and this will return #PLAYER_ERROR_NOT_AVAILABLE.
   * @param[in] player The handle to the media player
   * @return @c 0 on success,
   *         otherwise a negative error value