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

Commit 0ca09403 authored by Eric Laurent's avatar Eric Laurent
Browse files

audio policy: force initial audio patch after opening an output. 

Bug: 333829626
Test: make
Change-Id: I135026ff9cf0da29a233c6e81c893088eb79c270
parent 6d33f8d8

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+10 −1
Original line number Diff line number Diff line
@@ -1577,6 +1577,11 @@ status_t AudioPolicyManager::openDirectOutput(audio_stream_type_t stream, 
    outputDesc->mDirectClientSession = session;



    addOutput(*output, outputDesc);

    setOutputDevices(__func__, outputDesc,

                     devices,

                     true,

                     0,

                     NULL);

    mPreviousOutputs = mOutputs;

    ALOGV("%s returns new direct output %d", __func__, *output);

    mpClientInterface->onAudioPortListUpdate();
@@ -8589,7 +8594,11 @@ sp<SwAudioOutputDescriptor> AudioPolicyManager::openOutputWithProfileAndDevice( 
    }



    addOutput(output, desc);



    setOutputDevices(__func__, desc,

                     devices,

                     true,

                     0,

                     NULL);

    sp<DeviceDescriptor> speaker = mAvailableOutputDevices.getDevice(

            AUDIO_DEVICE_OUT_SPEAKER, String8(""), AUDIO_FORMAT_DEFAULT);

services/audiopolicy/tests/audiopolicymanager_tests.cpp

+14 −14
Original line number Diff line number Diff line
@@ -475,8 +475,8 @@ INSTANTIATE_TEST_CASE_P( 
        MsdAudioPatchCount,

        AudioPolicyManagerTestMsd,

        ::testing::Values(

                MsdAudioPatchCountSpecification(1u, "single"),

                MsdAudioPatchCountSpecification(2u, "dual")

                MsdAudioPatchCountSpecification(2u, "single"),

                MsdAudioPatchCountSpecification(3u, "dual")

        ),

        [](const ::testing::TestParamInfo<MsdAudioPatchCountSpecification> &info) {

                return std::get<MSD_AUDIO_PATCH_COUNT_NAME_INDEX>(info.param); }
@@ -503,7 +503,7 @@ void AudioPolicyManagerTestMsd::SetUpManagerConfig() { 
    mConfig->addDevice(mMsdOutputDevice);

    mConfig->addDevice(mMsdInputDevice);



    if (mExpectedAudioPatchCount == 2) {

    if (mExpectedAudioPatchCount == 3) {

        // Add SPDIF device with PCM output profile as a second device for dual MSD audio patching.

        mSpdifDevice = new DeviceDescriptor(AUDIO_DEVICE_OUT_SPDIF);

        mSpdifDevice->addAudioProfile(pcmOutputProfile);
@@ -556,7 +556,7 @@ void AudioPolicyManagerTestMsd::SetUpManagerConfig() { 
            addOutputProfile(primaryEncodedOutputProfile);



    mDefaultOutputDevice = mConfig->getDefaultOutputDevice();

    if (mExpectedAudioPatchCount == 2) {

    if (mExpectedAudioPatchCount == 3) {

        mSpdifDevice->addAudioProfile(dtsOutputProfile);

        primaryEncodedOutputProfile->addSupportedDevice(mSpdifDevice);

    }
@@ -605,7 +605,7 @@ TEST_P(AudioPolicyManagerTestMsd, PatchCreationOnSetForceUse) { 
    const PatchCountCheck patchCount = snapshotPatchCount();

    mManager->setForceUse(AUDIO_POLICY_FORCE_FOR_ENCODED_SURROUND,

            AUDIO_POLICY_FORCE_ENCODED_SURROUND_ALWAYS);

    ASSERT_EQ(mExpectedAudioPatchCount, patchCount.deltaFromSnapshot());

    ASSERT_EQ(mExpectedAudioPatchCount -1 , patchCount.deltaFromSnapshot());

}



TEST_P(AudioPolicyManagerTestMsd, PatchCreationSetReleaseMsdOutputPatches) {
@@ -613,15 +613,15 @@ TEST_P(AudioPolicyManagerTestMsd, PatchCreationSetReleaseMsdOutputPatches) { 
    DeviceVector devices = mManager->getAvailableOutputDevices();

    // Remove MSD output device to avoid patching to itself

    devices.remove(mMsdOutputDevice);

    ASSERT_EQ(mExpectedAudioPatchCount, devices.size());

    ASSERT_EQ(mExpectedAudioPatchCount -1 , devices.size());

    mManager->setMsdOutputPatches(&devices);

    ASSERT_EQ(mExpectedAudioPatchCount, patchCount.deltaFromSnapshot());

    ASSERT_EQ(mExpectedAudioPatchCount - 1, patchCount.deltaFromSnapshot());

    // Dual patch: exercise creating one new audio patch and reusing another existing audio patch.

    DeviceVector singleDevice(devices[0]);

    mManager->releaseMsdOutputPatches(singleDevice);

    ASSERT_EQ(mExpectedAudioPatchCount - 1, patchCount.deltaFromSnapshot());

    ASSERT_EQ(mExpectedAudioPatchCount - 2, patchCount.deltaFromSnapshot());

    mManager->setMsdOutputPatches(&devices);

    ASSERT_EQ(mExpectedAudioPatchCount, patchCount.deltaFromSnapshot());

    ASSERT_EQ(mExpectedAudioPatchCount - 1, patchCount.deltaFromSnapshot());

    mManager->releaseMsdOutputPatches(devices);

    ASSERT_EQ(0, patchCount.deltaFromSnapshot());

}
@@ -641,7 +641,7 @@ TEST_P(AudioPolicyManagerTestMsd, GetOutputForAttrPcmRoutesToMsd) { 
    getOutputForAttr(&selectedDeviceId,

            AUDIO_FORMAT_PCM_16_BIT, AUDIO_CHANNEL_OUT_STEREO, k48000SamplingRate);

    ASSERT_EQ(selectedDeviceId, mDefaultOutputDevice->getId());

    ASSERT_EQ(mExpectedAudioPatchCount, patchCount.deltaFromSnapshot());

    ASSERT_EQ(mExpectedAudioPatchCount - 1, patchCount.deltaFromSnapshot());

}



TEST_P(AudioPolicyManagerTestMsd, GetOutputForAttrEncodedPlusPcmRoutesToMsd) {
@@ -664,7 +664,7 @@ TEST_P(AudioPolicyManagerTestMsd, GetOutputForAttrUnsupportedFormatBypassesMsd) 
    getOutputForAttr(&selectedDeviceId, AUDIO_FORMAT_DTS, AUDIO_CHANNEL_OUT_5POINT1,

            k48000SamplingRate, AUDIO_OUTPUT_FLAG_DIRECT);

    ASSERT_NE(selectedDeviceId, mMsdOutputDevice->getId());

    ASSERT_EQ(0, patchCount.deltaFromSnapshot());

    ASSERT_EQ(1, patchCount.deltaFromSnapshot());

}



TEST_P(AudioPolicyManagerTestMsd, GetOutputForAttrFormatSwitching) {
@@ -678,7 +678,7 @@ TEST_P(AudioPolicyManagerTestMsd, GetOutputForAttrFormatSwitching) { 
        ASSERT_EQ(selectedDeviceId, mDefaultOutputDevice->getId());

        ASSERT_EQ(mExpectedAudioPatchCount, patchCount.deltaFromSnapshot());

        mManager->releaseOutput(portId);

        ASSERT_EQ(mExpectedAudioPatchCount, patchCount.deltaFromSnapshot());

        ASSERT_EQ(mExpectedAudioPatchCount - 1, patchCount.deltaFromSnapshot());

    }

    {

        const PatchCountCheck patchCount = snapshotPatchCount();
@@ -687,7 +687,7 @@ TEST_P(AudioPolicyManagerTestMsd, GetOutputForAttrFormatSwitching) { 
        getOutputForAttr(&selectedDeviceId, AUDIO_FORMAT_DTS, AUDIO_CHANNEL_OUT_5POINT1,

                k48000SamplingRate, AUDIO_OUTPUT_FLAG_DIRECT, nullptr /*output*/, &portId);

        ASSERT_NE(selectedDeviceId, mMsdOutputDevice->getId());

        ASSERT_EQ(-static_cast<int>(mExpectedAudioPatchCount), patchCount.deltaFromSnapshot());

        ASSERT_EQ(-static_cast<int>(mExpectedAudioPatchCount) + 2, patchCount.deltaFromSnapshot());

        mManager->releaseOutput(portId);

        ASSERT_EQ(0, patchCount.deltaFromSnapshot());

    }
@@ -697,7 +697,7 @@ TEST_P(AudioPolicyManagerTestMsd, GetOutputForAttrFormatSwitching) { 
        getOutputForAttr(&selectedDeviceId, AUDIO_FORMAT_AC3, AUDIO_CHANNEL_OUT_5POINT1,

                k48000SamplingRate, AUDIO_OUTPUT_FLAG_DIRECT);

        ASSERT_EQ(selectedDeviceId, mDefaultOutputDevice->getId());

        ASSERT_EQ(0, patchCount.deltaFromSnapshot());

        ASSERT_EQ(1, patchCount.deltaFromSnapshot());

    }

}