Add support for multichannel playback to OpenSLES output.

Add support for multichannel playback to OpenSLES output.

Ports the code from AOSP for detecting channel layouts given a
channel count. No idea if it works though since I'm not sure how
to setup a multichannel android device.

Notably this also changes the mono layout from using the center
channel to using the left channel mask per notes in the ported
code.

Multichannel is only supported on Lollipop+ devices since OpenSLES
does not configure successfully on any KitKat device I've tried.

BUG=607003
TEST=multichannel test clip.

Committed: https://crrev.com/48c1c49bc3646cf90a59ad90260a43ff23001bf1
Cr-Commit-Position: refs/heads/master@{#391095}

[DaleCurtis, 2016-04-26 23:58:54]

dalecurtis@chromium.org changed reviewers:
+ henrika@chromium.org, tsunghung@chromium.org

[DaleCurtis, 2016-04-26 23:58:54]

+tsunghung who seems to have at least modified the code I ported from
channel.{c,h} in AOSP.

[DaleCurtis, 2016-04-27 00:00:06]

If either of you have ideas for testing multichannel from an android device let
me know :)

[henrika (OOO until Aug 14), 2016-04-27 08:26:45]

Sorry for delaying but it is not clear to me how any other channel config than
mono or stereo can be provided at construction.
We use hardcoded values (MONO/STEREO) in the audio manager for Android. Are
there any new paths that I don't know about?

[DaleCurtis, 2016-04-27 17:48:17]

On 2016/04/27 at 08:26:45, henrika wrote:
> Sorry for delaying but it is not clear to me how any other channel config than
mono or stereo can be provided at construction.
> We use hardcoded values (MONO/STEREO) in the audio manager for Android. Are
there any new paths that I don't know about?

Where are the hard coded values you're referring to? I can't find them. The
preferred audio parameters suggest stereo, but will accept the desired
parameter's layout instead. I don't see any other hardcoding to mono/stereo in
AudioManagerAndroid.

[henrika (OOO until Aug 14), 2016-04-28 07:32:36]

Sorry Dale, my bad. I looked at the default values only and did not account for
the if (input_params.IsValid()) {} scope.

[henrika (OOO until Aug 14), 2016-04-28 07:52:54]

LGTM

Can you give some more details on how the need for this change came up? Just
curious. Read the bug but more details would be nice.

And, please check the AudioAndroidOutput/InputTest as well. Thanks ;-)

https://codereview.chromium.org/1921963004/diff/40001/media/audio/android/ope...
File media/audio/android/opensles_util.cc (right):

https://codereview.chromium.org/1921963004/diff/40001/media/audio/android/ope...
media/audio/android/opensles_util.cc:21: SLuint32
ChannelCountToSLESChannelMask(int channel_count) {
I understand that you want to avoid the existing DCHECK here but do you have any
hopes of actually notice any real effect of this mapping?

[DaleCurtis, 2016-04-28 17:27:26]

https://codereview.chromium.org/1921963004/diff/40001/media/audio/android/ope...
File media/audio/android/opensles_util.cc (right):

https://codereview.chromium.org/1921963004/diff/40001/media/audio/android/ope...
media/audio/android/opensles_util.cc:21: SLuint32
ChannelCountToSLESChannelMask(int channel_count) {
On 2016/04/28 at 07:52:54, henrika wrote:
> I understand that you want to avoid the existing DCHECK here but do you have
any hopes of actually notice any real effect of this mapping?

AndroidTV devices and those hooked up via HDMI should be able to output > stereo
audio; these devices frequently use WebView or similar content/ based shells
that will need to output multichannel. At lease on M+ devices the audio is
automatically downmixed by the OS if necessary. I need to test K, L variants.

[henrika (OOO until Aug 14), 2016-04-29 07:46:31]

https://codereview.chromium.org/1921963004/diff/40001/media/audio/android/ope...
File media/audio/android/opensles_util.cc (right):

https://codereview.chromium.org/1921963004/diff/40001/media/audio/android/ope...
media/audio/android/opensles_util.cc:21: SLuint32
ChannelCountToSLESChannelMask(int channel_count) {
Thanks. Just hope it works then ;-)

[DaleCurtis, 2016-05-02 19:33:54]

Description was changed from

==========
Add support for multichannel playback to OpenSLES output.

Ports the code from AOSP for detecting channel layouts given a
channel count. No idea if it works though since I'm not sure how
to setup a multichannel android device.

Notably this also changes the mono layout from using the center
channel to using the left channel mask per notes in the ported
code.

BUG=607003
TEST=none... not sure how to trigger multichannel output on device.
==========

to

==========
Add support for multichannel playback to OpenSLES output.

Ports the code from AOSP for detecting channel layouts given a
channel count. No idea if it works though since I'm not sure how
to setup a multichannel android device.

Notably this also changes the mono layout from using the center
channel to using the left channel mask per notes in the ported
code.

Multichannel is only supported on Lollipop+ devices since OpenSLES
does not configure successfully on any KitKat device I've tried.

BUG=607003
TEST=multichannel test clip.
==========

[DaleCurtis, 2016-05-02 19:35:11]

Okay this is ready to go; disabled on KitKat since none of the devices I have
can successfully create a 5.1+ stream. Lollipop+ seems to do this correctly
though.

[DaleCurtis, 2016-05-02 19:35:24]

tsunghung@ did you have any commentary to add?

[DaleCurtis, 2016-05-02 21:43:47]

tsunghung@ and I spoke via chat, all good to go here. CQ'ing.

[DaleCurtis, 2016-05-02 21:43:49]

The CQ bit was checked by dalecurtis@chromium.org

[DaleCurtis, 2016-05-02 21:43:49]

The patchset sent to the CQ was uploaded after l-g-t-m from henrika@chromium.org
Link to the patchset: https://codereview.chromium.org/1921963004/#ps60001
(title: "Avoid multichannel on KitKat.")

[commit-bot: I haz the power, 2016-05-02 21:44:32]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1921963004/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1921963004/60001

[commit-bot: I haz the power, 2016-05-02 23:35:33]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2016-05-02 23:36:48]

Description was changed from

==========
Add support for multichannel playback to OpenSLES output.

Ports the code from AOSP for detecting channel layouts given a
channel count. No idea if it works though since I'm not sure how
to setup a multichannel android device.

Notably this also changes the mono layout from using the center
channel to using the left channel mask per notes in the ported
code.

Multichannel is only supported on Lollipop+ devices since OpenSLES
does not configure successfully on any KitKat device I've tried.

BUG=607003
TEST=multichannel test clip.
==========

to

==========
Add support for multichannel playback to OpenSLES output.

Ports the code from AOSP for detecting channel layouts given a
channel count. No idea if it works though since I'm not sure how
to setup a multichannel android device.

Notably this also changes the mono layout from using the center
channel to using the left channel mask per notes in the ported
code.

Multichannel is only supported on Lollipop+ devices since OpenSLES
does not configure successfully on any KitKat device I've tried.

BUG=607003
TEST=multichannel test clip.

Committed: https://crrev.com/48c1c49bc3646cf90a59ad90260a43ff23001bf1
Cr-Commit-Position: refs/heads/master@{#391095}
==========

[commit-bot: I haz the power, 2016-05-02 23:36:50]

Patchset 4 (id:??) landed as
https://crrev.com/48c1c49bc3646cf90a59ad90260a43ff23001bf1
Cr-Commit-Position: refs/heads/master@{#391095}