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

Commit edb2ec29 authored by Nathalie Le Clair's avatar Nathalie Le Clair
Browse files

Add conversion for new AudioDescriptor standards 

Test: atest audio_aidl_conversion_tests
Bug: 260547656
Change-Id: Id5e0951152dbf55bc6a278a5903679f369521e0f
parent 1b5fbab4

media/audioaidlconversion/AidlConversionCppNdk.cpp

+8 −0
Original line number Diff line number Diff line
@@ -2046,6 +2046,10 @@ aidl2legacy_AudioStandard_audio_standard_t(AudioStandard aidl) { 
            return AUDIO_STANDARD_NONE;

        case AudioStandard::EDID:

            return AUDIO_STANDARD_EDID;

        case AudioStandard::SADB:

            return AUDIO_STANDARD_SADB;

        case AudioStandard::VSADB:

            return AUDIO_STANDARD_VSADB;

    }

    return unexpected(BAD_VALUE);

}
@@ -2057,6 +2061,10 @@ legacy2aidl_audio_standard_t_AudioStandard(audio_standard_t legacy) { 
            return AudioStandard::NONE;

        case AUDIO_STANDARD_EDID:

            return AudioStandard::EDID;

        case AUDIO_STANDARD_SADB:

            return AudioStandard::SADB;

        case AUDIO_STANDARD_VSADB:

            return AudioStandard::VSADB;

    }

    return unexpected(BAD_VALUE);

}

media/libaudioclient/tests/audio_aidl_legacy_conversion_tests.cpp

+7 −2
Original line number Diff line number Diff line
@@ -391,7 +391,8 @@ TEST_P(AudioStandardRoundTripTest, Aidl2Legacy2Aidl) { 
    EXPECT_EQ(initial, convBack.value());

}

INSTANTIATE_TEST_SUITE_P(AudioStandard, AudioStandardRoundTripTest,

                         testing::Values(AudioStandard::NONE, AudioStandard::EDID));

                         testing::Values(AudioStandard::NONE, AudioStandard::EDID,

                                         AudioStandard::SADB, AudioStandard::VSADB));



class AudioEncapsulationMetadataTypeRoundTripTest

    : public testing::TestWithParam<AudioEncapsulationMetadataType> {};
@@ -450,7 +451,11 @@ INSTANTIATE_TEST_SUITE_P( 
        ExtraAudioDescriptor, ExtraAudioDescriptorRoundTripTest,

        testing::Values(std::make_tuple(AudioStandard::NONE, AudioEncapsulationType::NONE),

                        std::make_tuple(AudioStandard::EDID, AudioEncapsulationType::NONE),

                        std::make_tuple(AudioStandard::EDID, AudioEncapsulationType::IEC61937)));

                        std::make_tuple(AudioStandard::EDID, AudioEncapsulationType::IEC61937),

                        std::make_tuple(AudioStandard::SADB, AudioEncapsulationType::NONE),

                        std::make_tuple(AudioStandard::SADB, AudioEncapsulationType::IEC61937),

                        std::make_tuple(AudioStandard::VSADB, AudioEncapsulationType::NONE),

                        std::make_tuple(AudioStandard::VSADB, AudioEncapsulationType::IEC61937)));



TEST(AudioPortSessionExtRoundTripTest, Aidl2Legacy2Aidl) {

    const int32_t initial = 7;