Ensures that WebRTC works for device selection using a different sample rate than default

content/public/common/media_stream_request.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
 #define CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 35 matching lines @@
 // TODO(xians): Change the structs to classes.
 // Represents one device in a request for media stream(s).
 struct CONTENT_EXPORT MediaStreamDevice {
   MediaStreamDevice();
 
   MediaStreamDevice(
       MediaStreamType type,
       const std::string& id,
       const std::string& name);
 
+  MediaStreamDevice(
+      MediaStreamType type,
+      const std::string& id,
+      const std::string& name,
+      int sample_rate,
+      int channel_layout);
+
   ~MediaStreamDevice();
 
   // The device's type.
   MediaStreamType type;
 
   // The device's unique ID.
   std::string id;
 
   // The device's "friendly" name. Not guaranteed to be unique.
   std::string name;
+
+  // Preferred sample rate in samples per second for the device.
+  // Only utilized for audio devices. Will be set to 0 if the constructor
+  // with three parameters (intended for video) is used.

[jam, 2013/01/16 17:57:24]

nit: here and below, I would skip this comment since it's needless. if someone
wants to see the default values, they can find it easily

+  int sample_rate;
+
+  // Preferred channel configuration for the device.
+  // Only utilized for audio devices. Will be set to 0 if the constructor
+  // with three parameters (intended for video) is used.
+  // TODO(henrika): ideally, we would like to use media::ChannelLayout here
+  // but including media/base/channel_layout.h violates checkdeps rules.
+  int channel_layout;
 };
 
 typedef std::vector<MediaStreamDevice> MediaStreamDevices;
 
 typedef std::map<MediaStreamType, MediaStreamDevices> MediaStreamDeviceMap;
 
 // Represents a request for media streams (audio/video).
 struct CONTENT_EXPORT MediaStreamRequest {
   MediaStreamRequest(
       int render_process_id,
@@ skipping 29 matching lines @@
   // Flag to indicate if the request contains audio.
   MediaStreamType audio_type;
 
   // Flag to indicate if the request contains video.
   MediaStreamType video_type;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_