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

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

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