From b0dceae806f60d95f70ae7a4f8ec032b14a4994f Mon Sep 17 00:00:00 2001 From: Pavlin Radoslavov Date: Thu, 9 Nov 2017 19:30:58 -0800 Subject: [PATCH] Update the codec-related JNI calls to contain the remote Device address Also, normalize the order of the A2DP-related JNI callbacks to list the remote device address first. Bug: 68993365 Test: Manual - A2DP streaming to headset Change-Id: I17fc9b0c23d6a1c26c99259bf391ba0a94988dd6 --- btif/co/bta_av_co.cc | 25 ++++++++++---- btif/src/btif_av.cc | 85 ++++++++++++++++++++++++------------------------ include/hardware/bt_av.h | 10 +++--- 3 files changed, 67 insertions(+), 53 deletions(-) diff --git a/btif/co/bta_av_co.cc b/btif/co/bta_av_co.cc index 2b86bea4e..ce76c19d0 100644 --- a/btif/co/bta_av_co.cc +++ b/btif/co/bta_av_co.cc @@ -896,7 +896,8 @@ static tBTA_AV_CO_SINK* bta_av_co_audio_set_codec(tBTA_AV_CO_PEER* p_peer) { // NOTE: Unconditionally dispatch the event to make sure a callback with // the most recent codec info is generated. - btif_dispatch_sm_event(BTIF_AV_SOURCE_CONFIG_UPDATED_EVT, NULL, 0); + btif_dispatch_sm_event(BTIF_AV_SOURCE_CONFIG_UPDATED_EVT, &p_peer->addr, + sizeof(RawAddress)); return p_sink; } @@ -1146,12 +1147,20 @@ bool bta_av_co_set_codec_user_config( } done: - // NOTE: We uncoditionally send the upcall even if there is no change + // NOTE: We unconditionally send the upcall even if there is no change // or the user config failed. Thus, the caller would always know whether the // request succeeded or failed. // NOTE: Currently, the input is restarted by sending an upcall // and informing the Media Framework about the change. - btif_dispatch_sm_event(BTIF_AV_SOURCE_CONFIG_UPDATED_EVT, NULL, 0); + RawAddress empty_raw_address = RawAddress::kEmpty; + RawAddress* p_addr; + if (p_peer != nullptr) { + p_addr = &p_peer->addr; + } else { + p_addr = &empty_raw_address; + } + btif_dispatch_sm_event(BTIF_AV_SOURCE_CONFIG_UPDATED_EVT, p_addr, + sizeof(RawAddress)); return success; } @@ -1231,7 +1240,8 @@ static bool bta_av_co_set_codec_ota_config(tBTA_AV_CO_PEER* p_peer, if (restart_input || config_updated) { // NOTE: Currently, the input is restarted by sending an upcall // and informing the Media Framework about the change. - btif_dispatch_sm_event(BTIF_AV_SOURCE_CONFIG_UPDATED_EVT, NULL, 0); + btif_dispatch_sm_event(BTIF_AV_SOURCE_CONFIG_UPDATED_EVT, &p_peer->addr, + sizeof(RawAddress)); } return true; @@ -1297,7 +1307,8 @@ bool bta_av_co_set_codec_audio_config( if (config_updated) { // NOTE: Currently, the input is restarted by sending an upcall // and informing the Media Framework about the change. - btif_dispatch_sm_event(BTIF_AV_SOURCE_CONFIG_UPDATED_EVT, NULL, 0); + btif_dispatch_sm_event(BTIF_AV_SOURCE_CONFIG_UPDATED_EVT, &p_peer->addr, + sizeof(RawAddress)); } return true; @@ -1342,5 +1353,7 @@ void bta_av_co_init( // NOTE: Unconditionally dispatch the event to make sure a callback with // the most recent codec info is generated. - btif_dispatch_sm_event(BTIF_AV_SOURCE_CONFIG_UPDATED_EVT, NULL, 0); + RawAddress empty_raw_address = RawAddress::kEmpty; + btif_dispatch_sm_event(BTIF_AV_SOURCE_CONFIG_UPDATED_EVT, &empty_raw_address, + sizeof(RawAddress)); } diff --git a/btif/src/btif_av.cc b/btif/src/btif_av.cc index 4fda06c7b..ddc9b5163 100644 --- a/btif/src/btif_av.cc +++ b/btif/src/btif_av.cc @@ -253,12 +253,12 @@ static void btif_initiate_av_open_timer_timeout(UNUSED_ATTR void* data) { * Returns None * ******************************************************************************/ -static void btif_report_connection_state(btav_connection_state_t state, - RawAddress* bd_addr) { +static void btif_report_connection_state(RawAddress* bd_addr, + btav_connection_state_t state) { if (bt_av_sink_callbacks != NULL) { - HAL_CBACK(bt_av_sink_callbacks, connection_state_cb, state, bd_addr); + HAL_CBACK(bt_av_sink_callbacks, connection_state_cb, bd_addr, state); } else if (bt_av_src_callbacks != NULL) { - HAL_CBACK(bt_av_src_callbacks, connection_state_cb, state, bd_addr); + HAL_CBACK(bt_av_src_callbacks, connection_state_cb, bd_addr, state); } } @@ -275,12 +275,12 @@ static void btif_report_connection_state(btav_connection_state_t state, * Returns None * ******************************************************************************/ -static void btif_report_audio_state(btav_audio_state_t state, - RawAddress* bd_addr) { +static void btif_report_audio_state(RawAddress* bd_addr, + btav_audio_state_t state) { if (bt_av_sink_callbacks != NULL) { - HAL_CBACK(bt_av_sink_callbacks, audio_state_cb, state, bd_addr); + HAL_CBACK(bt_av_sink_callbacks, audio_state_cb, bd_addr, state); } else if (bt_av_src_callbacks != NULL) { - HAL_CBACK(bt_av_src_callbacks, audio_state_cb, state, bd_addr); + HAL_CBACK(bt_av_src_callbacks, audio_state_cb, bd_addr, state); } } @@ -294,7 +294,8 @@ static void btif_update_source_codec(void* p_data) { btif_a2dp_source_encoder_user_config_update_req(req); } -static void btif_report_source_codec_state(UNUSED_ATTR void* p_data) { +static void btif_report_source_codec_state(void* p_data) { + RawAddress* bd_addr = (RawAddress*)p_data; btav_a2dp_codec_config_t codec_config; std::vector codecs_local_capabilities; std::vector codecs_selectable_capabilities; @@ -311,7 +312,7 @@ static void btif_report_source_codec_state(UNUSED_ATTR void* p_data) { return; } if (bt_av_src_callbacks != NULL) { - HAL_CBACK(bt_av_src_callbacks, audio_config_cb, codec_config, + HAL_CBACK(bt_av_src_callbacks, audio_config_cb, bd_addr, codec_config, codecs_local_capabilities, codecs_selectable_capabilities); } } @@ -451,7 +452,7 @@ static bool btif_av_state_idle_handler(btif_sm_event_t event, void* p_data) { } /* inform the application of the event */ - btif_report_connection_state(state, &(btif_av_cb.peer_bda)); + btif_report_connection_state(&(btif_av_cb.peer_bda), state); /* change state to open/idle based on the status */ btif_sm_change_state(btif_av_cb.sm_handle, av_state); if (btif_av_cb.peer_sep == AVDT_TSEP_SNK) { @@ -515,8 +516,8 @@ static bool btif_av_state_opening_handler(btif_sm_event_t event, void* p_data) { switch (event) { case BTIF_SM_ENTER_EVT: /* inform the application that we are entering connecting state */ - btif_report_connection_state(BTAV_CONNECTION_STATE_CONNECTING, - &(btif_av_cb.peer_bda)); + btif_report_connection_state(&(btif_av_cb.peer_bda), + BTAV_CONNECTION_STATE_CONNECTING); break; case BTIF_SM_EXIT_EVT: @@ -524,8 +525,8 @@ static bool btif_av_state_opening_handler(btif_sm_event_t event, void* p_data) { case BTA_AV_REJECT_EVT: BTIF_TRACE_WARNING("%s: Received BTA_AV_REJECT_EVT", __func__); - btif_report_connection_state(BTAV_CONNECTION_STATE_DISCONNECTED, - &(btif_av_cb.peer_bda)); + btif_report_connection_state(&(btif_av_cb.peer_bda), + BTAV_CONNECTION_STATE_DISCONNECTED); btif_sm_change_state(btif_av_cb.sm_handle, BTIF_AV_STATE_IDLE); if (btif_av_cb.self_initiated_connection) { btif_queue_advance(); @@ -568,7 +569,7 @@ static bool btif_av_state_opening_handler(btif_sm_event_t event, void* p_data) { } /* inform the application of the event */ - btif_report_connection_state(state, &(btif_av_cb.peer_bda)); + btif_report_connection_state(&(btif_av_cb.peer_bda), state); /* change state to open/idle based on the status */ btif_sm_change_state(btif_av_cb.sm_handle, av_state); if (btif_av_cb.peer_sep == AVDT_TSEP_SNK) { @@ -624,8 +625,8 @@ static bool btif_av_state_opening_handler(btif_sm_event_t event, void* p_data) { "%s: device %s is already connecting, reject Connect request to %s", __func__, btif_av_cb.peer_bda.ToString().c_str(), target_bda.ToString().c_str()); - btif_report_connection_state(BTAV_CONNECTION_STATE_DISCONNECTED, - &target_bda); + btif_report_connection_state(&target_bda, + BTAV_CONNECTION_STATE_DISCONNECTED); } // Ignore all connection request if we are already opening btif_queue_advance(); @@ -658,8 +659,8 @@ static bool btif_av_state_opening_handler(btif_sm_event_t event, void* p_data) { case BTA_AV_CLOSE_EVT: btif_a2dp_on_stopped(NULL); - btif_report_connection_state(BTAV_CONNECTION_STATE_DISCONNECTED, - &(btif_av_cb.peer_bda)); + btif_report_connection_state(&(btif_av_cb.peer_bda), + BTAV_CONNECTION_STATE_DISCONNECTED); btif_sm_change_state(btif_av_cb.sm_handle, BTIF_AV_STATE_IDLE); if (btif_av_cb.self_initiated_connection) { btif_queue_advance(); @@ -667,8 +668,8 @@ static bool btif_av_state_opening_handler(btif_sm_event_t event, void* p_data) { break; case BTIF_AV_DISCONNECT_REQ_EVT: - btif_report_connection_state(BTAV_CONNECTION_STATE_DISCONNECTED, - &(btif_av_cb.peer_bda)); + btif_report_connection_state(&(btif_av_cb.peer_bda), + BTAV_CONNECTION_STATE_DISCONNECTED); BTA_AvClose(btif_av_cb.bta_handle); btif_sm_change_state(btif_av_cb.sm_handle, BTIF_AV_STATE_IDLE); if (btif_av_cb.self_initiated_connection) { @@ -733,8 +734,8 @@ static bool btif_av_state_closing_handler(btif_sm_event_t event, void* p_data) { case BTA_AV_CLOSE_EVT: /* inform the application that we are disconnecting */ - btif_report_connection_state(BTAV_CONNECTION_STATE_DISCONNECTED, - &(btif_av_cb.peer_bda)); + btif_report_connection_state(&(btif_av_cb.peer_bda), + BTAV_CONNECTION_STATE_DISCONNECTED); btif_sm_change_state(btif_av_cb.sm_handle, BTIF_AV_STATE_IDLE); break; @@ -869,8 +870,8 @@ static bool btif_av_state_opened_handler(btif_sm_event_t event, void* p_data) { } /* inform the application that we are disconnecting */ - btif_report_connection_state(BTAV_CONNECTION_STATE_DISCONNECTING, - &(btif_av_cb.peer_bda)); + btif_report_connection_state(&(btif_av_cb.peer_bda), + BTAV_CONNECTION_STATE_DISCONNECTING); break; case BTA_AV_CLOSE_EVT: @@ -878,8 +879,8 @@ static bool btif_av_state_opened_handler(btif_sm_event_t event, void* p_data) { btif_a2dp_on_stopped(NULL); /* inform the application that we are disconnected */ - btif_report_connection_state(BTAV_CONNECTION_STATE_DISCONNECTED, - &(btif_av_cb.peer_bda)); + btif_report_connection_state(&(btif_av_cb.peer_bda), + BTAV_CONNECTION_STATE_DISCONNECTED); /* change state to idle, send acknowledgement if start is pending */ if (btif_av_cb.flags & BTIF_AV_FLAG_PENDING_START) { @@ -912,8 +913,8 @@ static bool btif_av_state_opened_handler(btif_sm_event_t event, void* p_data) { "%s: Moved to opened by Other incoming Connect request: " "target_bda=%s", __func__, target_bda.ToString().c_str()); - btif_report_connection_state(BTAV_CONNECTION_STATE_DISCONNECTED, - &target_bda); + btif_report_connection_state(&target_bda, + BTAV_CONNECTION_STATE_DISCONNECTED); } btif_queue_advance(); } break; @@ -963,7 +964,7 @@ static bool btif_av_state_started_handler(btif_sm_event_t event, void* p_data) { * stage, this should usually be followed by focus grant. * see update_audio_focus_state() */ - btif_report_audio_state(BTAV_AUDIO_STATE_STARTED, &(btif_av_cb.peer_bda)); + btif_report_audio_state(&(btif_av_cb.peer_bda), BTAV_AUDIO_STATE_STARTED); break; case BTIF_SM_EXIT_EVT: @@ -1024,8 +1025,8 @@ static bool btif_av_state_started_handler(btif_sm_event_t event, void* p_data) { } /* inform the application that we are disconnecting */ - btif_report_connection_state(BTAV_CONNECTION_STATE_DISCONNECTING, - &(btif_av_cb.peer_bda)); + btif_report_connection_state(&(btif_av_cb.peer_bda), + BTAV_CONNECTION_STATE_DISCONNECTING); /* wait in closing state until fully closed */ btif_sm_change_state(btif_av_cb.sm_handle, BTIF_AV_STATE_CLOSING); @@ -1059,11 +1060,11 @@ static bool btif_av_state_started_handler(btif_sm_event_t event, void* p_data) { if ((btif_av_cb.flags & BTIF_AV_FLAG_LOCAL_SUSPEND_PENDING) == 0) btif_av_cb.flags |= BTIF_AV_FLAG_REMOTE_SUSPEND; - btif_report_audio_state(BTAV_AUDIO_STATE_REMOTE_SUSPEND, - &(btif_av_cb.peer_bda)); + btif_report_audio_state(&(btif_av_cb.peer_bda), + BTAV_AUDIO_STATE_REMOTE_SUSPEND); } else { - btif_report_audio_state(BTAV_AUDIO_STATE_STOPPED, - &(btif_av_cb.peer_bda)); + btif_report_audio_state(&(btif_av_cb.peer_bda), + BTAV_AUDIO_STATE_STOPPED); } btif_sm_change_state(btif_av_cb.sm_handle, BTIF_AV_STATE_OPENED); @@ -1080,7 +1081,7 @@ static bool btif_av_state_started_handler(btif_sm_event_t event, void* p_data) { btif_av_cb.flags |= BTIF_AV_FLAG_PENDING_STOP; btif_a2dp_on_stopped(&p_av->suspend); - btif_report_audio_state(BTAV_AUDIO_STATE_STOPPED, &(btif_av_cb.peer_bda)); + btif_report_audio_state(&(btif_av_cb.peer_bda), BTAV_AUDIO_STATE_STOPPED); /* if stop was successful, change state to open */ if (p_av->suspend.status == BTA_AV_SUCCESS) @@ -1099,8 +1100,8 @@ static bool btif_av_state_started_handler(btif_sm_event_t event, void* p_data) { btif_a2dp_on_stopped(NULL); /* inform the application that we are disconnected */ - btif_report_connection_state(BTAV_CONNECTION_STATE_DISCONNECTED, - &(btif_av_cb.peer_bda)); + btif_report_connection_state(&(btif_av_cb.peer_bda), + BTAV_CONNECTION_STATE_DISCONNECTED); btif_sm_change_state(btif_av_cb.sm_handle, BTIF_AV_STATE_IDLE); break; @@ -1791,8 +1792,8 @@ void btif_av_move_idle(RawAddress bd_addr) { BTIF_TRACE_DEBUG( "%s: Moving State from Opening to Idle due to ACL disconnect", __func__); - btif_report_connection_state(BTAV_CONNECTION_STATE_DISCONNECTED, - &(btif_av_cb.peer_bda)); + btif_report_connection_state(&(btif_av_cb.peer_bda), + BTAV_CONNECTION_STATE_DISCONNECTED); btif_sm_change_state(btif_av_cb.sm_handle, BTIF_AV_STATE_IDLE); } } diff --git a/include/hardware/bt_av.h b/include/hardware/bt_av.h index 7326c10bf..873c36ad2 100644 --- a/include/hardware/bt_av.h +++ b/include/hardware/bt_av.h @@ -131,20 +131,20 @@ typedef struct { /** Callback for connection state change. * state will have one of the values from btav_connection_state_t */ -typedef void (*btav_connection_state_callback)(btav_connection_state_t state, - RawAddress* bd_addr); +typedef void (*btav_connection_state_callback)(RawAddress* bd_addr, + btav_connection_state_t state); /** Callback for audiopath state change. * state will have one of the values from btav_audio_state_t */ -typedef void (*btav_audio_state_callback)(btav_audio_state_t state, - RawAddress* bd_addr); +typedef void (*btav_audio_state_callback)(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)( - btav_a2dp_codec_config_t codec_config, + RawAddress* bd_addr, btav_a2dp_codec_config_t codec_config, std::vector codecs_local_capabilities, std::vector codecs_selectable_capabilities); -- 2.11.0