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

Commit 017b43f2 authored by Dean Wheatley's avatar Dean Wheatley
Browse files

AudioMixerOps: Support 10-channel 

10-channel as AUDIO_CHANNEL_OUT_5POINT1POINT4 aligns with the definition
in audio_channel_out_mask_from_count.

Change-Id: I12ff4b55c2b9ad5d159bdde6b946c23440a54161
parent ddc2de8f

media/libaudioprocessing/AudioMixerOps.h

+1 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ constexpr inline audio_channel_mask_t canonicalChannelMaskFromCount(size_t chann 
        [6] = AUDIO_CHANNEL_OUT_5POINT1,

        [7] = AUDIO_CHANNEL_OUT_6POINT1,

        [8] = AUDIO_CHANNEL_OUT_7POINT1,

        [10] = AUDIO_CHANNEL_OUT_5POINT1POINT4,

        [12] = AUDIO_CHANNEL_OUT_7POINT1POINT4,

        [14] = AUDIO_CHANNEL_OUT_9POINT1POINT4,

        [16] = AUDIO_CHANNEL_OUT_9POINT1POINT6,

media/libaudioprocessing/tests/mixerops_tests.cpp

+3 −0
Original line number Diff line number Diff line
@@ -154,6 +154,9 @@ TEST(mixerops, stereovolume_7) { 
TEST(mixerops, stereovolume_8) {

    MixerOpsBasicTest<MIXTYPE_MULTI_STEREOVOL, 8>::testStereoVolume();

}

TEST(mixerops, stereovolume_10) {

    MixerOpsBasicTest<MIXTYPE_MULTI_STEREOVOL, 10>::testStereoVolume();

}

TEST(mixerops, stereovolume_12) {

    if constexpr (FCC_LIMIT >= 12) { // NOTE: FCC_LIMIT is an enum, so can't #if

        MixerOpsBasicTest<MIXTYPE_MULTI_STEREOVOL, 12>::testStereoVolume();