content/renderer/media/media_stream_impl.cc - Issue 10177008: Shift media_stream::StreamOptions to align with the new getUserMedia spec

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/renderer/media/media_stream_impl.cc

Issue 10177008: Shift media_stream::StreamOptions to align with the new getUserMedia spec (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: rebase Created 8 years, 8 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

« no previous file with comments | « content/renderer/media/media_stream_dispatcher_unittest.cc ('k') | content/renderer/media/mock_media_stream_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/media_stream_impl.cc

diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc

index 4add708772bce87f4e9b62f8a55518ce223e4c3c..f8c98a4e1e68bac495ff733c41957632f69b49c1 100644

--- a/content/renderer/media/media_stream_impl.cc

+++ b/content/renderer/media/media_stream_impl.cc

@@ -183,10 +183,7 @@ void MediaStreamImpl::requestUserMedia(

int request_id = g_next_request_id++;

bool audio = user_media_request.audio();

- media_stream::StreamOptions::VideoOption video_option =

- media_stream::StreamOptions::kNoCamera;

- if (user_media_request.video())

- video_option = media_stream::StreamOptions::kFacingBoth;

+ bool video = user_media_request.video();

std::string security_origin = UTF16ToUTF8(

user_media_request.securityOrigin().toString());

@@ -203,7 +200,7 @@ void MediaStreamImpl::requestUserMedia(

media_stream_dispatcher_->GenerateStream(

request_id,

AsWeakPtr(),

- media_stream::StreamOptions(audio, video_option),

+ media_stream::StreamOptions(audio, video),

security_origin);

}