commit 9c5d5e2347a2e5a00b0dcceacab06fd5bdcc1ad2
author Pavlin Radoslavov <pavlin@google.com> Tue Jan 31 19:17:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 31 19:17:24 2017 +0000
tree d854cb7f252cfb7d494ed8ed214dbd90f3dcc80e
parent b3f85b06bc87e53bf76309af417777605a5c0a65
parent 28124d43841fd6b16997fd8341afa9f6c72578c7

Merge "Update the A2DP Codec Config API" am: 451a32cb56 am: 6c3ad4427f
am: 28124d4384

Change-Id: I8912291f2ae40c4cf654cbf2cc1ff53fe2908c29

include/hardware/bt_av.h

diff --git a/include/hardware/bt_av.h b/include/hardware/bt_av.h
index 536badf..66a8643 100644
--- a/include/hardware/bt_av.h
+++ b/include/hardware/bt_av.h
@@ -68,7 +68,10 @@
   BTAV_A2DP_CODEC_INDEX_MAX = BTAV_A2DP_CODEC_INDEX_SINK_MAX
 } btav_a2dp_codec_index_t;
 
-typedef uint32_t btav_a2dp_codec_priority_t;
+typedef enum {
+  BTAV_A2DP_CODEC_PRIORITY_DEFAULT = 0,
+  BTAV_A2DP_CODEC_PRIORITY_HIGHEST = 1000 * 1000
+} btav_a2dp_codec_priority_t;
 
 typedef enum {
   BTAV_A2DP_CODEC_SAMPLE_RATE_NONE   = 0x0,
@@ -132,7 +135,8 @@
  */
 typedef void (* btav_audio_source_config_callback)(
     btav_a2dp_codec_config_t codec_config,
-    std::vector<btav_a2dp_codec_config_t> codec_capabilities);
+    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.