commit 2b3cc98138003eda5de4f4b69eb9cc609e757cd4
author Mikhail Naganov <mnaganov@google.com> Fri Oct 02 13:46:13 2020 -0700
committer Mikhail Naganov <mnaganov@google.com> Wed Oct 07 21:23:47 2020 +0000
tree b93dc5d423d2b85570901f782ad291f5bd09f595
parent 2030ddfe544955198edd9b5d5a159d4e36c5fb9f

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

media/extractors/ogg/OggExtractor.cpp

diff --git a/media/extractors/ogg/OggExtractor.cpp b/media/extractors/ogg/OggExtractor.cpp
index 828bcd6..eb2246d 100644
--- a/media/extractors/ogg/OggExtractor.cpp
+++ b/media/extractors/ogg/OggExtractor.cpp
@@ -1304,8 +1304,8 @@
                 || 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);