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

Commit 70ebd002 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Automerger Merge Worker
Browse files

Merge "AudioMixerOps: update for front wide left/right" into sc-v2-dev am:... 

Merge "AudioMixerOps: update for front wide left/right" into sc-v2-dev am: 05a9b71c am: 3e86ee3d

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

Change-Id: I578f602be093e5e61f5b0ef91a9f56354b9c6925
parents c67ae0c1 3e86ee3d

media/libaudioprocessing/AudioMixerOps.h

+5 −1
Original line number Diff line number Diff line
@@ -328,7 +328,9 @@ void stereoVolumeHelperWithChannelMask(TO*& out, const TI*& in, const TV *vol, F 
    DO_CHANNEL_POSITION(21);

    DO_CHANNEL_POSITION(22);

    DO_CHANNEL_POSITION(23);

    static_assert(FCC_LIMIT <= FCC_24); // Note: this may need to change.

    DO_CHANNEL_POSITION(24);

    DO_CHANNEL_POSITION(25);

    static_assert(FCC_LIMIT <= FCC_26); // Note: this may need to change.

#pragma pop_macro("DO_CHANNEL_POSITION")

}
@@ -346,6 +348,8 @@ constexpr inline audio_channel_mask_t canonicalChannelMaskFromCount(size_t chann 
        [7] = AUDIO_CHANNEL_OUT_6POINT1,

        [8] = AUDIO_CHANNEL_OUT_7POINT1,

        [12] = AUDIO_CHANNEL_OUT_7POINT1POINT4,

        [14] = AUDIO_CHANNEL_OUT_9POINT1POINT4,

        [16] = AUDIO_CHANNEL_OUT_9POINT1POINT6,

        [24] = AUDIO_CHANNEL_OUT_22POINT2,

    };

    return channelCount < std::size(canonical) ? canonical[channelCount] : AUDIO_CHANNEL_NONE;