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

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

Merge "audioeffect_tests : Rename method to better reflect return type" into main am: 3816c808 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3196526



Change-Id: I51f4813c1b69444c0c2719b4a4da1477b56a5f8e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f1e3f724 3816c808

media/libaudioclient/tests/audioeffect_tests.cpp

+21 −24
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ sp<AudioEffect> createEffect(const effect_uuid_t* type, const effect_uuid_t* uui 
    return effect;

}



status_t isEffectExistsOnAudioSession(const effect_uuid_t* type, const effect_uuid_t* uuid,

status_t createAndInitCheckEffect(const effect_uuid_t* type, const effect_uuid_t* uuid,

                                  int priority, audio_session_t sessionId) {

    sp<AudioEffect> effect = createEffect(type, uuid, priority, sessionId);

    return effect->initCheck();
@@ -272,8 +272,7 @@ TEST(AudioEffectTest, ManageSourceDefaultEffects) { 
    EXPECT_FALSE(isEffectDefaultOnRecord(selectedEffectType, selectedEffectUuid,

                                         capture->getAudioRecordHandle()))

            << "Effect should not have been default on record. " << type;

    EXPECT_EQ(NO_ERROR,

              isEffectExistsOnAudioSession(selectedEffectType, selectedEffectUuid,

    EXPECT_EQ(NO_ERROR, createAndInitCheckEffect(selectedEffectType, selectedEffectUuid,

                                                 kDefaultInputEffectPriority - 1,

                                                 capture->getAudioRecordHandle()->getSessionId()))

            << "Effect should not have been added. " << type;
@@ -296,7 +295,7 @@ TEST(AudioEffectTest, ManageSourceDefaultEffects) { 
                                        capture->getAudioRecordHandle()))

            << "Effect should have been default on record. " << type;

    EXPECT_EQ(ALREADY_EXISTS,

              isEffectExistsOnAudioSession(selectedEffectType, selectedEffectUuid,

              createAndInitCheckEffect(selectedEffectType, selectedEffectUuid,

                                       kDefaultInputEffectPriority - 1,

                                       capture->getAudioRecordHandle()->getSessionId()))

            << "Effect should have been added. " << type;
@@ -313,8 +312,7 @@ TEST(AudioEffectTest, ManageSourceDefaultEffects) { 
    EXPECT_FALSE(isEffectDefaultOnRecord(selectedEffectType, selectedEffectUuid,

                                         capture->getAudioRecordHandle()))

            << "Effect should not have been default on record. " << type;

    EXPECT_EQ(NO_ERROR,

              isEffectExistsOnAudioSession(selectedEffectType, selectedEffectUuid,

    EXPECT_EQ(NO_ERROR, createAndInitCheckEffect(selectedEffectType, selectedEffectUuid,

                                                 kDefaultInputEffectPriority - 1,

                                                 capture->getAudioRecordHandle()->getSessionId()))

            << "Effect should not have been added. " << type;
@@ -421,7 +419,7 @@ TEST_P(AudioPlaybackEffectTest, StreamDefaultEffectTest) { 
    EXPECT_EQ(NO_ERROR, playback->create());

    EXPECT_EQ(NO_ERROR, playback->start());

    EXPECT_EQ(compatCheck ? NO_ERROR : NO_INIT,

              isEffectExistsOnAudioSession(&mType, &mUuid, kDefaultOutputEffectPriority - 1,

              createAndInitCheckEffect(&mType, &mUuid, kDefaultOutputEffectPriority - 1,

                                       playback->getAudioTrackHandle()->getSessionId()))

            << "Effect should not have been added. " << mTypeStr;

    EXPECT_EQ(NO_ERROR, playback->waitForConsumption());
@@ -445,7 +443,7 @@ TEST_P(AudioPlaybackEffectTest, StreamDefaultEffectTest) { 
    EXPECT_EQ(NO_ERROR, playback->start());

    // If effect chosen is not compatible with the session, then effect won't be applied

    EXPECT_EQ(compatCheck ? ALREADY_EXISTS : NO_INIT,

              isEffectExistsOnAudioSession(&mType, &mUuid, kDefaultOutputEffectPriority - 1,

              createAndInitCheckEffect(&mType, &mUuid, kDefaultOutputEffectPriority - 1,

                                       playback->getAudioTrackHandle()->getSessionId()))

            << "Effect should have been added. " << mTypeStr;

    EXPECT_EQ(NO_ERROR, playback->waitForConsumption());
@@ -467,7 +465,7 @@ TEST_P(AudioPlaybackEffectTest, StreamDefaultEffectTest) { 
    EXPECT_EQ(NO_ERROR, playback->create());

    EXPECT_EQ(NO_ERROR, playback->start());

    EXPECT_EQ(compatCheck ? NO_ERROR : NO_INIT,

              isEffectExistsOnAudioSession(&mType, &mUuid, kDefaultOutputEffectPriority - 1,

              createAndInitCheckEffect(&mType, &mUuid, kDefaultOutputEffectPriority - 1,

                                       playback->getAudioTrackHandle()->getSessionId()))

            << "Effect should not have been added. " << mTypeStr;

    EXPECT_EQ(NO_ERROR, playback->waitForConsumption());
@@ -502,8 +500,8 @@ TEST_P(AudioPlaybackEffectTest, CheckOutputFlagCompatibility) { 
    EXPECT_EQ(NO_ERROR, playback->create());

    EXPECT_EQ(NO_ERROR, playback->start());



    EXPECT_EQ(ALREADY_EXISTS, isEffectExistsOnAudioSession(

                                      &mType, &mUuid, kDefaultOutputEffectPriority - 1, sessionId))

    EXPECT_EQ(ALREADY_EXISTS,

              createAndInitCheckEffect(&mType, &mUuid, kDefaultOutputEffectPriority - 1, sessionId))

            << "Effect should have been added. " << mTypeStr;

    if (mSelectFastMode) {

        EXPECT_EQ(mIsFastCompatibleEffect ? AUDIO_OUTPUT_FLAG_FAST : 0,
@@ -556,8 +554,7 @@ TEST(AudioEffectTest, TestHapticEffect) { 
    ASSERT_EQ(NO_ERROR, playback->loadResource("/data/local/tmp/bbb_2ch_24kHz_s16le.raw"));

    EXPECT_EQ(NO_ERROR, playback->create());

    EXPECT_EQ(NO_ERROR, playback->start());

    ASSERT_EQ(ALREADY_EXISTS,

              isEffectExistsOnAudioSession(selectedEffectType, selectedEffectUuid,

    ASSERT_EQ(ALREADY_EXISTS, createAndInitCheckEffect(selectedEffectType, selectedEffectUuid,

                                                       kDefaultOutputEffectPriority - 1, sessionId))

            << "Effect should have been added. " << type;

    EXPECT_EQ(NO_ERROR, playback->waitForConsumption());