tree 96604ef41bcefa1375f936601acd0e34d751a3a4
parent 13a2bb9044faf13678d4c097ed30e998043c4861
author Jean-Michel Trivi <jmtrivi@google.com> 1657304287 +0000
committer Jean-Michel Trivi <jmtrivi@google.com> 1659100275 +0000

MediaPlayer: fix channel mask handling

The AAC decoder is publishing the decoded channel mask using the
expected format for KEY_CHANNEL_MASK, which uses the Java AudioFormat
mask definitions.
The MediaPlayer implementation was treating published channel masks
(when found in the decoded format) as using the native mask format,
causing the "stereo Java mask" value of 0b1100 to be handled
as AUDIO_CHANNEL_OUT_FRONT_CENTER | AUDIO_CHANNEL_OUT_LOW_FREQUENCY.
The fix consists in converting from the AudioFormat format to
the audio_channel_mask_t format, unless the two least significant
bits are non-zero (for compatibility with legacy extractors).

Bug: 238115866
Test: repro in bug playing RTSP stream w/ captions on
Change-Id: Ie8b57e20927d90e45b0f69a23a6777af7a39794d
Merged-In: Ie8b57e20927d90e45b0f69a23a6777af7a39794d