Pass more detailed audio hardware configuration information to the renderer

media/audio/audio_parameters.h

Index: media/audio/audio_parameters.h
===================================================================
--- media/audio/audio_parameters.h	(revision 187053)
+++ media/audio/audio_parameters.h	(working copy)
@@ -51,7 +51,7 @@
                   int sample_rate, int bits_per_sample,
                   int frames_per_buffer);
   void Reset(Format format, ChannelLayout channel_layout,
-             int input_channels,
+             int channels, int input_channels,
              int sample_rate, int bits_per_sample,
              int frames_per_buffer);
 
@@ -76,6 +76,9 @@
   int channels() const { return channels_; }
   int input_channels() const { return input_channels_; }
 
+  // Set to CHANNEL_LAYOUT_DISCRETE with given number of channels.
+  void SetDiscreteChannels(int channels);
+
  private:
   Format format_;                 // Format of the stream.
   ChannelLayout channel_layout_;  // Order of surround sound channels.