Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e53f30f authored by Shunkai Yao's avatar Shunkai Yao Committed by Cherrypicker Worker
Browse files

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
parent e59a6ce2

audio/aidl/default/Configuration.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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},

audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }