Fix for "Android audio playout doesn't support non-call media stream"

Fix for "Android audio playout doesn't support non-call media stream"

BUG=webrtc:4767
R=magjed@webrtc.org

Committed: https://crrev.com/6408174cdc4040528dd87ff7e5c76be91cdbafbe
Cr-Commit-Position: refs/heads/master@{#10435}

[henrika_webrtc, 2015-10-22 13:31:29]

Description was changed from

==========
Adding support for other audio stream type than COMM

BUG=
==========

to

==========
Adding support for other audio stream type than COMM.

BUG=b/21571563
==========

[henrika_webrtc, 2015-10-22 13:44:23]

Description was changed from

==========
Adding support for other audio stream type than COMM.

BUG=b/21571563
==========

to

==========
Adding support for other audio stream type than COMM.

BUG=webrtc:4767
==========

[henrika_webrtc, 2015-10-22 13:44:48]

Description was changed from

==========
Adding support for other audio stream type than COMM.

BUG=webrtc:4767
==========

to

==========
Fix for "Android audio playout doesn't support non-call media stream"

BUG=webrtc:4767
==========

[henrika_webrtc, 2015-10-22 13:51:36]

henrika@webrtc.org changed reviewers:
+ magjed@webrtc.org

[henrika_webrtc, 2015-10-22 13:56:51]

Magnus, do you mind reviewing this one? Looks like lots of details but it is
actually very simple. Today, we can end up in a state where the using app has
set another mode that COMMUNICATION and only want to play a file or a ring tone.
That will lead to a non-working volume control since we always open up output
streams under the assumption that the device is in COMM mode.

This CL fixes that.

Example: user just wants to enable playout side and sets his app in NORMAL mode.
We will then detect it and map that to a MUSIC_STREAM being opened instead since
it corresponds to the mode and the type of volume control given for the NORMAL
mode.

Note that, for the default case where the user selects COMM for fir his app,
this 
CL does not change anything at all compared to the existing.

[magjed_webrtc, 2015-10-28 09:08:33]

https://codereview.webrtc.org/1419693004/diff/20001/webrtc/modules/audio_devi...
File webrtc/modules/audio_device/android/audio_manager.cc (right):

https://codereview.webrtc.org/1419693004/diff/20001/webrtc/modules/audio_devi...
webrtc/modules/audio_device/android/audio_manager.cc:75: output_stream_type_(0)
{
Use AudioManager.STREAM_VOICE_CALL instead of 0

https://codereview.webrtc.org/1419693004/diff/20001/webrtc/modules/audio_devi...
File webrtc/modules/audio_device/android/opensles_player.cc (right):

https://codereview.webrtc.org/1419693004/diff/20001/webrtc/modules/audio_devi...
webrtc/modules/audio_device/android/opensles_player.cc:52:
RTC_DCHECK(stream_type_ == SL_ANDROID_STREAM_VOICE ||
Maybe add ' << stream_type_' at end of DCHECK so you can see what value it is
when/if it fails.

[magjed_webrtc, 2015-10-28 10:44:29]

lgtm

[henrika_webrtc, 2015-10-28 10:48:01]

Thanks.

https://codereview.webrtc.org/1419693004/diff/20001/webrtc/modules/audio_devi...
File webrtc/modules/audio_device/android/audio_manager.cc (right):

https://codereview.webrtc.org/1419693004/diff/20001/webrtc/modules/audio_devi...
webrtc/modules/audio_device/android/audio_manager.cc:75: output_stream_type_(0)
{
Discussed off line. Keeping as is.

https://codereview.webrtc.org/1419693004/diff/20001/webrtc/modules/audio_devi...
File webrtc/modules/audio_device/android/opensles_player.cc (right):

https://codereview.webrtc.org/1419693004/diff/20001/webrtc/modules/audio_devi...
webrtc/modules/audio_device/android/opensles_player.cc:52:
RTC_DCHECK(stream_type_ == SL_ANDROID_STREAM_VOICE ||
On 2015/10/28 09:08:33, magjed_webrtc wrote:
> Maybe add ' << stream_type_' at end of DCHECK so you can see what value it is
> when/if it fails.

Done.

[henrika_webrtc, 2015-10-28 10:49:27]

The CQ bit was checked by henrika@webrtc.org

[henrika_webrtc, 2015-10-28 10:49:27]

The patchset sent to the CQ was uploaded after l-g-t-m from magjed@webrtc.org
Link to the patchset: https://codereview.webrtc.org/1419693004/#ps40001 (title:
"Feedback from magjed@")

[magjed_webrtc, 2015-10-28 10:49:34]

lgtm

[commit-bot: I haz the power, 2015-10-28 10:49:34]

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

[henrika_webrtc, 2015-10-28 12:06:30]

Committed patchset #3 (id:40001) manually as
6408174cdc4040528dd87ff7e5c76be91cdbafbe (presubmit successful).

[commit-bot: I haz the power, 2015-10-28 12:06:35]

Patchset 3 (id:??) landed as
https://crrev.com/6408174cdc4040528dd87ff7e5c76be91cdbafbe
Cr-Commit-Position: refs/heads/master@{#10435}

[henrika_webrtc, 2015-11-03 12:27:43]

A revert of this CL (patchset #3 id:40001) has been created in
https://codereview.webrtc.org/1415603008/ by henrika@webrtc.org.

The reason for reverting is: Causes issues on some phones, e.g. Sony mobiles.
See b/25385046 for details..