Remove the limitation of max open streams

Bug: 295055755
Test: atest CtsMediaAudioTestCases
(cherry picked from https://android-review.googlesource.com/q/commit:2461891a1c7cc29352e82cb6fd1f23587422aa28)
Merged-In: Ifc0bec23ccc2845657389783194eb18fcc7884fa
Change-Id: Ifc0bec23ccc2845657389783194eb18fcc7884fa
This commit is contained in:
Shunkai Yao 2023-08-18 23:58:05 +00:00 committed by Cherrypicker Worker
parent e59a6ce2e0
commit 2e53f30f72
2 changed files with 3 additions and 3 deletions

View file

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

View file

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