diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-09 06:53:28 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-09 06:53:28 +0000 |
| commit | a6cb8bca67f3cf4daf2a9ef86ade994efb7554d4 (patch) | |
| tree | bc2f769ee81bc9a97be48e8f6e45f5713fceb42f /content/renderer/media | |
| parent | 6eb4d94bf5cb9c8896c2544eeea9e81c800e38b9 (diff) | |
| download | chromium_src-a6cb8bca67f3cf4daf2a9ef86ade994efb7554d4.zip chromium_src-a6cb8bca67f3cf4daf2a9ef86ade994efb7554d4.tar.gz chromium_src-a6cb8bca67f3cf4daf2a9ef86ade994efb7554d4.tar.bz2 | |
Add DesktopMediaId type to identify desktop media source.
Also replaced content::MEDIA_SCREEN_VIDEO_CAPTURE with
content::MEDIA_DESKTOP_VIDEO_CAPTURE which will be used to identify all
types of desktop media sources.
BUG=237907
R=jam@chromium.org, xians@chromium.org
Review URL: https://codereview.chromium.org/22370010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216617 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media')
| -rw-r--r-- | content/renderer/media/media_stream_dependency_factory.cc | 2 | ||||
| -rw-r--r-- | content/renderer/media/media_stream_impl.cc | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc index 7f5e64a..3d07ce8 100644 --- a/content/renderer/media/media_stream_dependency_factory.cc +++ b/content/renderer/media/media_stream_dependency_factory.cc @@ -286,7 +286,7 @@ void MediaStreamDependencyFactory::CreateNativeMediaSources( source_data->device_info().device.type == content::MEDIA_TAB_VIDEO_CAPTURE || source_data->device_info().device.type == - content::MEDIA_SCREEN_VIDEO_CAPTURE; + content::MEDIA_DESKTOP_VIDEO_CAPTURE; source_data->SetVideoSource( CreateLocalVideoSource(source_data->device_info().session_id, is_screencast, diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc index abe68a2..ac66f23 100644 --- a/content/renderer/media/media_stream_impl.cc +++ b/content/renderer/media/media_stream_impl.cc @@ -10,6 +10,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "content/public/common/desktop_media_id.h" #include "content/renderer/media/media_stream_audio_renderer.h" #include "content/renderer/media/media_stream_dependency_factory.h" #include "content/renderer/media/media_stream_dispatcher.h" @@ -71,7 +72,9 @@ void UpdateRequestOptions( user_media_request.videoConstraints(), kMediaStreamSourceId, true); } else if (video_stream_source == kMediaStreamSourceScreen) { - options->video_type = content::MEDIA_SCREEN_VIDEO_CAPTURE; + options->video_type = content::MEDIA_DESKTOP_VIDEO_CAPTURE; + options->video_device_id = + DesktopMediaID(DesktopMediaID::TYPE_SCREEN, 0).ToString(); } } } |