content/browser/renderer_host/media/media_stream_ui_controller.cc - Issue 11783059: Ensures that WebRTC works for device selection using a different sample rate than default

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/media/media_stream_ui_controller.cc

Issue 11783059: Ensures that WebRTC works for device selection using a different sample rate than default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed content_unittests Created 7 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/renderer_host/media/audio_input_device_manager.cc ('K') | « content/browser/renderer_host/media/media_stream_manager.cc ('k') | content/common/media/media_stream_messages.h » ('j') | content/public/common/media_stream_request.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/media_stream_ui_controller.cc

diff --git a/content/browser/renderer_host/media/media_stream_ui_controller.cc b/content/browser/renderer_host/media/media_stream_ui_controller.cc

index fafb6990e0161a074f5a8c113ef1b8c06466657b..8ab3c007211f1ba590eab8da94b0f1f9141d6603 100644

--- a/content/browser/renderer_host/media/media_stream_ui_controller.cc

+++ b/content/browser/renderer_host/media/media_stream_ui_controller.cc

@@ -199,8 +199,13 @@ void MediaStreamUIController::PostResponse(

// though DevicesAccepted seems to do so.

for (MediaStreamDevices::const_iterator dev = devices.begin();

dev != devices.end(); ++dev) {

- device_list.push_back(StreamDeviceInfo(

- dev->type, dev->name, dev->id, false));

+ if (dev->type == content::MEDIA_DEVICE_AUDIO_CAPTURE)

tommi (sloooow) - chröme 2013/01/15 17:43:49 {}

henrika (OOO until Aug 14) 2013/01/16 16:37:17 Done.

+ device_list.push_back(StreamDeviceInfo(

+ content::MEDIA_DEVICE_AUDIO_CAPTURE, dev->name, dev->id,

+ dev->sample_rate, dev->channel_layout, false));

+ else

+ device_list.push_back(StreamDeviceInfo(

+ dev->type, dev->name, dev->id, false));

}

requester_->DevicesAccepted(label, device_list);