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

Commit 0cd67924 authored by Silen Sun's avatar Silen Sun Committed by Automerger Merge Worker
Browse files

Merge "Report broacast audio config to HAL" into main am: 9534a2dc am: a2dbddc4 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3073926



Change-Id: Ieae124a10eaa30613f07ae0b7b0b9c005601c5cf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 25685496 a2dbddc4

bluetooth/audio/utils/aidl_session/BluetoothAudioSession.cpp

+34 −11
Original line number Diff line number Diff line
@@ -121,19 +121,42 @@ const AudioConfiguration BluetoothAudioSession::GetAudioConfig() { 


void BluetoothAudioSession::ReportAudioConfigChanged(

    const AudioConfiguration& audio_config) {

  std::lock_guard<std::recursive_mutex> guard(mutex_);

  if (com::android::btaudio::hal::flags::leaudio_report_broadcast_ac_to_hal()) {

    if (session_type_ ==

            SessionType::LE_AUDIO_HARDWARE_OFFLOAD_ENCODING_DATAPATH ||

        session_type_ ==

            SessionType::LE_AUDIO_HARDWARE_OFFLOAD_DECODING_DATAPATH) {

      if (audio_config.getTag() != AudioConfiguration::leAudioConfig) {

        LOG(ERROR) << __func__ << " invalid audio config type for SessionType ="

                  << toString(session_type_);

        return;

      }

    } else if (session_type_ ==

            SessionType::LE_AUDIO_BROADCAST_HARDWARE_OFFLOAD_ENCODING_DATAPATH) {

      if (audio_config.getTag() != AudioConfiguration::leAudioBroadcastConfig) {

        LOG(ERROR) << __func__ << " invalid audio config type for SessionType ="

                  << toString(session_type_);

        return;

      }

    } else {

      LOG(ERROR) << __func__ << " invalid SessionType ="

                 << toString(session_type_);

      return;

    }

  } else {

    if (session_type_ !=

            SessionType::LE_AUDIO_HARDWARE_OFFLOAD_ENCODING_DATAPATH &&

        session_type_ !=

            SessionType::LE_AUDIO_HARDWARE_OFFLOAD_DECODING_DATAPATH) {

      return;

    }



  std::lock_guard<std::recursive_mutex> guard(mutex_);

    if (audio_config.getTag() != AudioConfiguration::leAudioConfig) {

      LOG(ERROR) << __func__ << " invalid audio config type for SessionType ="

                 << toString(session_type_);

      return;

    }

  }



  audio_config_ = std::make_unique<AudioConfiguration>(audio_config);