diff options
| author | yujie.mao@intel.com <yujie.mao@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-30 16:19:20 +0000 |
|---|---|---|
| committer | yujie.mao@intel.com <yujie.mao@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-30 16:19:20 +0000 |
| commit | e5bbe3d1366b0fda6d68aac22f904fd72f521b59 (patch) | |
| tree | c685462ad34abc4a114e70bfd451bf0568af445c /content/renderer | |
| parent | 5674720ea0ff65e5678cc85bc6e6c065ae20a06b (diff) | |
| download | chromium_src-e5bbe3d1366b0fda6d68aac22f904fd72f521b59.zip chromium_src-e5bbe3d1366b0fda6d68aac22f904fd72f521b59.tar.gz chromium_src-e5bbe3d1366b0fda6d68aac22f904fd72f521b59.tar.bz2 | |
Shift media_stream::StreamOptions to align with the new getUserMedia spec
The new getUserMedia spec accept user media options like a dictionary format navigator.webkitGetUserMedia({audio:true, video:true}, ...) to replace its old style navigator.webkitGetUserMedia("audio, video", ...)
BUG=113673
TEST=content_unittests, media_unittests
Review URL: http://codereview.chromium.org/10177008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134539 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/media/media_stream_dispatcher_unittest.cc | 6 | ||||
| -rw-r--r-- | content/renderer/media/media_stream_impl.cc | 7 | ||||
| -rw-r--r-- | content/renderer/media/mock_media_stream_dispatcher.cc | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/content/renderer/media/media_stream_dispatcher_unittest.cc b/content/renderer/media/media_stream_dispatcher_unittest.cc index bc14972..b0f0a6d 100644 --- a/content/renderer/media/media_stream_dispatcher_unittest.cc +++ b/content/renderer/media/media_stream_dispatcher_unittest.cc @@ -90,8 +90,7 @@ TEST(MediaStreamDispatcherTest, BasicStream) { scoped_ptr<MediaStreamDispatcher> dispatcher(new MediaStreamDispatcher(NULL)); scoped_ptr<MockMediaStreamDispatcherEventHandler> handler(new MockMediaStreamDispatcherEventHandler); - media_stream::StreamOptions components( - true, media_stream::StreamOptions::kFacingUser); + media_stream::StreamOptions components(true, true); std::string security_origin; int ipc_request_id1 = dispatcher->next_ipc_id_; @@ -253,8 +252,7 @@ TEST(MediaStreamDispatcherTest, TestFailure) { scoped_ptr<MediaStreamDispatcher> dispatcher(new MediaStreamDispatcher(NULL)); scoped_ptr<MockMediaStreamDispatcherEventHandler> handler(new MockMediaStreamDispatcherEventHandler); - media_stream::StreamOptions components( - true, media_stream::StreamOptions::kFacingUser); + media_stream::StreamOptions components(true, true); std::string security_origin; // Test failure when creating a stream. diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc index 4add708..f8c98a4 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); } diff --git a/content/renderer/media/mock_media_stream_dispatcher.cc b/content/renderer/media/mock_media_stream_dispatcher.cc index 4a85e39d..7adb17e 100644 --- a/content/renderer/media/mock_media_stream_dispatcher.cc +++ b/content/renderer/media/mock_media_stream_dispatcher.cc @@ -22,7 +22,7 @@ void MockMediaStreamDispatcher::GenerateStream( event_handler_ = event_handler; delete components_; components_ = new media_stream::StreamOptions(components.audio, - components.video_option); + components.video); security_origin_ = security_origin; } |