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

Commit 6e9d98e8 authored by Satish kumar sugasi's avatar Satish kumar sugasi Committed by android-build-merger
Browse files

Merge "Add support for a2dp offload HAL ver2.0" am: d5dc6749 am: 4ea392da 

am: d2e43d71

Change-Id: Icece435a8027c93381d8ea12699ff0168df4787a
parents 635b377a d2e43d71

system/audio_hal_interface/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ cc_library_static { 
    include_dirs: [

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system/bta/include",

        "packages/modules/Bluetooth/system/bta/sys",

        "packages/modules/Bluetooth/system/btif/include",

        "packages/modules/Bluetooth/system/stack/include",

    ],

system/audio_hal_interface/a2dp_encoding.cc

+354 −77

File changed.

Preview size limit exceeded, changes collapsed.

system/audio_hal_interface/client_interface.h

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ using ::android::hardware::bluetooth::audio::V2_0::AudioCapabilities; 
using ::android::hardware::bluetooth::audio::V2_0::AudioConfiguration;

using ::android::hardware::bluetooth::audio::V2_0::BitsPerSample;

using ::android::hardware::bluetooth::audio::V2_0::ChannelMode;

using ::android::hardware::bluetooth::audio::V2_0::CodecConfiguration;

using ::android::hardware::bluetooth::audio::V2_0::CodecType;

using ::android::hardware::bluetooth::audio::V2_0::IBluetoothAudioProvider;

using ::android::hardware::bluetooth::audio::V2_0::PcmParameters;

using ::android::hardware::bluetooth::audio::V2_0::SampleRate;

system/btif/src/btif_a2dp.cc

+17 −14
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ bool btif_a2dp_on_started(const RawAddress& peer_addr, 
          } else if (bluetooth::audio::a2dp::is_hal_2_0_enabled()) {

            bluetooth::audio::a2dp::ack_stream_started(A2DP_CTRL_ACK_SUCCESS);

            if (btif_av_get_peer_sep() == AVDT_TSEP_SNK) {

              /* Start the media task to encode the audio */

              /* Start the media task to do the SW encode audio */

              btif_a2dp_source_start_audio_req();

            }

          } else {
@@ -111,10 +111,10 @@ bool btif_a2dp_on_started(const RawAddress& peer_addr, 
  } else if (pending_start) {

    LOG_ERROR(LOG_TAG, "%s: peer %s A2DP start request failed: status = %d",

              __func__, peer_addr.ToString().c_str(), p_av_start->status);

    if (btif_av_is_a2dp_offload_enabled()) {

      btif_a2dp_audio_on_started(p_av_start->status);

    } else if (bluetooth::audio::a2dp::is_hal_2_0_enabled()) {

    if (bluetooth::audio::a2dp::is_hal_2_0_enabled()) {

      bluetooth::audio::a2dp::ack_stream_started(A2DP_CTRL_ACK_FAILURE);

    } else if (btif_av_is_a2dp_offload_enabled()) {

      btif_a2dp_audio_on_started(p_av_start->status);

    } else {

      btif_a2dp_command_ack(A2DP_CTRL_ACK_FAILURE);

    }
@@ -131,7 +131,8 @@ void btif_a2dp_on_stopped(tBTA_AV_SUSPEND* p_av_suspend) { 
    btif_a2dp_sink_on_stopped(p_av_suspend);

    return;

  }

  if (!btif_av_is_a2dp_offload_enabled()) {

  if (bluetooth::audio::a2dp::is_hal_2_0_enabled() ||

      !btif_av_is_a2dp_offload_enabled()) {

    btif_a2dp_source_on_stopped(p_av_suspend);

  } else if (p_av_suspend != NULL) {

    btif_a2dp_audio_on_stopped(p_av_suspend->status);
@@ -141,13 +142,14 @@ void btif_a2dp_on_stopped(tBTA_AV_SUSPEND* p_av_suspend) { 
void btif_a2dp_on_suspended(tBTA_AV_SUSPEND* p_av_suspend) {

  LOG_INFO(LOG_TAG, "%s: ## ON A2DP SUSPENDED ## p_av_suspend=%p", __func__,

           p_av_suspend);

  if (!btif_av_is_a2dp_offload_enabled()) {

  if (btif_av_get_peer_sep() == AVDT_TSEP_SRC) {

    btif_a2dp_sink_on_suspended(p_av_suspend);

    } else {

      btif_a2dp_source_on_suspended(p_av_suspend);

    return;

  }

  } else {

  if (bluetooth::audio::a2dp::is_hal_2_0_enabled() ||

      !btif_av_is_a2dp_offload_enabled()) {

    btif_a2dp_source_on_suspended(p_av_suspend);

  } else if (p_av_suspend != NULL) {

    btif_a2dp_audio_on_suspended(p_av_suspend->status);

  }

}
@@ -174,7 +176,6 @@ void btif_a2dp_on_offload_started(const RawAddress& peer_addr, 
      break;

  }

  if (btif_av_is_a2dp_offload_enabled()) {

    btif_a2dp_audio_on_started(status);

    if (ack != BTA_AV_SUCCESS && btif_av_stream_started_ready()) {

      // Offload request will return with failure from btif_av sm if

      // suspend is triggered for remote start. Disconnect only if SoC
@@ -183,10 +184,12 @@ void btif_a2dp_on_offload_started(const RawAddress& peer_addr, 
                peer_addr.ToString().c_str());

      btif_av_src_disconnect_sink(peer_addr);

    }

  } else if (bluetooth::audio::a2dp::is_hal_2_0_enabled()) {

  }

  if (bluetooth::audio::a2dp::is_hal_2_0_enabled()) {

    bluetooth::audio::a2dp::ack_stream_started(ack);

  } else {

    btif_a2dp_command_ack(ack);

    btif_a2dp_audio_on_started(status);

  }

}

system/btif/src/btif_a2dp_source.cc

+15 −8

File changed.

Preview size limit exceeded, changes collapsed.