From 2461891a1c7cc29352e82cb6fd1f23587422aa28 Mon Sep 17 00:00:00 2001 From: Shunkai Yao Date: Fri, 18 Aug 2023 23:58:05 +0000 Subject: [PATCH] Remove the limitation of max open streams Bug: 295055755 Test: atest CtsMediaAudioTestCases Change-Id: Ifc0bec23ccc2845657389783194eb18fcc7884fa --- audio/aidl/default/Configuration.cpp | 4 ++-- audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/audio/aidl/default/Configuration.cpp b/audio/aidl/default/Configuration.cpp index 8e02e7dfa7..9131935f87 100644 --- a/audio/aidl/default/Configuration.cpp +++ b/audio/aidl/default/Configuration.cpp @@ -230,14 +230,14 @@ std::unique_ptr 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}, diff --git a/audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp b/audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp index 03ebd61e7c..94b33d3830 100644 --- a/audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp +++ b/audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp @@ -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; }