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

Commit cb4d52e6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add more legacy channel masks for the input direction"

parents 4a3734db 4b11bd63

media/audioaidlconversion/AidlConversionCppNdk.cpp

+5 −0
Original line number Diff line number Diff line
@@ -286,12 +286,17 @@ const detail::AudioChannelPairs& getInAudioChannelPairs() { 


        DEFINE_INPUT_LAYOUT(MONO),

        DEFINE_INPUT_LAYOUT(STEREO),

        DEFINE_INPUT_LAYOUT(2POINT1),

        DEFINE_INPUT_LAYOUT(FRONT_BACK),

        DEFINE_INPUT_LAYOUT(TRI),

        DEFINE_INPUT_LAYOUT(3POINT1),

        // AUDIO_CHANNEL_IN_6 not supported

        DEFINE_INPUT_LAYOUT(2POINT0POINT2),

        DEFINE_INPUT_LAYOUT(2POINT1POINT2),

        DEFINE_INPUT_LAYOUT(3POINT0POINT2),

        DEFINE_INPUT_LAYOUT(3POINT1POINT2),

        DEFINE_INPUT_LAYOUT(QUAD),

        DEFINE_INPUT_LAYOUT(PENTA),

        DEFINE_INPUT_LAYOUT(5POINT1)

#undef DEFINE_INPUT_LAYOUT

    };

media/audioaidlconversion/TEST_MAPPING

+1 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "audio_aidl_conversion_tests",

      "name": "audio_aidl_ndk_conversion_tests",

      "name": "audio_aidl_ndk_cpp_conversion_tests"

    }

media/libaudioclient/tests/audio_aidl_legacy_conversion_tests.cpp

+7 −2
Original line number Diff line number Diff line
@@ -94,6 +94,11 @@ AudioChannelLayout make_ACL_Stereo() { 
            AudioChannelLayout::LAYOUT_STEREO);

}



AudioChannelLayout make_ACL_Tri() {

    return AudioChannelLayout::make<AudioChannelLayout::Tag::layoutMask>(

            AudioChannelLayout::LAYOUT_TRI);

}



AudioChannelLayout make_ACL_LayoutArbitrary() {

    return AudioChannelLayout::make<AudioChannelLayout::Tag::layoutMask>(

            // Use channels that exist both for input and output,
@@ -311,8 +316,8 @@ INSTANTIATE_TEST_SUITE_P( 
        AudioChannelLayoutRoundTrip, AudioChannelLayoutRoundTripTest,

        testing::Combine(

                testing::Values(AudioChannelLayout{}, make_ACL_Invalid(), make_ACL_Stereo(),

                                make_ACL_LayoutArbitrary(), make_ACL_ChannelIndex2(),

                                make_ACL_ChannelIndexArbitrary(),

                                make_ACL_Tri(), make_ACL_LayoutArbitrary(),

                                make_ACL_ChannelIndex2(), make_ACL_ChannelIndexArbitrary(),

                                AudioChannelLayout::make<AudioChannelLayout::Tag::layoutMask>(

                                        AudioChannelLayout::CHANNEL_FRONT_LEFT),

                                AudioChannelLayout::make<AudioChannelLayout::Tag::layoutMask>(