Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "SoundPool: Fix channel mask reporting"

Browse Source
This commit is contained in:
Andy Hung
2022-09-02 21:18:43 +00:00
committed by Gerrit Code Review
parent f93b1f9698 7658ac1860
commit 4b50dd4f0e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/jni/soundpool/Sound.cpp
View File

@@ -181,8 +181,11 @@ static status_t decode(int fd, int64_t offset, int64_t length,
format.get(), AMEDIAFORMAT_KEY_CHANNEL_COUNT, channelCount)) { format.get(), AMEDIAFORMAT_KEY_CHANNEL_COUNT, channelCount)) {
return UNKNOWN_ERROR; return UNKNOWN_ERROR;
} }
if (!AMediaFormat_getInt32(format.get(), AMEDIAFORMAT_KEY_CHANNEL_MASK, int32_t mediaFormatChannelMask;
(int32_t*) channelMask)) { if (AMediaFormat_getInt32(format.get(), AMEDIAFORMAT_KEY_CHANNEL_MASK,
&mediaFormatChannelMask)) {
*channelMask = audio_channel_mask_from_media_format_mask(mediaFormatChannelMask);
} else {
*channelMask = AUDIO_CHANNEL_NONE; *channelMask = AUDIO_CHANNEL_NONE;
} }
*sizeInBytes = written; *sizeInBytes = written;