Merge branch 'm' of git://codeaurora.org/platform/hardware/libhardware into cm-13.0

2 files changed, 14 insertions, 0 deletions

diff --git a/include/hardware/bt_av.h b/include/hardware/bt_av.h
index c2d4091..be82fbe 100644
--- a/include/hardware/bt_av.h
+++ b/include/hardware/bt_av.h
@@ -70,6 +70,13 @@ typedef void (* btav_audio_config_callback)(bt_bdaddr_t *bd_addr,
 
 typedef void (* btav_is_multicast_enabled_callback)(int state);
 
+/*
+ * Callback for audio focus request to be used only in
+ * case of A2DP Sink. This is required because we are using
+ * AudioTrack approach for audio data rendering.
+ */
+typedef void (* btav_audio_focus_request_callback)(bt_bdaddr_t *bd_addr);
+
 /** BT-AV callback structure. */
 typedef struct {
     /** set to sizeof(btav_callbacks_t) */
@@ -79,6 +86,7 @@ typedef struct {
     btav_audio_config_callback audio_config_cb;
     btav_connection_priority_callback connection_priority_cb;
     btav_is_multicast_enabled_callback multicast_state_cb;
+    btav_audio_focus_request_callback audio_focus_request_cb;
 } btav_callbacks_t;
 
 /** 
@@ -115,6 +123,9 @@ typedef struct {
 
     /** Send priority of device to stack*/
     void (*allow_connection)( int is_valid , bt_bdaddr_t *bd_addr);
+
+    /** Sends Audio Focus State. */
+    void  (*audio_focus_state)( int focus_state );
 } btav_interface_t;
 
 __END_DECLS
diff --git a/include/hardware/tv_input.h b/include/hardware/tv_input.h
index ed3fafb..456b06e 100644
--- a/include/hardware/tv_input.h
+++ b/include/hardware/tv_input.h
@@ -278,6 +278,9 @@ typedef struct buffer_producer_stream {
 
     /* OUT: Client must allocate a buffer with this format. */
     uint32_t format;
+
+    /* OUT: Client must allocate buffers based on this count. */
+    uint32_t buffer_count;
 } buffer_producer_stream_t;
 
 typedef struct tv_stream {