Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:23:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "BtAudio: Fix default implementation typos" am: d6304f24bd

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

Change-Id: Iab0a56d16a1f2845948c70ab7b9ad54390c08b56
This commit is contained in:
Treehugger Robot
2022-01-21 19:17:09 +00:00
committed by Automerger Merge Worker
parent 28e51040cc d6304f24bd
commit a45f6e3083
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bluetooth/audio/aidl/default/A2dpSoftwareAudioProvider.cpp
View File

@@ -88,8 +88,9 @@ ndk::ScopedAStatus A2dpSoftwareAudioProvider::onSessionReady(
return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
}
*_aidl_return = data_mq_->dupeDesc();
auto desc = data_mq_->dupeDesc();
BluetoothAudioSessionReport::OnSessionStarted(session_type_, stack_iface_,
_aidl_return, *audio_config_);
&desc, *audio_config_);
return ndk::ScopedAStatus::ok();
}

2
bluetooth/audio/aidl/default/BluetoothAudioProviderFactory.cpp
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
#define LOG_TAG "BTAudioProvidersFactory"
#define LOG_TAG "BTAudioProviderFactoryAIDL"
#include "BluetoothAudioProviderFactory.h"

7
bluetooth/audio/aidl/default/BluetoothAudioProviderFactory.h
View File

@@ -18,13 +18,6 @@
#include <aidl/android/hardware/bluetooth/audio/BnBluetoothAudioProviderFactory.h>
#include "A2dpOffloadAudioProvider.h"
#include "A2dpSoftwareAudioProvider.h"
#include "BluetoothAudioProvider.h"
#include "HearingAidAudioProvider.h"
#include "LeAudioOffloadAudioProvider.h"
#include "LeAudioSoftwareAudioProvider.h"
namespace aidl {
namespace android {
namespace hardware {

2
bluetooth/audio/aidl/default/HearingAidAudioProvider.cpp
View File

@@ -81,10 +81,10 @@ ndk::ScopedAStatus HearingAidAudioProvider::onSessionReady(
*_aidl_return = DataMQDesc();
return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
}
*_aidl_return = data_mq_->dupeDesc();
auto desc = data_mq_->dupeDesc();
BluetoothAudioSessionReport::OnSessionStarted(session_type_, stack_iface_,
&desc, *audio_config_);
*_aidl_return = data_mq_->dupeDesc();
return ndk::ScopedAStatus::ok();
}

2
bluetooth/audio/aidl/default/LeAudioOffloadAudioProvider.cpp
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
#define LOG_TAG "BTAudioProviderLeAudioSW"
#define LOG_TAG "BTAudioProviderLeAudioHW"
#include "LeAudioOffloadAudioProvider.h"

15
bluetooth/audio/aidl/default/LeAudioSoftwareAudioProvider.cpp
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
#define LOG_TAG "BTAudioProviderLeAudioHW"
#define LOG_TAG "BTAudioProviderLeAudioSW"
#include "LeAudioSoftwareAudioProvider.h"
@@ -88,6 +88,16 @@ ndk::ScopedAStatus LeAudioSoftwareAudioProvider::startSession(
channel_mode_to_channel_count(pcm_config.channelMode) *
(pcm_config.bitsPerSample / 8) * (pcm_config.dataIntervalUs / 1000) *
buffer_modifier;
if (data_mq_size <= 0) {
LOG(ERROR) << __func__ << "Unexpected audio buffer size: " << data_mq_size
<< ", SampleRateHz: " << pcm_config.sampleRateHz
<< ", ChannelMode: " << toString(pcm_config.channelMode)
<< ", BitsPerSample: "
<< static_cast<int>(pcm_config.bitsPerSample)
<< ", DataIntervalUs: " << pcm_config.dataIntervalUs
<< ", SessionType: " << toString(session_type_);
return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
}
LOG(INFO) << __func__ << " - size of audio buffer " << data_mq_size
<< " byte(s)";
@@ -113,8 +123,9 @@ ndk::ScopedAStatus LeAudioSoftwareAudioProvider::onSessionReady(
return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
}
*_aidl_return = data_mq_->dupeDesc();
auto desc = data_mq_->dupeDesc();
BluetoothAudioSessionReport::OnSessionStarted(session_type_, stack_iface_,
_aidl_return, *audio_config_);
&desc, *audio_config_);
return ndk::ScopedAStatus::ok();
}

5
bluetooth/audio/utils/aidl_session/BluetoothAudioSession.cpp
View File

@@ -114,11 +114,6 @@ void BluetoothAudioSession::OnSessionEnded() {
const AudioConfiguration& BluetoothAudioSession::GetAudioConfig() {
std::lock_guard<std::recursive_mutex> guard(mutex_);
if (!IsSessionReady()) {
if (session_type_ == SessionType::A2DP_HARDWARE_OFFLOAD_ENCODING_DATAPATH) {
return invalidOffloadAudioConfiguration;
} else {
return invalidSoftwareAudioConfiguration;
}
switch (session_type_) {
case SessionType::A2DP_HARDWARE_OFFLOAD_ENCODING_DATAPATH:
return invalidOffloadAudioConfiguration;