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

Commit 65181582 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "SpatialAudio: Export LatencyMode functions to BluetoothAudioSession"... 

Merge "SpatialAudio: Export LatencyMode functions to BluetoothAudioSession" am: 26423c74 am: 57d941c6 am: acebb3cc am: d5499d0e

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

Change-Id: I5abced9bc9b5ec25c784ccad0200716d9e166930
parents e2925296 d5499d0e

bluetooth/audio/aidl/default/A2dpOffloadAudioProvider.cpp

+4 −6
Original line number Diff line number Diff line
@@ -39,9 +39,7 @@ bool A2dpOffloadAudioProvider::isValid(const SessionType& session_type) { 
ndk::ScopedAStatus A2dpOffloadAudioProvider::startSession(

    const std::shared_ptr<IBluetoothAudioPort>& host_if,

    const AudioConfiguration& audio_config,

    const std::vector<LatencyMode>& latency_modes,

    DataMQDesc* _aidl_return) {

  latency_modes_ = latency_modes;

    const std::vector<LatencyMode>& latency_modes, DataMQDesc* _aidl_return) {

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

    LOG(WARNING) << __func__ << " - Invalid Audio Configuration="

                 << audio_config.toString();
@@ -62,8 +60,8 @@ ndk::ScopedAStatus A2dpOffloadAudioProvider::startSession( 
ndk::ScopedAStatus A2dpOffloadAudioProvider::onSessionReady(

    DataMQDesc* _aidl_return) {

  *_aidl_return = DataMQDesc();

  BluetoothAudioSessionReport::OnSessionStarted(session_type_, stack_iface_,

                                                nullptr, *audio_config_);

  BluetoothAudioSessionReport::OnSessionStarted(

      session_type_, stack_iface_, nullptr, *audio_config_, latency_modes_);

  return ndk::ScopedAStatus::ok();

}

bluetooth/audio/aidl/default/A2dpSoftwareAudioProvider.cpp

+4 −6
Original line number Diff line number Diff line
@@ -62,9 +62,7 @@ bool A2dpSoftwareAudioProvider::isValid(const SessionType& sessionType) { 
ndk::ScopedAStatus A2dpSoftwareAudioProvider::startSession(

    const std::shared_ptr<IBluetoothAudioPort>& host_if,

    const AudioConfiguration& audio_config,

    const std::vector<LatencyMode>& latency_modes,

    DataMQDesc* _aidl_return) {

  latency_modes_ = latency_modes;

    const std::vector<LatencyMode>& latency_modes, DataMQDesc* _aidl_return) {

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

    LOG(WARNING) << __func__ << " - Invalid Audio Configuration="

                 << audio_config.toString();
@@ -92,8 +90,8 @@ ndk::ScopedAStatus A2dpSoftwareAudioProvider::onSessionReady( 
  }

  *_aidl_return = data_mq_->dupeDesc();

  auto desc = data_mq_->dupeDesc();

  BluetoothAudioSessionReport::OnSessionStarted(session_type_, stack_iface_,

                                                &desc, *audio_config_);

  BluetoothAudioSessionReport::OnSessionStarted(

      session_type_, stack_iface_, &desc, *audio_config_, latency_modes_);

  return ndk::ScopedAStatus::ok();

}

bluetooth/audio/aidl/default/HearingAidAudioProvider.cpp

+4 −6
Original line number Diff line number Diff line
@@ -57,9 +57,7 @@ bool HearingAidAudioProvider::isValid(const SessionType& sessionType) { 
ndk::ScopedAStatus HearingAidAudioProvider::startSession(

    const std::shared_ptr<IBluetoothAudioPort>& host_if,

    const AudioConfiguration& audio_config,

    const std::vector<LatencyMode>& latency_modes,

    DataMQDesc* _aidl_return) {

  latency_modes_ = latency_modes;

    const std::vector<LatencyMode>& latency_modes, DataMQDesc* _aidl_return) {

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

    LOG(WARNING) << __func__ << " - Invalid Audio Configuration="

                 << audio_config.toString();
@@ -86,8 +84,8 @@ ndk::ScopedAStatus HearingAidAudioProvider::onSessionReady( 
  }

  *_aidl_return = data_mq_->dupeDesc();

  auto desc = data_mq_->dupeDesc();

  BluetoothAudioSessionReport::OnSessionStarted(session_type_, stack_iface_,

                                                &desc, *audio_config_);

  BluetoothAudioSessionReport::OnSessionStarted(

      session_type_, stack_iface_, &desc, *audio_config_, latency_modes_);

  return ndk::ScopedAStatus::ok();

}

bluetooth/audio/aidl/default/LeAudioOffloadAudioProvider.cpp

+4 −6
Original line number Diff line number Diff line
@@ -54,9 +54,7 @@ bool LeAudioOffloadAudioProvider::isValid(const SessionType& sessionType) { 
ndk::ScopedAStatus LeAudioOffloadAudioProvider::startSession(

    const std::shared_ptr<IBluetoothAudioPort>& host_if,

    const AudioConfiguration& audio_config,

    const std::vector<LatencyMode>& latency_modes,

    DataMQDesc* _aidl_return) {

  latency_modes_ = latency_modes;

    const std::vector<LatencyMode>& latency_modes, DataMQDesc* _aidl_return) {

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

    LOG(WARNING) << __func__ << " - Invalid Audio Configuration="

                 << audio_config.toString();
@@ -79,8 +77,8 @@ ndk::ScopedAStatus LeAudioOffloadAudioProvider::startSession( 


ndk::ScopedAStatus LeAudioOffloadAudioProvider::onSessionReady(

    DataMQDesc* _aidl_return) {

  BluetoothAudioSessionReport::OnSessionStarted(session_type_, stack_iface_,

                                                nullptr, *audio_config_);

  BluetoothAudioSessionReport::OnSessionStarted(

      session_type_, stack_iface_, nullptr, *audio_config_, latency_modes_);

  *_aidl_return = DataMQDesc();

  return ndk::ScopedAStatus::ok();

}

bluetooth/audio/aidl/default/LeAudioSoftwareAudioProvider.cpp

+4 −6
Original line number Diff line number Diff line
@@ -70,9 +70,7 @@ bool LeAudioSoftwareAudioProvider::isValid(const SessionType& sessionType) { 
ndk::ScopedAStatus LeAudioSoftwareAudioProvider::startSession(

    const std::shared_ptr<IBluetoothAudioPort>& host_if,

    const AudioConfiguration& audio_config,

    const std::vector<LatencyMode>& latency_modes,

    DataMQDesc* _aidl_return) {

  latency_modes_ = latency_modes;

    const std::vector<LatencyMode>& latency_modes, DataMQDesc* _aidl_return) {

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

    LOG(WARNING) << __func__ << " - Invalid Audio Configuration="

                 << audio_config.toString();
@@ -134,8 +132,8 @@ ndk::ScopedAStatus LeAudioSoftwareAudioProvider::onSessionReady( 
  }

  *_aidl_return = data_mq_->dupeDesc();

  auto desc = data_mq_->dupeDesc();

  BluetoothAudioSessionReport::OnSessionStarted(session_type_, stack_iface_,

                                                &desc, *audio_config_);

  BluetoothAudioSessionReport::OnSessionStarted(

      session_type_, stack_iface_, &desc, *audio_config_, latency_modes_);

  return ndk::ScopedAStatus::ok();

}