Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f20739b3 authored by Henri Chataing's avatar Henri Chataing
Browse files

btif_av: Move callback declarations from hardware/bt_av.h to btif_av.h 

Bug: 331817295
Test: m com.android.btservices
Flag: EXEMPT, no logical change
Change-Id: I7eb96c5ae448949b0f4ded2cae5e6a860511d784
parent a0f0f303

system/btif/include/btif_av.h

+53 −0
Original line number Diff line number Diff line
@@ -30,6 +30,59 @@ 
#include "include/hardware/bt_av.h"

#include "types/raw_address.h"



/** Callback for connection state change.

 *  state will have one of the values from btav_connection_state_t

 */

typedef void (*btav_connection_state_callback)(const RawAddress& bd_addr,

                                               btav_connection_state_t state,

                                               const btav_error_t& error);



/** Callback for audiopath state change.

 *  state will have one of the values from btav_audio_state_t

 */

typedef void (*btav_audio_state_callback)(const RawAddress& bd_addr, btav_audio_state_t state);



/** Callback for audio configuration change.

 *  Used only for the A2DP Source interface.

 */

typedef void (*btav_audio_source_config_callback)(

        const RawAddress& bd_addr, btav_a2dp_codec_config_t codec_config,

        std::vector<btav_a2dp_codec_config_t> codecs_local_capabilities,

        std::vector<btav_a2dp_codec_config_t> codecs_selectable_capabilities);



/** Callback for audio configuration change.

 *  Used only for the A2DP Sink interface.

 *  sample_rate: sample rate in Hz

 *  channel_count: number of channels (1 for mono, 2 for stereo)

 */

typedef void (*btav_audio_sink_config_callback)(const RawAddress& bd_addr, uint32_t sample_rate,

                                                uint8_t channel_count);



/** Callback for querying whether the mandatory codec is more preferred.

 *  Used only for the A2DP Source interface.

 *  Return true if optional codecs are not preferred.

 */

typedef bool (*btav_mandatory_codec_preferred_callback)(const RawAddress& bd_addr);



/** BT-AV A2DP Source callback structure. */

typedef struct {

  /** set to sizeof(btav_source_callbacks_t) */

  size_t size;

  btav_connection_state_callback connection_state_cb;

  btav_audio_state_callback audio_state_cb;

  btav_audio_source_config_callback audio_config_cb;

  btav_mandatory_codec_preferred_callback mandatory_codec_preferred_cb;

} btav_source_callbacks_t;



/** BT-AV A2DP Sink callback structure. */

typedef struct {

  /** set to sizeof(btav_sink_callbacks_t) */

  size_t size;

  btav_connection_state_callback connection_state_cb;

  btav_audio_state_callback audio_state_cb;

  btav_audio_sink_config_callback audio_config_cb;

} btav_sink_callbacks_t;



/* Interface methods for the A2DP source stack. */



bt_status_t btif_av_source_init(btav_source_callbacks_t* callbacks, int max_connected_audio_devices,

system/include/hardware/bt_av.h

+0 −53
Original line number Diff line number Diff line
@@ -272,59 +272,6 @@ typedef struct { 
  std::optional<std::string> error_msg;

} btav_error_t;



/** Callback for connection state change.

 *  state will have one of the values from btav_connection_state_t

 */

typedef void (*btav_connection_state_callback)(const RawAddress& bd_addr,

                                               btav_connection_state_t state,

                                               const btav_error_t& error);



/** Callback for audiopath state change.

 *  state will have one of the values from btav_audio_state_t

 */

typedef void (*btav_audio_state_callback)(const RawAddress& bd_addr, btav_audio_state_t state);



/** Callback for audio configuration change.

 *  Used only for the A2DP Source interface.

 */

typedef void (*btav_audio_source_config_callback)(

        const RawAddress& bd_addr, btav_a2dp_codec_config_t codec_config,

        std::vector<btav_a2dp_codec_config_t> codecs_local_capabilities,

        std::vector<btav_a2dp_codec_config_t> codecs_selectable_capabilities);



/** Callback for audio configuration change.

 *  Used only for the A2DP Sink interface.

 *  sample_rate: sample rate in Hz

 *  channel_count: number of channels (1 for mono, 2 for stereo)

 */

typedef void (*btav_audio_sink_config_callback)(const RawAddress& bd_addr, uint32_t sample_rate,

                                                uint8_t channel_count);



/** Callback for querying whether the mandatory codec is more preferred.

 *  Used only for the A2DP Source interface.

 *  Return true if optional codecs are not preferred.

 */

typedef bool (*btav_mandatory_codec_preferred_callback)(const RawAddress& bd_addr);



/** BT-AV A2DP Source callback structure. */

typedef struct {

  /** set to sizeof(btav_source_callbacks_t) */

  size_t size;

  btav_connection_state_callback connection_state_cb;

  btav_audio_state_callback audio_state_cb;

  btav_audio_source_config_callback audio_config_cb;

  btav_mandatory_codec_preferred_callback mandatory_codec_preferred_cb;

} btav_source_callbacks_t;



/** BT-AV A2DP Sink callback structure. */

typedef struct {

  /** set to sizeof(btav_sink_callbacks_t) */

  size_t size;

  btav_connection_state_callback connection_state_cb;

  btav_audio_state_callback audio_state_cb;

  btav_audio_sink_config_callback audio_config_cb;

} btav_sink_callbacks_t;



/**

 * NOTE:

 *