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

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

Merge "Add tests for AudioInput|OutputFlags conversion" into main am:... 

Merge "Add tests for AudioInput|OutputFlags conversion" into main am: d49d1480 am: 27d79cfd am: 5bd54362

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



Change-Id: I5ed485e733259e5cbb50ab1c316f9267089cad07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2396cfe0 5bd54362

media/libaudioclient/tests/audio_aidl_legacy_conversion_tests.cpp

+26 −0
Original line number Original line Diff line number Diff line
@@ -43,7 +43,9 @@ using media::audio::common::AudioFormatType; 
using media::audio::common::AudioGain;

using media::audio::common::AudioGain;

using media::audio::common::AudioGainConfig;

using media::audio::common::AudioGainConfig;

using media::audio::common::AudioGainMode;

using media::audio::common::AudioGainMode;

using media::audio::common::AudioInputFlags;

using media::audio::common::AudioIoFlags;

using media::audio::common::AudioIoFlags;

using media::audio::common::AudioOutputFlags;

using media::audio::common::AudioPortDeviceExt;

using media::audio::common::AudioPortDeviceExt;

using media::audio::common::AudioProfile;

using media::audio::common::AudioProfile;

using media::audio::common::AudioStandard;

using media::audio::common::AudioStandard;
@@ -851,3 +853,27 @@ TEST(AudioMicrophoneInfoFw, ChannelMapping) { 
    EXPECT_EQ(MicrophoneDynamicInfo::ChannelMapping::UNUSED, aidl.dynamic.channelMapping[2]);

    EXPECT_EQ(MicrophoneDynamicInfo::ChannelMapping::UNUSED, aidl.dynamic.channelMapping[2]);

    EXPECT_EQ(MicrophoneDynamicInfo::ChannelMapping::PROCESSED, aidl.dynamic.channelMapping[3]);

    EXPECT_EQ(MicrophoneDynamicInfo::ChannelMapping::PROCESSED, aidl.dynamic.channelMapping[3]);

}

}



TEST(AudioInputFlags, Aidl2Legacy2Aidl) {

    for (auto flag : enum_range<AudioInputFlags>()) {

        int32_t aidlMask = 1 << static_cast<int32_t>(flag);

        auto convMask = aidl2legacy_int32_t_audio_input_flags_t_mask(aidlMask);

        ASSERT_TRUE(convMask.ok());

        ASSERT_EQ(1, __builtin_popcount(convMask.value()));

        auto convFlag = legacy2aidl_audio_input_flags_t_AudioInputFlags(convMask.value());

        ASSERT_TRUE(convFlag.ok());

        EXPECT_EQ(flag, convFlag.value());

    }

}



TEST(AudioOutputFlags, Aidl2Legacy2Aidl) {

    for (auto flag : enum_range<AudioOutputFlags>()) {

        int32_t aidlMask = 1 << static_cast<int32_t>(flag);

        auto convMask = aidl2legacy_int32_t_audio_output_flags_t_mask(aidlMask);

        ASSERT_TRUE(convMask.ok());

        ASSERT_EQ(1, __builtin_popcount(convMask.value()));

        auto convFlag = legacy2aidl_audio_output_flags_t_AudioOutputFlags(convMask.value());

        ASSERT_TRUE(convFlag.ok());

        EXPECT_EQ(flag, convFlag.value());

    }

}