content/browser/renderer_host/media/media_stream_ui_proxy.cc - Issue 34393006: Refactor MediaStreamManager to never output real device id. It now always output sourceId in the fo…

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_proxy.cc

Issue 34393006: Refactor MediaStreamManager to never output real device id. It now always output sourceId in the fo… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix broken video_capture_host unittests. Addressed justinlinlins comments. Created 7 years, 2 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/media_stream_manager.cc ('K') | « content/browser/renderer_host/media/media_stream_provider.h ('k') | content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc » ('j') | content/public/common/media_stream_request.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 3e4edbc0ac03b672d71c4aa2c91e06a997199cd6..cd25204be648294af32c7f08a56c994d23d4c44d 100644

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

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

@@ -193,12 +193,16 @@ void FakeMediaStreamUIProxy::RequestAccess(

it != devices_.end(); ++it) {

if (!accepted_audio &&

IsAudioMediaType(request.audio_type) &&

- IsAudioMediaType(it->type)) {

- devices_to_use.push_back(*it);

- accepted_audio = true;

+ IsAudioMediaType(it->type) &&

+ (request.requested_audio_device_id.empty() ||

+ request.requested_audio_device_id == it->id)) {

+ devices_to_use.push_back(*it);

+ accepted_audio = true;

} else if (!accepted_video &&

IsVideoMediaType(request.video_type) &&

- IsVideoMediaType(it->type)) {

+ IsVideoMediaType(it->type) &&

+ (request.requested_video_device_id.empty() ||

+ request.requested_video_device_id == it->id)) {

devices_to_use.push_back(*it);

accepted_video = true;

}