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

Commit fcc06a7f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I38ec098ea8e30ffe13b5f54ee77a8b0aff448023
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 773fe517 4115d8b0

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;

        }