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

Side by Side Diff: content/renderer/media/media_stream_center.cc

Issue 131763002: Adds MediaStreamSource, MediaStreamAudioSource and MediaStreamVideoCaptureDeviceSource (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/media_stream_center.h" 5 #include "content/renderer/media/media_stream_center.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "content/common/media/media_stream_messages.h" 14 #include "content/common/media/media_stream_messages.h"
15 #include "content/public/common/content_switches.h" 15 #include "content/public/common/content_switches.h"
16 #include "content/public/renderer/render_thread.h" 16 #include "content/public/renderer/render_thread.h"
17 #include "content/renderer/media/media_stream_dependency_factory.h" 17 #include "content/renderer/media/media_stream_dependency_factory.h"
18 #include "content/renderer/media/media_stream_extra_data.h" 18 #include "content/renderer/media/media_stream_extra_data.h"
19 #include "content/renderer/media/media_stream_source_extra_data.h" 19 #include "content/renderer/media/media_stream_source.h"
20 #include "content/renderer/media/media_stream_track_extra_data.h" 20 #include "content/renderer/media/media_stream_track_extra_data.h"
21 #include "content/renderer/render_view_impl.h" 21 #include "content/renderer/render_view_impl.h"
22 #include "third_party/WebKit/public/platform/WebMediaStream.h" 22 #include "third_party/WebKit/public/platform/WebMediaStream.h"
23 #include "third_party/WebKit/public/platform/WebMediaStreamCenterClient.h" 23 #include "third_party/WebKit/public/platform/WebMediaStreamCenterClient.h"
24 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 24 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
25 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 25 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
26 #include "third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h " 26 #include "third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h "
27 #include "third_party/WebKit/public/platform/WebSourceInfo.h" 27 #include "third_party/WebKit/public/platform/WebSourceInfo.h"
28 #include "third_party/WebKit/public/platform/WebVector.h" 28 #include "third_party/WebKit/public/platform/WebVector.h"
29 #include "third_party/WebKit/public/web/WebFrame.h" 29 #include "third_party/WebKit/public/web/WebFrame.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 webrtc::MediaStreamTrackInterface* native_track = 73 webrtc::MediaStreamTrackInterface* native_track =
74 MediaStreamDependencyFactory::GetNativeMediaStreamTrack(track); 74 MediaStreamDependencyFactory::GetNativeMediaStreamTrack(track);
75 if (native_track) 75 if (native_track)
76 native_track->set_enabled(false); 76 native_track->set_enabled(false);
77 } 77 }
78 78
79 bool MediaStreamCenter::didStopMediaStreamTrack( 79 bool MediaStreamCenter::didStopMediaStreamTrack(
80 const blink::WebMediaStreamTrack& track) { 80 const blink::WebMediaStreamTrack& track) {
81 DVLOG(1) << "MediaStreamCenter::didStopMediaStreamTrack"; 81 DVLOG(1) << "MediaStreamCenter::didStopMediaStreamTrack";
82 blink::WebMediaStreamSource source = track.source(); 82 blink::WebMediaStreamSource source = track.source();
83 MediaStreamSourceExtraData* extra_data = 83 MediaStreamSource* extra_data =
84 static_cast<MediaStreamSourceExtraData*>(source.extraData()); 84 static_cast<MediaStreamSource*>(source.extraData());
85 if (!extra_data) { 85 if (!extra_data) {
86 DVLOG(1) << "didStopMediaStreamTrack called on a remote track."; 86 DVLOG(1) << "didStopMediaStreamTrack called on a remote track.";
87 return false; 87 return false;
88 } 88 }
89 89
90 extra_data->OnLocalSourceStop(); 90 extra_data->StopSource();
91 return true; 91 return true;
92 } 92 }
93 93
94 void MediaStreamCenter::didStopLocalMediaStream( 94 void MediaStreamCenter::didStopLocalMediaStream(
95 const blink::WebMediaStream& stream) { 95 const blink::WebMediaStream& stream) {
96 DVLOG(1) << "MediaStreamCenter::didStopLocalMediaStream"; 96 DVLOG(1) << "MediaStreamCenter::didStopLocalMediaStream";
97 MediaStreamExtraData* extra_data = 97 MediaStreamExtraData* extra_data =
98 static_cast<MediaStreamExtraData*>(stream.extraData()); 98 static_cast<MediaStreamExtraData*>(stream.extraData());
99 if (!extra_data) { 99 if (!extra_data) {
100 NOTREACHED(); 100 NOTREACHED();
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 device.type == MEDIA_DEVICE_AUDIO_CAPTURE 183 device.type == MEDIA_DEVICE_AUDIO_CAPTURE
184 ? blink::WebSourceInfo::SourceKindAudio 184 ? blink::WebSourceInfo::SourceKindAudio
185 : blink::WebSourceInfo::SourceKindVideo, 185 : blink::WebSourceInfo::SourceKindVideo,
186 blink::WebString::fromUTF8(device.name), 186 blink::WebString::fromUTF8(device.name),
187 video_facing); 187 video_facing);
188 } 188 }
189 request_it->second.requestSucceeded(sourceInfos); 189 request_it->second.requestSucceeded(sourceInfos);
190 } 190 }
191 191
192 } // namespace content 192 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_audio_source.cc ('k') | content/renderer/media/media_stream_dependency_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698