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

Commit 2b3cc981 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

Prepare for having audio_channel_mask_t as an enum type 

audio_channel_mask_t used to be an alias for uint32_t, but
it will become an enum type. To facilitate this conversion,
bit operations involving audio_channel_mask_t must coerce type.

Bug: 169889714
Test: m
Merged-In: I42506484b1d0b0482618b7314fad4c8012a06fb4
Change-Id: I48f472b687159533092d6ae366f05a0a68c2554a
parent 2030ddfe

media/extractors/ogg/OggExtractor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1304,8 +1304,8 @@ void MyOggExtractor::setChannelMask(int channelCount) { 
                || audioChannelCount <= 0 || audioChannelCount > FCC_8) {

            ALOGE("Invalid haptic channel count found in metadata: %d", mHapticChannelCount);

        } else {

            const audio_channel_mask_t channelMask = audio_channel_out_mask_from_count(

                    audioChannelCount) | hapticChannelMask;

            const audio_channel_mask_t channelMask = static_cast<audio_channel_mask_t>(

                    audio_channel_out_mask_from_count(audioChannelCount) | hapticChannelMask);

            AMediaFormat_setInt32(mMeta, AMEDIAFORMAT_KEY_CHANNEL_MASK, channelMask);

            AMediaFormat_setInt32(

                    mMeta, AMEDIAFORMAT_KEY_HAPTIC_CHANNEL_COUNT, mHapticChannelCount);