tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[hardware][interfaces][bluetooth] fix -Wreorder-init-list

Browse source 
C++20 will require members in a designated initializer to be in order
unlike C99.

Bug: 139945549
Test: mm
Change-Id: Ie34b4f3400439817bebd30ee0356e35a87c971e5
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
This commit is contained in:
Nick Desaulniers 2019-10-09 11:28:47 -07:00
parent 0e1efc568c
commit 0fd95b2473
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bluetooth/audio/2.0/default/session/BluetoothAudioSession.h
View file

@ -156,8 +156,9 @@ class BluetoothAudioSession {
static constexpr PcmParameters kInvalidPcmParameters = {
.sampleRate = SampleRate::RATE_UNKNOWN,
.channelMode = ChannelMode::UNKNOWN,
.bitsPerSample = BitsPerSample::BITS_UNKNOWN,
.channelMode = ChannelMode::UNKNOWN};
};
// can't be constexpr because of non-literal type
static const CodecConfiguration kInvalidCodecConfiguration;

6
bluetooth/audio/2.0/default/session/BluetoothAudioSupportedCodecsDB.cpp
View file

@ -94,16 +94,18 @@ static const LdacParameters kDefaultOffloadLdacCapability = {
static const AptxParameters kDefaultOffloadAptxCapability = {
.sampleRate = static_cast<SampleRate>(SampleRate::RATE_44100 |
SampleRate::RATE_48000),
.channelMode = ChannelMode::STEREO,
.bitsPerSample = BitsPerSample::BITS_16,
.channelMode = ChannelMode::STEREO};
};
// aptX HD: mSampleRate:(44100|48000), mBitsPerSample:(24),
// mChannelMode:(STEREO)
static const AptxParameters kDefaultOffloadAptxHdCapability = {
.sampleRate = static_cast<SampleRate>(SampleRate::RATE_44100 |
SampleRate::RATE_48000),
.channelMode = ChannelMode::STEREO,
.bitsPerSample = BitsPerSample::BITS_24,
.channelMode = ChannelMode::STEREO};
};
const std::vector<CodecCapabilities> kDefaultOffloadA2dpCodecCapabilities = {
{.codecType = CodecType::SBC, .capabilities = {}},