diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-01-26 13:54:20 -0800 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2021-01-26 13:54:20 -0800 |
| commit | f072d1ca00fe4e68a9944d8922e09d700f326c85 (patch) | |
| tree | dd8a7d623ca33b5c0040ac4e338c2287a169fb4f /bluetooth/audio/2.1/default/session/BluetoothAudioSupportedCodecsDB.cpp | |
| parent | c1c3917a4fa8b5a2182affe9cb7085e39db656a3 (diff) | |
| parent | 36b9cdeceab74933a1dd9b0174edc37edab862dc (diff) | |
Merge SP1A.210122.003
Change-Id: I48e52b88645c81351c04f3783085751522b6e99c
Diffstat (limited to 'bluetooth/audio/2.1/default/session/BluetoothAudioSupportedCodecsDB.cpp')
| -rw-r--r-- | bluetooth/audio/2.1/default/session/BluetoothAudioSupportedCodecsDB.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bluetooth/audio/2.1/default/session/BluetoothAudioSupportedCodecsDB.cpp b/bluetooth/audio/2.1/default/session/BluetoothAudioSupportedCodecsDB.cpp index d15db49ff1..0937f441e3 100644 --- a/bluetooth/audio/2.1/default/session/BluetoothAudioSupportedCodecsDB.cpp +++ b/bluetooth/audio/2.1/default/session/BluetoothAudioSupportedCodecsDB.cpp @@ -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) || |