Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-01-27 18:59:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move APTX_ADAPTIVE_LE and APTX_ADAPTVIE_LEX to configurable

Browse Source 
We should bring the capabilities from the configure file that the device
could have its own capabilties.

Bug: 302173270
Test: atest VtsHalBluetoothAudioTargetTest
Change-Id: I2cb5194acbe64d7d64cca9b245b26ca5fbac35d4
This commit is contained in:
Alice Kuo
2023-10-04 04:02:24 +08:00
parent 4e3c5aca14
commit f850de6732
6 changed files with 40 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
bluetooth/audio/utils/aidl_session/BluetoothAudioCodecs.cpp
View File

@@ -20,8 +20,6 @@
#include <aidl/android/hardware/bluetooth/audio/AacCapabilities.h>
#include <aidl/android/hardware/bluetooth/audio/AacObjectType.h>
#include <aidl/android/hardware/bluetooth/audio/AptxAdaptiveLeCapabilities.h>
#include <aidl/android/hardware/bluetooth/audio/AptxAdaptiveLeConfiguration.h>
#include <aidl/android/hardware/bluetooth/audio/AptxCapabilities.h>
#include <aidl/android/hardware/bluetooth/audio/ChannelMode.h>
#include <aidl/android/hardware/bluetooth/audio/LdacCapabilities.h>
@@ -100,55 +98,6 @@ const std::vector<CodecCapabilities> kDefaultOffloadA2dpCodecCapabilities = {
std::vector<LeAudioCodecCapabilitiesSetting> kDefaultOffloadLeAudioCapabilities;
static const UnicastCapability kInvalidUnicastCapability = {
.codecType = CodecType::UNKNOWN};
static const AptxAdaptiveLeCapabilities
kDefaultOffloadAptxAdaptiveLeCapability_48k = {
.samplingFrequencyHz = {48000},
.frameDurationUs = {10000},
.octetsPerFrame = {816}};
static const AptxAdaptiveLeCapabilities
kDefaultOffloadAptxAdaptiveLeCapability_96k = {
.samplingFrequencyHz = {96000},
.frameDurationUs = {10000},
.octetsPerFrame = {816}};
static const AptxAdaptiveLeCapabilities
kDefaultOffloadAptxAdaptiveLeXCapability_48k = {
.samplingFrequencyHz = {48000},
.frameDurationUs = {10000},
.octetsPerFrame = {816}};
static const AptxAdaptiveLeCapabilities
kDefaultOffloadAptxAdaptiveLeXCapability_96k = {
.samplingFrequencyHz = {96000},
.frameDurationUs = {10000},
.octetsPerFrame = {816}};
static const BroadcastCapability kInvalidBroadcastCapability = {
.codecType = CodecType::UNKNOWN};
static AudioLocation stereoAudio = static_cast<AudioLocation>(
static_cast<uint8_t>(AudioLocation::FRONT_LEFT) |
static_cast<uint8_t>(AudioLocation::FRONT_RIGHT));
static const std::vector<AptxAdaptiveLeCapabilities>
supportedAptxAdaptiveLeCapabilityList = {
kDefaultOffloadAptxAdaptiveLeCapability_48k,
kDefaultOffloadAptxAdaptiveLeCapability_96k,
kDefaultOffloadAptxAdaptiveLeXCapability_48k,
kDefaultOffloadAptxAdaptiveLeXCapability_96k};
// Stores the supported setting of audio location, connected device, and the
// channel count for each device
std::vector<std::tuple<AudioLocation, uint8_t, uint8_t>>
supportedDeviceSetting = {
// Stereo, one connected device for both L and R
std::make_tuple(stereoAudio, 1, 2),
};
template <class T>
bool BluetoothAudioCodecs::ContainedInVector(
const std::vector<T>& vector, const typename identity<T>::type& target) {
@@ -458,32 +407,6 @@ BluetoothAudioCodecs::GetLeAudioOffloadCodecCapabilities(
kDefaultOffloadLeAudioCapabilities =
BluetoothLeAudioCodecsProvider::GetLeAudioCodecCapabilities(
le_audio_offload_setting);
for (auto [audioLocation, deviceCnt, channelCount] :
supportedDeviceSetting) {
for (auto capability : supportedAptxAdaptiveLeCapabilityList) {
for (auto codec_type :
{CodecType::APTX_ADAPTIVE_LE, CodecType::APTX_ADAPTIVE_LEX}) {
if (session_type ==
SessionType::LE_AUDIO_HARDWARE_OFFLOAD_ENCODING_DATAPATH) {
UnicastCapability aptx_adaptive_le_cap = {
.codecType = codec_type,
.supportedChannel = audioLocation,
.deviceCount = deviceCnt,
.channelCountPerDevice = channelCount,
.leAudioCodecCapabilities =
UnicastCapability::LeAudioCodecCapabilities(capability),
};
// Adds the capability for encode only
kDefaultOffloadLeAudioCapabilities.push_back(
{.unicastEncodeCapability = aptx_adaptive_le_cap,
.unicastDecodeCapability = kInvalidUnicastCapability,
.broadcastCapability = kInvalidBroadcastCapability});
}
}
}
}
}
return kDefaultOffloadLeAudioCapabilities;
}