Correct channel mask on android

media/audio/android/opensles_input.cc

Index: media/audio/android/opensles_input.cc
diff --git a/media/audio/android/opensles_input.cc b/media/audio/android/opensles_input.cc
index 3d0079efdd997e0a698f748fab69a4455332acdb..6800e45da436f87820ac5c4cb8f50eb7cb6e2170 100644
--- a/media/audio/android/opensles_input.cc
+++ b/media/audio/android/opensles_input.cc
@@ -24,8 +24,13 @@ OpenSLESInputStream::OpenSLESInputStream(AudioManagerAndroid* audio_manager,
   format_.samplesPerSec = static_cast<SLuint32>(params.sample_rate() * 1000);
   format_.bitsPerSample = params.bits_per_sample();
   format_.containerSize = params.bits_per_sample();
-  format_.channelMask = SL_SPEAKER_FRONT_CENTER;
   format_.endianness = SL_BYTEORDER_LITTLEENDIAN;
+  if (format_.numChannels == 1)
+    format_.channelMask = SL_SPEAKER_FRONT_CENTER;
+  else if (format_.numChannels == 2)
+    format_.channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
+  else
+    NOTREACHED() << "Unsupported channel " << format_.numChannels;

[Raymond Toy (Google), 2012/08/17 16:14:33]

Nit:  I would say "Unsupported number of channels: "

[scherkus (not reviewing), 2012/08/17 17:47:12]

do we need to set channelMask to something or is there a default value?

[no longer working on chromium, 2012/08/20 09:29:45]

Done.

[no longer working on chromium, 2012/08/20 09:29:45]

Good question.
When the mask does not match the channel number, we will hit a
SL_RESULT_PARAMETER_INVALID error when creating the recorder or player. Which
should the same as not setting the mask.
So setting a default value here does not make any difference  here.

 
   buffer_size_bytes_ = params.GetBytesPerBuffer();