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

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

Issue 2471803002: Remove MediaStreamTrack.getSources(). (Closed)
Patch Set: Fix platform-specific expectations file Created 4 years, 1 month 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
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_USER_MEDIA_CLIENT_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_USER_MEDIA_CLIENT_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_USER_MEDIA_CLIENT_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_USER_MEDIA_CLIENT_IMPL_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.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/common/media/media_devices.h" 19 #include "content/common/media/media_devices.h"
20 #include "content/common/media/media_devices.mojom.h" 20 #include "content/common/media/media_devices.mojom.h"
21 #include "content/public/renderer/render_frame_observer.h" 21 #include "content/public/renderer/render_frame_observer.h"
22 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h" 22 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
23 #include "content/renderer/media/media_stream_source.h" 23 #include "content/renderer/media/media_stream_source.h"
24 #include "services/service_manager/public/cpp/interface_provider.h" 24 #include "services/service_manager/public/cpp/interface_provider.h"
25 #include "third_party/WebKit/public/platform/WebMediaStream.h" 25 #include "third_party/WebKit/public/platform/WebMediaStream.h"
26 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 26 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
27 #include "third_party/WebKit/public/platform/WebSourceInfo.h"
28 #include "third_party/WebKit/public/platform/WebVector.h" 27 #include "third_party/WebKit/public/platform/WebVector.h"
29 #include "third_party/WebKit/public/web/WebMediaDeviceChangeObserver.h" 28 #include "third_party/WebKit/public/web/WebMediaDeviceChangeObserver.h"
30 #include "third_party/WebKit/public/web/WebMediaDevicesRequest.h" 29 #include "third_party/WebKit/public/web/WebMediaDevicesRequest.h"
31 #include "third_party/WebKit/public/web/WebUserMediaClient.h" 30 #include "third_party/WebKit/public/web/WebUserMediaClient.h"
32 #include "third_party/WebKit/public/web/WebUserMediaRequest.h" 31 #include "third_party/WebKit/public/web/WebUserMediaRequest.h"
33 32
34 namespace content { 33 namespace content {
35 class PeerConnectionDependencyFactory; 34 class PeerConnectionDependencyFactory;
36 class MediaStreamAudioSource; 35 class MediaStreamAudioSource;
37 class MediaStreamDispatcher; 36 class MediaStreamDispatcher;
(...skipping 22 matching lines...) Expand all
60 return media_stream_dispatcher_.get(); 59 return media_stream_dispatcher_.get();
61 } 60 }
62 61
63 // blink::WebUserMediaClient implementation 62 // blink::WebUserMediaClient implementation
64 void requestUserMedia( 63 void requestUserMedia(
65 const blink::WebUserMediaRequest& user_media_request) override; 64 const blink::WebUserMediaRequest& user_media_request) override;
66 void cancelUserMediaRequest( 65 void cancelUserMediaRequest(
67 const blink::WebUserMediaRequest& user_media_request) override; 66 const blink::WebUserMediaRequest& user_media_request) override;
68 void requestMediaDevices( 67 void requestMediaDevices(
69 const blink::WebMediaDevicesRequest& media_devices_request) override; 68 const blink::WebMediaDevicesRequest& media_devices_request) override;
70 void requestSources(
71 const blink::WebMediaStreamTrackSourcesRequest& sources_request) override;
72 void setMediaDeviceChangeObserver( 69 void setMediaDeviceChangeObserver(
73 const blink::WebMediaDeviceChangeObserver& observer) override; 70 const blink::WebMediaDeviceChangeObserver& observer) override;
74 71
75 // MediaStreamDispatcherEventHandler implementation. 72 // MediaStreamDispatcherEventHandler implementation.
76 void OnStreamGenerated(int request_id, 73 void OnStreamGenerated(int request_id,
77 const std::string& label, 74 const std::string& label,
78 const StreamDeviceInfoArray& audio_array, 75 const StreamDeviceInfoArray& audio_array,
79 const StreamDeviceInfoArray& video_array) override; 76 const StreamDeviceInfoArray& video_array) override;
80 void OnStreamGenerationFailed(int request_id, 77 void OnStreamGenerationFailed(int request_id,
81 MediaStreamRequestResult result) override; 78 MediaStreamRequestResult result) override;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 MediaStreamRequestResult result, 110 MediaStreamRequestResult result,
114 const blink::WebString& result_name); 111 const blink::WebString& result_name);
115 void DelayedGetUserMediaRequestFailed( 112 void DelayedGetUserMediaRequestFailed(
116 blink::WebUserMediaRequest request_info, 113 blink::WebUserMediaRequest request_info,
117 MediaStreamRequestResult result, 114 MediaStreamRequestResult result,
118 const blink::WebString& result_name); 115 const blink::WebString& result_name);
119 116
120 virtual void EnumerateDevicesSucceded( 117 virtual void EnumerateDevicesSucceded(
121 blink::WebMediaDevicesRequest* request, 118 blink::WebMediaDevicesRequest* request,
122 blink::WebVector<blink::WebMediaDeviceInfo>& devices); 119 blink::WebVector<blink::WebMediaDeviceInfo>& devices);
123 virtual void EnumerateSourcesSucceded(
124 blink::WebMediaStreamTrackSourcesRequest* request,
125 blink::WebVector<blink::WebSourceInfo>& sources);
126 120
127 // Creates a MediaStreamAudioSource/MediaStreamVideoSource objects. 121 // Creates a MediaStreamAudioSource/MediaStreamVideoSource objects.
128 // These are virtual for test purposes. 122 // These are virtual for test purposes.
129 virtual MediaStreamAudioSource* CreateAudioSource( 123 virtual MediaStreamAudioSource* CreateAudioSource(
130 const StreamDeviceInfo& device, 124 const StreamDeviceInfo& device,
131 const blink::WebMediaConstraints& constraints); 125 const blink::WebMediaConstraints& constraints);
132 virtual MediaStreamVideoSource* CreateVideoSource( 126 virtual MediaStreamVideoSource* CreateVideoSource(
133 const StreamDeviceInfo& device, 127 const StreamDeviceInfo& device,
134 const MediaStreamSource::SourceStoppedCallback& stop_callback); 128 const MediaStreamSource::SourceStoppedCallback& stop_callback);
135 129
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 MediaStreamRequestResult result, 221 MediaStreamRequestResult result,
228 const blink::WebString& result_name); 222 const blink::WebString& result_name);
229 223
230 void OnStreamGeneratedForCancelledRequest( 224 void OnStreamGeneratedForCancelledRequest(
231 const StreamDeviceInfoArray& audio_array, 225 const StreamDeviceInfoArray& audio_array,
232 const StreamDeviceInfoArray& video_array); 226 const StreamDeviceInfoArray& video_array);
233 227
234 using EnumerationResult = std::vector<std::vector<MediaDeviceInfo>>; 228 using EnumerationResult = std::vector<std::vector<MediaDeviceInfo>>;
235 void FinalizeEnumerateDevices(blink::WebMediaDevicesRequest request, 229 void FinalizeEnumerateDevices(blink::WebMediaDevicesRequest request,
236 const EnumerationResult& result); 230 const EnumerationResult& result);
237 void FinalizeGetSources(blink::WebMediaStreamTrackSourcesRequest request,
238 const EnumerationResult& result);
239 231
240 void DeleteAllUserMediaRequests(); 232 void DeleteAllUserMediaRequests();
241 233
242 // Returns the source that use a device with |device.session_id| 234 // Returns the source that use a device with |device.session_id|
243 // and |device.device.id|. NULL if such source doesn't exist. 235 // and |device.device.id|. NULL if such source doesn't exist.
244 const blink::WebMediaStreamSource* FindLocalSource( 236 const blink::WebMediaStreamSource* FindLocalSource(
245 const StreamDeviceInfo& device) const; 237 const StreamDeviceInfo& device) const;
246 238
247 // Returns true if we do find and remove the |source|. 239 // Returns true if we do find and remove the |source|.
248 // Otherwise returns false. 240 // Otherwise returns false.
(...skipping 25 matching lines...) Expand all
274 // Note: This member must be the last to ensure all outstanding weak pointers 266 // Note: This member must be the last to ensure all outstanding weak pointers
275 // are invalidated first. 267 // are invalidated first.
276 base::WeakPtrFactory<UserMediaClientImpl> weak_factory_; 268 base::WeakPtrFactory<UserMediaClientImpl> weak_factory_;
277 269
278 DISALLOW_COPY_AND_ASSIGN(UserMediaClientImpl); 270 DISALLOW_COPY_AND_ASSIGN(UserMediaClientImpl);
279 }; 271 };
280 272
281 } // namespace content 273 } // namespace content
282 274
283 #endif // CONTENT_RENDERER_MEDIA_USER_MEDIA_CLIENT_IMPL_H_ 275 #endif // CONTENT_RENDERER_MEDIA_USER_MEDIA_CLIENT_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_center.cc ('k') | content/renderer/media/user_media_client_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698