Pass more detailed audio hardware configuration information to the renderer

media/base/audio_hardware_config.cc

Index: media/base/audio_hardware_config.cc
===================================================================
--- media/base/audio_hardware_config.cc	(revision 185058)
+++ media/base/audio_hardware_config.cc	(working copy)
@@ -6,34 +6,83 @@
 
 namespace media {
 
+AudioHardwareConfig::AudioHardwareConfig()
+    : output_buffer_size_(0),
+      output_sample_rate_(0),
+      output_channels_(0),
+      output_channel_layout_(CHANNEL_LAYOUT_NONE),
+      input_sample_rate_(0),
+      input_channels_(0),
+      input_channel_layout_(CHANNEL_LAYOUT_NONE) {
+}
+
 AudioHardwareConfig::AudioHardwareConfig(
-    int output_buffer_size, int output_sample_rate,
-    int input_sample_rate, ChannelLayout input_channel_layout)
-    : output_buffer_size_(output_buffer_size),
+    int buffer_size,
+    int output_sample_rate,
+    int output_channels,
+    ChannelLayout output_channel_layout,
+    int input_sample_rate,
+    int input_channels,
+    ChannelLayout input_channel_layout)
+    : output_buffer_size_(buffer_size),
       output_sample_rate_(output_sample_rate),
+      output_channels_(output_channels),
+      output_channel_layout_(output_channel_layout),
       input_sample_rate_(input_sample_rate),
+      input_channels_(input_channels),
       input_channel_layout_(input_channel_layout) {
 }
 
 AudioHardwareConfig::~AudioHardwareConfig() {}
 
-int AudioHardwareConfig::GetOutputBufferSize() {
+void AudioHardwareConfig::Reset(int buffer_size,
+                                int output_sample_rate,
+                                int output_channels,
+                                ChannelLayout output_channel_layout,
+                                int input_sample_rate,
+                                int input_channels,
+                                ChannelLayout input_channel_layout) {
   base::AutoLock auto_lock(config_lock_);
+  output_buffer_size_ = buffer_size;
+  output_sample_rate_ = output_sample_rate;
+  output_channels_ = output_channels;
+  output_channel_layout_ = output_channel_layout;
+  input_sample_rate_ = input_sample_rate;
+  input_channels_ = input_channels;
+  input_channel_layout_ = input_channel_layout;
+}
+
+int AudioHardwareConfig::AudioHardwareConfig::GetOutputBufferSize() const {
+  base::AutoLock auto_lock(config_lock_);
   return output_buffer_size_;
 }
 
-int AudioHardwareConfig::GetOutputSampleRate() {
+int AudioHardwareConfig::GetOutputSampleRate() const {
   base::AutoLock auto_lock(config_lock_);
   return output_sample_rate_;
 }
 
-int AudioHardwareConfig::GetInputSampleRate() {
+int AudioHardwareConfig::GetOutputChannels() const {
   base::AutoLock auto_lock(config_lock_);
+  return output_channels_;
+}
+
+ChannelLayout AudioHardwareConfig::GetOutputChannelLayout() const {
+  return output_channel_layout_;
+}
+
+int AudioHardwareConfig::GetInputSampleRate() const {
+  base::AutoLock auto_lock(config_lock_);
   return input_sample_rate_;
 }
 
-ChannelLayout AudioHardwareConfig::GetInputChannelLayout() {
+int AudioHardwareConfig::GetInputChannels() const {
   base::AutoLock auto_lock(config_lock_);
+  return input_channels_;
+}
+
+ChannelLayout AudioHardwareConfig::GetInputChannelLayout() const {
+  base::AutoLock auto_lock(config_lock_);
   return input_channel_layout_;
 }
 
@@ -44,7 +93,8 @@
   input_channel_layout_ = channel_layout;
 }
 
-void AudioHardwareConfig::UpdateOutputConfig(int buffer_size, int sample_rate) {
+void AudioHardwareConfig::UpdateOutputConfig(
+    int buffer_size, int sample_rate) {
   base::AutoLock auto_lock(config_lock_);
   output_buffer_size_ = buffer_size;
   output_sample_rate_ = sample_rate;