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

Merge "Update supported sampling frequencies for LC3 codec"

Browse Source
This commit is contained in:
Treehugger Robot
2021-01-14 17:44:45 +00:00
committed by Gerrit Code Review
parent b3b0b11de3 103d790df8
commit 05f6611663
3 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
bluetooth/audio/2.1/default/LeAudioAudioProvider.cpp
View File

@@ -91,35 +91,30 @@ Return<void> LeAudioAudioProvider::startSession_2_1(
uint32_t kDataMqSize = 0;
switch (audioConfig.pcmConfig().sampleRate) {
case SampleRate::RATE_8000:
kDataMqSize = 8000;
break;
case SampleRate::RATE_16000:
kDataMqSize = 16000;
break;
case SampleRate::RATE_24000:
kDataMqSize = 24000;
break;
case SampleRate::RATE_32000:
kDataMqSize = 32000;
break;
case SampleRate::RATE_44100:
kDataMqSize = 44100;
break;
case SampleRate::RATE_48000:
kDataMqSize = 48000;
break;
case SampleRate::RATE_88200:
kDataMqSize = 88200;
break;
case SampleRate::RATE_96000:
kDataMqSize = 96000;
break;
case SampleRate::RATE_176400:
kDataMqSize = 176400;
break;
case SampleRate::RATE_192000:
kDataMqSize = 192000;
break;
default:
/* This should never happen it would be caught while validating
* parameters.
*/
break;
LOG(WARNING) << __func__ << " - Unsupported sampling frequency="
<< toString(audioConfig.pcmConfig());
_hidl_cb(BluetoothAudioStatus::UNSUPPORTED_CODEC_CONFIGURATION,
DataMQ::Descriptor());
return Void();
}
/* Number of samples per millisecond */

10
bluetooth/audio/2.1/default/session/BluetoothAudioSupportedCodecsDB.cpp
View File

@@ -409,12 +409,14 @@ bool IsSoftwarePcmConfigurationValid(
}
bool IsSoftwarePcmConfigurationValid_2_1(const PcmParameters& pcm_config) {
if ((pcm_config.sampleRate != SampleRate::RATE_44100 &&
pcm_config.sampleRate != SampleRate::RATE_48000 &&
if ((pcm_config.sampleRate != SampleRate::RATE_96000 &&
pcm_config.sampleRate != SampleRate::RATE_88200 &&
pcm_config.sampleRate != SampleRate::RATE_96000 &&
pcm_config.sampleRate != SampleRate::RATE_48000 &&
pcm_config.sampleRate != SampleRate::RATE_44100 &&
pcm_config.sampleRate != SampleRate::RATE_32000 &&
pcm_config.sampleRate != SampleRate::RATE_24000 &&
pcm_config.sampleRate != SampleRate::RATE_16000 &&
pcm_config.sampleRate != SampleRate::RATE_24000) ||
pcm_config.sampleRate != SampleRate::RATE_8000) ||
(pcm_config.bitsPerSample != BitsPerSample::BITS_16 &&
pcm_config.bitsPerSample != BitsPerSample::BITS_24 &&
pcm_config.bitsPerSample != BitsPerSample::BITS_32) ||

12
bluetooth/audio/2.1/vts/functional/VtsHalBluetoothAudioV2_1TargetTest.cpp
View File

@@ -1005,8 +1005,10 @@ class BluetoothAudioProviderLeAudioOutputSoftwareHidlTest
BluetoothAudioProvidersFactoryHidlTest::TearDown();
}
static constexpr SampleRate le_audio_output_sample_rates_[3] = {
SampleRate::RATE_UNKNOWN, SampleRate::RATE_16000, SampleRate::RATE_24000};
static constexpr SampleRate le_audio_output_sample_rates_[11] = {
SampleRate::RATE_UNKNOWN, SampleRate::RATE_8000, SampleRate::RATE_16000,
SampleRate::RATE_24000, SampleRate::RATE_32000, SampleRate::RATE_44100,
SampleRate::RATE_48000};
static constexpr BitsPerSample le_audio_output_bits_per_samples_[3] = {
BitsPerSample::BITS_UNKNOWN, BitsPerSample::BITS_16,
BitsPerSample::BITS_24};
@@ -1097,8 +1099,10 @@ class BluetoothAudioProviderLeAudioInputSoftwareHidlTest
BluetoothAudioProvidersFactoryHidlTest::TearDown();
}
static constexpr SampleRate le_audio_output_sample_rates_[3] = {
SampleRate::RATE_UNKNOWN, SampleRate::RATE_16000, SampleRate::RATE_24000};
static constexpr SampleRate le_audio_output_sample_rates_[11] = {
SampleRate::RATE_UNKNOWN, SampleRate::RATE_8000, SampleRate::RATE_16000,
SampleRate::RATE_24000, SampleRate::RATE_32000, SampleRate::RATE_44100,
SampleRate::RATE_48000};
static constexpr BitsPerSample le_audio_output_bits_per_samples_[3] = {
BitsPerSample::BITS_UNKNOWN, BitsPerSample::BITS_16,
BitsPerSample::BITS_24};