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

content/public/common/media_stream_request.cc

 // 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.
 
 #include "content/public/common/media_stream_request.h"
 
+#include "base/logging.h"
+
 namespace content {
 
 bool IsAudioMediaType(MediaStreamType type) {
   return (type == content::MEDIA_DEVICE_AUDIO_CAPTURE ||
           type == content::MEDIA_TAB_AUDIO_CAPTURE);
 }
 
 bool IsVideoMediaType(MediaStreamType type) {
   return (type == content::MEDIA_DEVICE_VIDEO_CAPTURE ||
           type == content::MEDIA_TAB_VIDEO_CAPTURE);
 }
 
 MediaStreamDevice::MediaStreamDevice() : type(MEDIA_NO_SERVICE) {}
 
 MediaStreamDevice::MediaStreamDevice(
     MediaStreamType type,
     const std::string& id,
     const std::string& name)
     : type(type),
       id(id),
-      name(name) {
+      name(name),
+      sample_rate(0),
+      channel_layout(0) {
+  DCHECK(IsVideoMediaType(type));
+}
+
+MediaStreamDevice::MediaStreamDevice(
+    MediaStreamType type,
+    const std::string& id,
+    const std::string& name,
+    int sample_rate,
+    int channel_layout)
+    : type(type),
+      id(id),
+      name(name),
+      sample_rate(sample_rate),
+      channel_layout(channel_layout) {
+  DCHECK(IsAudioMediaType(type));

[tommi (sloooow) - chröme, 2013/01/15 17:43:49]

these dchecks are a nice touch.

[henrika (OOO until Aug 14), 2013/01/16 16:37:17]

I know ;-)

 }
 
 MediaStreamDevice::~MediaStreamDevice() {}
 
 MediaStreamRequest::MediaStreamRequest(
     int render_process_id,
     int render_view_id,
     const GURL& security_origin,
     MediaStreamRequestType request_type,
     MediaStreamType audio_type,
     MediaStreamType video_type)
     : render_process_id(render_process_id),
       render_view_id(render_view_id),
       security_origin(security_origin),
       request_type(request_type),
       audio_type(audio_type),
       video_type(video_type) {
 }
 
 MediaStreamRequest::~MediaStreamRequest() {}
 
 }  // namespace content