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

Merge "[hardware][interfaces][bluetooth] fix -Wreorder-init-list" am: b6fd785ec5 am: 718ac65543

Browse Source 
am: 91b41dde17

Change-Id: I3e7d7d0dcfe409c0dcd838c76bbffd7e6783c20f
This commit is contained in:
Nick Desaulniers
2019-10-15 11:57:05 -07:00
committed by android-build-merger
parent 870cb2c450 91b41dde17
commit f308ee4d88
2 changed files with 6 additions and 3 deletions
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 = {}},