Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Unified Diff: content/renderer/media/media_stream_dispatcher.cc

Issue 10912004: Begin adding support for tab mirroring via the MediaStream audio/video capturing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 8 years, 3 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
Index: content/renderer/media/media_stream_dispatcher.cc
diff --git a/content/renderer/media/media_stream_dispatcher.cc b/content/renderer/media/media_stream_dispatcher.cc
index 5d97ca0135a04ff79a8b149e1662bca9321c0b68..228bd85e3155abe86fb4851bb5e55b274e8905e0 100644
--- a/content/renderer/media/media_stream_dispatcher.cc
+++ b/content/renderer/media/media_stream_dispatcher.cc
@@ -81,6 +81,24 @@ void MediaStreamDispatcher::GenerateStream(
security_origin));
}
+void MediaStreamDispatcher::GenerateStreamForDevice(
+ int request_id,
+ const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
+ media_stream::StreamOptions components,
+ const std::string& device_id,
+ const GURL& security_origin) {
+ DCHECK(main_loop_->BelongsToCurrentThread());
+ DVLOG(1) << "MediaStreamDispatcher::GenerateStreamForDevice("
+ << request_id << ")";
+
+ requests_.push_back(Request(event_handler, request_id, next_ipc_id_));
+ Send(new MediaStreamHostMsg_GenerateStreamForDevice(routing_id(),
+ next_ipc_id_++,
+ components,
+ device_id,
+ security_origin));
+}
+
void MediaStreamDispatcher::CancelGenerateStream(int request_id) {
DCHECK(main_loop_->BelongsToCurrentThread());
DVLOG(1) << "MediaStreamDispatcher::CancelGenerateStream"
@@ -117,16 +135,15 @@ void MediaStreamDispatcher::EnumerateDevices(
media_stream::MediaStreamType type,
const GURL& security_origin) {
DCHECK(main_loop_->BelongsToCurrentThread());
- DCHECK(type == content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE ||
- type == content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE);
+ DCHECK(type == content::MEDIA_DEVICE_AUDIO_CAPTURE ||
+ type == content::MEDIA_DEVICE_VIDEO_CAPTURE);
DVLOG(1) << "MediaStreamDispatcher::EnumerateDevices("
<< request_id << ")";
EnumerationState* state =
- (type == content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE ?
+ (type == content::MEDIA_DEVICE_AUDIO_CAPTURE ?
&audio_enumeration_state_ : &video_enumeration_state_);
- state->requests.push_back(
- EnumerationRequest(event_handler, request_id));
+ state->requests.push_back(EnumerationRequest(event_handler, request_id));
if (state->cached_devices.get()) {
event_handler->OnDevicesEnumerated(
@@ -365,11 +382,12 @@ void MediaStreamDispatcher::OnDeviceOpened(
if (request.ipc_request == request_id) {
Stream new_stream;
new_stream.handler = request.handler;
- if (device_info.stream_type ==
- content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE) {
+ if (content::IsAudioMediaType(device_info.stream_type)) {
+ new_stream.audio_array.push_back(device_info);
+ } else if (content::IsVideoMediaType(device_info.stream_type)) {
new_stream.video_array.push_back(device_info);
} else {
- new_stream.audio_array.push_back(device_info);
+ NOTREACHED();
}
label_stream_map_[label] = new_stream;
if (request.handler) {
« no previous file with comments | « content/renderer/media/media_stream_dispatcher.h ('k') | content/renderer/media/media_stream_dispatcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698