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

Side by Side Diff: content/renderer/media/media_stream_impl.h

Issue 287383002: Implement getMediaDevices. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 6 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 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/scoped_vector.h" 15 #include "base/memory/scoped_vector.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "base/threading/non_thread_safe.h" 17 #include "base/threading/non_thread_safe.h"
18 #include "content/common/content_export.h" 18 #include "content/common/content_export.h"
19 #include "content/public/renderer/render_view_observer.h" 19 #include "content/public/renderer/render_view_observer.h"
20 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h" 20 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
21 #include "content/renderer/media/media_stream_source.h" 21 #include "content/renderer/media/media_stream_source.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/WebMediaStreamSource.h" 23 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
24 #include "third_party/WebKit/public/platform/WebVector.h" 24 #include "third_party/WebKit/public/platform/WebVector.h"
25 #include "third_party/WebKit/public/web/WebMediaDevicesRequest.h"
25 #include "third_party/WebKit/public/web/WebUserMediaClient.h" 26 #include "third_party/WebKit/public/web/WebUserMediaClient.h"
26 #include "third_party/WebKit/public/web/WebUserMediaRequest.h" 27 #include "third_party/WebKit/public/web/WebUserMediaRequest.h"
27 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" 28 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
28 29
29 namespace content { 30 namespace content {
30 class PeerConnectionDependencyFactory; 31 class PeerConnectionDependencyFactory;
31 class MediaStreamDispatcher; 32 class MediaStreamDispatcher;
32 class MediaStreamVideoSource; 33 class MediaStreamVideoSource;
33 class VideoCapturerDelegate; 34 class VideoCapturerDelegate;
34 35
(...skipping 14 matching lines...) Expand all
49 RenderView* render_view, 50 RenderView* render_view,
50 MediaStreamDispatcher* media_stream_dispatcher, 51 MediaStreamDispatcher* media_stream_dispatcher,
51 PeerConnectionDependencyFactory* dependency_factory); 52 PeerConnectionDependencyFactory* dependency_factory);
52 virtual ~MediaStreamImpl(); 53 virtual ~MediaStreamImpl();
53 54
54 // blink::WebUserMediaClient implementation 55 // blink::WebUserMediaClient implementation
55 virtual void requestUserMedia( 56 virtual void requestUserMedia(
56 const blink::WebUserMediaRequest& user_media_request); 57 const blink::WebUserMediaRequest& user_media_request);
57 virtual void cancelUserMediaRequest( 58 virtual void cancelUserMediaRequest(
58 const blink::WebUserMediaRequest& user_media_request); 59 const blink::WebUserMediaRequest& user_media_request);
60 virtual void requestMediaDevices(
61 const blink::WebMediaDevicesRequest& media_devices_request) OVERRIDE;
62 virtual void cancelMediaDevicesRequest(
63 const blink::WebMediaDevicesRequest& media_devices_request) OVERRIDE;
59 64
60 // MediaStreamDispatcherEventHandler implementation. 65 // MediaStreamDispatcherEventHandler implementation.
61 virtual void OnStreamGenerated( 66 virtual void OnStreamGenerated(
62 int request_id, 67 int request_id,
63 const std::string& label, 68 const std::string& label,
64 const StreamDeviceInfoArray& audio_array, 69 const StreamDeviceInfoArray& audio_array,
65 const StreamDeviceInfoArray& video_array) OVERRIDE; 70 const StreamDeviceInfoArray& video_array) OVERRIDE;
66 virtual void OnStreamGenerationFailed( 71 virtual void OnStreamGenerationFailed(
67 int request_id, 72 int request_id,
68 content::MediaStreamRequestResult result) OVERRIDE; 73 content::MediaStreamRequestResult result) OVERRIDE;
(...skipping 18 matching lines...) Expand all
87 92
88 // These methods are virtual for test purposes. A test can override them to 93 // These methods are virtual for test purposes. A test can override them to
89 // test requesting local media streams. The function notifies WebKit that the 94 // test requesting local media streams. The function notifies WebKit that the
90 // |request| have completed. 95 // |request| have completed.
91 virtual void GetUserMediaRequestSucceeded( 96 virtual void GetUserMediaRequestSucceeded(
92 const blink::WebMediaStream& stream, 97 const blink::WebMediaStream& stream,
93 blink::WebUserMediaRequest* request_info); 98 blink::WebUserMediaRequest* request_info);
94 virtual void GetUserMediaRequestFailed( 99 virtual void GetUserMediaRequestFailed(
95 blink::WebUserMediaRequest* request_info, 100 blink::WebUserMediaRequest* request_info,
96 content::MediaStreamRequestResult result); 101 content::MediaStreamRequestResult result);
97 102 virtual void EnumerateDevicesSucceded(
103 blink::WebMediaDevicesRequest* request,
104 blink::WebVector<blink::WebMediaDeviceInfo>& devices);
98 // Creates a MediaStreamVideoSource object. 105 // Creates a MediaStreamVideoSource object.
99 // This is virtual for test purposes. 106 // This is virtual for test purposes.
100 virtual MediaStreamVideoSource* CreateVideoSource( 107 virtual MediaStreamVideoSource* CreateVideoSource(
101 const StreamDeviceInfo& device, 108 const StreamDeviceInfo& device,
102 const MediaStreamSource::SourceStoppedCallback& stop_callback); 109 const MediaStreamSource::SourceStoppedCallback& stop_callback);
103 110
104 private: 111 private:
105 // Class for storing information about a WebKit request to create a 112 // Class for storing information about a WebKit request to create a
106 // MediaStream. 113 // MediaStream.
107 class UserMediaRequestInfo 114 class UserMediaRequestInfo
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 const blink::WebMediaStreamSource& source) 165 const blink::WebMediaStreamSource& source)
159 : frame(frame), source(source) { 166 : frame(frame), source(source) {
160 } 167 }
161 // |frame| is the WebFrame that requested |source|. NULL in unit tests. 168 // |frame| is the WebFrame that requested |source|. NULL in unit tests.
162 // TODO(perkj): Change so that |frame| is not NULL in unit tests. 169 // TODO(perkj): Change so that |frame| is not NULL in unit tests.
163 blink::WebFrame* frame; 170 blink::WebFrame* frame;
164 blink::WebMediaStreamSource source; 171 blink::WebMediaStreamSource source;
165 }; 172 };
166 typedef std::vector<LocalStreamSource> LocalStreamSources; 173 typedef std::vector<LocalStreamSource> LocalStreamSources;
167 174
175 struct MediaDevicesRequestInfo;
176 typedef ScopedVector<MediaDevicesRequestInfo> MediaDevicesRequests;
177
168 // Creates a WebKit representation of stream sources based on 178 // Creates a WebKit representation of stream sources based on
169 // |devices| from the MediaStreamDispatcher. 179 // |devices| from the MediaStreamDispatcher.
170 void InitializeSourceObject( 180 void InitializeSourceObject(
171 const StreamDeviceInfo& device, 181 const StreamDeviceInfo& device,
172 blink::WebMediaStreamSource::Type type, 182 blink::WebMediaStreamSource::Type type,
173 const blink::WebMediaConstraints& constraints, 183 const blink::WebMediaConstraints& constraints,
174 blink::WebFrame* frame, 184 blink::WebFrame* frame,
175 blink::WebMediaStreamSource* webkit_source); 185 blink::WebMediaStreamSource* webkit_source);
176 186
177 void CreateVideoTracks( 187 void CreateVideoTracks(
(...skipping 12 matching lines...) Expand all
190 // underlying media sources and tracks have been created and started. 200 // underlying media sources and tracks have been created and started.
191 void OnCreateNativeTracksCompleted( 201 void OnCreateNativeTracksCompleted(
192 UserMediaRequestInfo* request, 202 UserMediaRequestInfo* request,
193 content::MediaStreamRequestResult result); 203 content::MediaStreamRequestResult result);
194 204
195 UserMediaRequestInfo* FindUserMediaRequestInfo(int request_id); 205 UserMediaRequestInfo* FindUserMediaRequestInfo(int request_id);
196 UserMediaRequestInfo* FindUserMediaRequestInfo( 206 UserMediaRequestInfo* FindUserMediaRequestInfo(
197 const blink::WebUserMediaRequest& request); 207 const blink::WebUserMediaRequest& request);
198 void DeleteUserMediaRequestInfo(UserMediaRequestInfo* request); 208 void DeleteUserMediaRequestInfo(UserMediaRequestInfo* request);
199 209
210 MediaDevicesRequestInfo* FindMediaDevicesRequestInfo(int request_id);
211 MediaDevicesRequestInfo* FindMediaDevicesRequestInfo(
212 const blink::WebMediaDevicesRequest& request);
213 void DeleteMediaDevicesRequestInfo(MediaDevicesRequestInfo* request);
214
200 // Returns the source that use a device with |device.session_id| 215 // Returns the source that use a device with |device.session_id|
201 // and |device.device.id|. NULL if such source doesn't exist. 216 // and |device.device.id|. NULL if such source doesn't exist.
202 const blink::WebMediaStreamSource* FindLocalSource( 217 const blink::WebMediaStreamSource* FindLocalSource(
203 const StreamDeviceInfo& device) const; 218 const StreamDeviceInfo& device) const;
204 219
205 void StopLocalSource(const blink::WebMediaStreamSource& source, 220 void StopLocalSource(const blink::WebMediaStreamSource& source,
206 bool notify_dispatcher); 221 bool notify_dispatcher);
207 222
208 // Weak ref to a PeerConnectionDependencyFactory, owned by the RenderThread. 223 // Weak ref to a PeerConnectionDependencyFactory, owned by the RenderThread.
209 // It's valid for the lifetime of RenderThread. 224 // It's valid for the lifetime of RenderThread.
210 // TODO(xians): Remove this dependency once audio do not need it for local 225 // TODO(xians): Remove this dependency once audio do not need it for local
211 // audio. 226 // audio.
212 PeerConnectionDependencyFactory* dependency_factory_; 227 PeerConnectionDependencyFactory* dependency_factory_;
213 228
214 // media_stream_dispatcher_ is a weak reference, owned by RenderView. It's 229 // media_stream_dispatcher_ is a weak reference, owned by RenderView. It's
215 // valid for the lifetime of RenderView. 230 // valid for the lifetime of RenderView.
216 MediaStreamDispatcher* media_stream_dispatcher_; 231 MediaStreamDispatcher* media_stream_dispatcher_;
217 232
218 LocalStreamSources local_sources_; 233 LocalStreamSources local_sources_;
219 234
220 UserMediaRequests user_media_requests_; 235 UserMediaRequests user_media_requests_;
221 236
237 // Requests to enumerate media devices.
238 MediaDevicesRequests media_devices_requests_;
239
222 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl); 240 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);
223 }; 241 };
224 242
225 } // namespace content 243 } // namespace content
226 244
227 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ 245 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_dispatcher.h ('k') | content/renderer/media/media_stream_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698