OLD | NEW |
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 <list> | 8 #include <list> |
9 #include <map> | 9 #include <map> |
10 #include <string> | 10 #include <string> |
(...skipping 23 matching lines...) Expand all Loading... |
34 class IpcNetworkManager; | 34 class IpcNetworkManager; |
35 class IpcPacketSocketFactory; | 35 class IpcPacketSocketFactory; |
36 class P2PSocketDispatcher; | 36 class P2PSocketDispatcher; |
37 } | 37 } |
38 | 38 |
39 namespace talk_base { | 39 namespace talk_base { |
40 class Thread; | 40 class Thread; |
41 } | 41 } |
42 | 42 |
43 namespace WebKit { | 43 namespace WebKit { |
| 44 class WebJSEPPeerConnectionHandler; |
| 45 class WebJSEPPeerConnectionHandlerClient; |
44 class WebPeerConnectionHandler; | 46 class WebPeerConnectionHandler; |
45 class WebPeerConnectionHandlerClient; | 47 class WebPeerConnectionHandlerClient; |
46 } | 48 } |
47 | 49 |
48 class MediaStreamDispatcher; | 50 class MediaStreamDispatcher; |
49 class MediaStreamDependencyFactory; | 51 class MediaStreamDependencyFactory; |
50 class PeerConnectionHandler; | 52 class PeerConnectionHandlerBase; |
51 class VideoCaptureImplManager; | 53 class VideoCaptureImplManager; |
52 class RTCVideoDecoder; | 54 class RTCVideoDecoder; |
53 | 55 |
54 // MediaStreamImpl is a delegate for the Media Stream API messages used by | 56 // MediaStreamImpl is a delegate for the Media Stream API messages used by |
55 // WebKit. It ties together WebKit, native PeerConnection in libjingle and | 57 // WebKit. It ties together WebKit, native PeerConnection in libjingle and |
56 // MediaStreamManager (via MediaStreamDispatcher and MediaStreamDispatcherHost) | 58 // MediaStreamManager (via MediaStreamDispatcher and MediaStreamDispatcherHost) |
57 // in the browser process. It must be created, called and destroyed on the | 59 // in the browser process. It must be created, called and destroyed on the |
58 // render thread. | 60 // render thread. |
59 class CONTENT_EXPORT MediaStreamImpl | 61 class CONTENT_EXPORT MediaStreamImpl |
60 : NON_EXPORTED_BASE(public WebKit::WebUserMediaClient), | 62 : NON_EXPORTED_BASE(public WebKit::WebUserMediaClient), |
61 NON_EXPORTED_BASE(public webkit_media::MediaStreamClient), | 63 NON_EXPORTED_BASE(public webkit_media::MediaStreamClient), |
62 public MediaStreamDispatcherEventHandler, | 64 public MediaStreamDispatcherEventHandler, |
63 NON_EXPORTED_BASE(public base::NonThreadSafe), | 65 NON_EXPORTED_BASE(public base::NonThreadSafe), |
64 public base::RefCountedThreadSafe<MediaStreamImpl> { | 66 public base::RefCountedThreadSafe<MediaStreamImpl> { |
65 public: | 67 public: |
66 MediaStreamImpl( | 68 MediaStreamImpl( |
67 MediaStreamDispatcher* media_stream_dispatcher, | 69 MediaStreamDispatcher* media_stream_dispatcher, |
68 content::P2PSocketDispatcher* p2p_socket_dispatcher, | 70 content::P2PSocketDispatcher* p2p_socket_dispatcher, |
69 VideoCaptureImplManager* vc_manager, | 71 VideoCaptureImplManager* vc_manager, |
70 MediaStreamDependencyFactory* dependency_factory); | 72 MediaStreamDependencyFactory* dependency_factory); |
71 virtual ~MediaStreamImpl(); | 73 virtual ~MediaStreamImpl(); |
72 | 74 |
73 virtual WebKit::WebPeerConnectionHandler* CreatePeerConnectionHandler( | 75 virtual WebKit::WebPeerConnectionHandler* CreatePeerConnectionHandler( |
74 WebKit::WebPeerConnectionHandlerClient* client); | 76 WebKit::WebPeerConnectionHandlerClient* client); |
| 77 virtual WebKit::WebJSEPPeerConnectionHandler* CreatePeerConnectionHandlerJsep( |
| 78 WebKit::WebJSEPPeerConnectionHandlerClient* client); |
75 virtual void ClosePeerConnection(); | 79 virtual void ClosePeerConnection(); |
76 virtual webrtc::MediaStreamTrackInterface* GetLocalMediaStreamTrack( | 80 virtual webrtc::MediaStreamTrackInterface* GetLocalMediaStreamTrack( |
77 const std::string& label); | 81 const std::string& label); |
78 | 82 |
79 // WebKit::WebUserMediaClient implementation | 83 // WebKit::WebUserMediaClient implementation |
80 virtual void requestUserMedia( | 84 virtual void requestUserMedia( |
81 const WebKit::WebUserMediaRequest& user_media_request, | 85 const WebKit::WebUserMediaRequest& user_media_request, |
82 const WebKit::WebVector<WebKit::WebMediaStreamSource>& | 86 const WebKit::WebVector<WebKit::WebMediaStreamSource>& |
83 media_stream_source_vector) OVERRIDE; | 87 media_stream_source_vector) OVERRIDE; |
84 virtual void cancelUserMediaRequest( | 88 virtual void cancelUserMediaRequest( |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 // We own network_manager_, must be deleted on the worker thread. | 153 // We own network_manager_, must be deleted on the worker thread. |
150 content::IpcNetworkManager* network_manager_; | 154 content::IpcNetworkManager* network_manager_; |
151 | 155 |
152 scoped_ptr<content::IpcPacketSocketFactory> socket_factory_; | 156 scoped_ptr<content::IpcPacketSocketFactory> socket_factory_; |
153 | 157 |
154 scoped_refptr<VideoCaptureImplManager> vc_manager_; | 158 scoped_refptr<VideoCaptureImplManager> vc_manager_; |
155 | 159 |
156 // peer_connection_handler_ is a weak reference, owned by WebKit. It's valid | 160 // peer_connection_handler_ is a weak reference, owned by WebKit. It's valid |
157 // until stop is called on it (which will call ClosePeerConnection on us). | 161 // until stop is called on it (which will call ClosePeerConnection on us). |
158 // TODO(grunell): Support several PeerConnectionsHandlers. | 162 // TODO(grunell): Support several PeerConnectionsHandlers. |
159 PeerConnectionHandler* peer_connection_handler_; | 163 PeerConnectionHandlerBase* peer_connection_handler_; |
160 | 164 |
161 // We keep a list of the generated local tracks, so that we can add capture | 165 // We keep a list of the generated local tracks, so that we can add capture |
162 // devices when generated and also use them for recording. | 166 // devices when generated and also use them for recording. |
163 typedef talk_base::scoped_refptr<webrtc::MediaStreamTrackInterface> | 167 typedef talk_base::scoped_refptr<webrtc::MediaStreamTrackInterface> |
164 MediaStreamTrackPtr; | 168 MediaStreamTrackPtr; |
165 typedef std::map<std::string, MediaStreamTrackPtr> MediaStreamTrackPtrMap; | 169 typedef std::map<std::string, MediaStreamTrackPtr> MediaStreamTrackPtrMap; |
166 MediaStreamTrackPtrMap local_tracks_; | 170 MediaStreamTrackPtrMap local_tracks_; |
167 | 171 |
168 talk_base::scoped_refptr<VideoRendererWrapper> video_renderer_; | 172 talk_base::scoped_refptr<VideoRendererWrapper> video_renderer_; |
169 scoped_refptr<base::MessageLoopProxy> message_loop_proxy_; | 173 scoped_refptr<base::MessageLoopProxy> message_loop_proxy_; |
170 | 174 |
171 // PeerConnection threads. signaling_thread_ is created from the | 175 // PeerConnection threads. signaling_thread_ is created from the |
172 // "current" chrome thread. | 176 // "current" chrome thread. |
173 talk_base::Thread* signaling_thread_; | 177 talk_base::Thread* signaling_thread_; |
174 talk_base::Thread* worker_thread_; | 178 talk_base::Thread* worker_thread_; |
175 base::Thread chrome_worker_thread_; | 179 base::Thread chrome_worker_thread_; |
176 | 180 |
177 static int next_request_id_; | 181 static int next_request_id_; |
178 typedef std::map<int, WebKit::WebUserMediaRequest> MediaRequestMap; | 182 typedef std::map<int, WebKit::WebUserMediaRequest> MediaRequestMap; |
179 MediaRequestMap user_media_requests_; | 183 MediaRequestMap user_media_requests_; |
180 | 184 |
181 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl); | 185 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl); |
182 }; | 186 }; |
183 | 187 |
184 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ | 188 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ |
OLD | NEW |