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

Merge "Remove the limitation of max open streams" into main am: 4115d8b01d am: fcc06a7f6c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2719933

Change-Id: Ib5bf4303c23b8383f86a6d12a4734adf74d1be8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-08-24 19:34:23 +00:00
committed by Automerger Merge Worker
parent 755d75d5f4 fcc06a7f6c
commit bcdc82db37
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
audio/aidl/default/Configuration.cpp
View File

@@ -230,14 +230,14 @@ std::unique_ptr<Configuration> getPrimaryConfiguration() {
AudioPort primaryOutMix = createPort(c.nextPortId++, "primary output", AudioPort primaryOutMix = createPort(c.nextPortId++, "primary output",
makeBitPositionFlagMask(AudioOutputFlags::PRIMARY), makeBitPositionFlagMask(AudioOutputFlags::PRIMARY),
false, createPortMixExt(1, 1)); false, createPortMixExt(0, 0));
primaryOutMix.profiles.insert(primaryOutMix.profiles.begin(), primaryOutMix.profiles.insert(primaryOutMix.profiles.begin(),
standardPcmAudioProfiles.begin(), standardPcmAudioProfiles.begin(),
standardPcmAudioProfiles.end()); standardPcmAudioProfiles.end());
c.ports.push_back(primaryOutMix); c.ports.push_back(primaryOutMix);
AudioPort primaryInMix = AudioPort primaryInMix =
createPort(c.nextPortId++, "primary input", 0, true, createPortMixExt(1, 1)); createPort(c.nextPortId++, "primary input", 0, true, createPortMixExt(0, 0));
primaryInMix.profiles.push_back( primaryInMix.profiles.push_back(
createProfile(PcmType::INT_16_BIT, createProfile(PcmType::INT_16_BIT,
{AudioChannelLayout::LAYOUT_MONO, AudioChannelLayout::LAYOUT_STEREO}, {AudioChannelLayout::LAYOUT_MONO, AudioChannelLayout::LAYOUT_STEREO},

2
audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp
View File

@@ -1379,7 +1379,7 @@ TEST_P(AudioCoreModule, CheckMixPorts) {
<< "At least two mix ports have PRIMARY flag set: " << primaryMixPort.value() << "At least two mix ports have PRIMARY flag set: " << primaryMixPort.value()
<< " and " << port.id; << " and " << port.id;
primaryMixPort = port.id; primaryMixPort = port.id;
EXPECT_EQ(1, mixPort.maxOpenStreamCount) EXPECT_GE(mixPort.maxOpenStreamCount, 0)
<< "Primary mix port " << port.id << " can not have maxOpenStreamCount " << "Primary mix port " << port.id << " can not have maxOpenStreamCount "
<< mixPort.maxOpenStreamCount; << mixPort.maxOpenStreamCount;
} }