Index: content/renderer/media/media_stream_impl.h |
diff --git a/content/renderer/media/media_stream_impl.h b/content/renderer/media/media_stream_impl.h |
index 79dc9480f5bbc4c95e600143153662a24f4f8357..4af3b6395d38888d874b0a80b83303a1d47cd9eb 100644 |
--- a/content/renderer/media/media_stream_impl.h |
+++ b/content/renderer/media/media_stream_impl.h |
@@ -2,33 +2,165 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CONTENT_RENDERER_MEDIA_STREAM_MEDIA_STREAM_IMPL_H_ |
-#define CONTENT_RENDERER_MEDIA_STREAM_MEDIA_STREAM_IMPL_H_ |
+#ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ |
+#define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ |
+ |
+#include <list> |
+#include <map> |
+#include <string> |
#include "base/basictypes.h" |
+#include "base/gtest_prod_util.h" |
#include "base/memory/ref_counted.h" |
+#include "base/memory/scoped_ptr.h" |
+#include "base/message_loop_proxy.h" |
+#include "base/threading/non_thread_safe.h" |
+#include "base/threading/thread.h" |
+#include "content/renderer/media/media_stream_dispatcher_eventhandler.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaClient.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaRequest.h" |
#include "webkit/media/media_stream_client.h" |
+namespace base { |
+class WaitableEvent; |
+} |
+ |
+namespace content { |
+class IpcNetworkManager; |
+class IpcPacketSocketFactory; |
+class P2PSocketDispatcher; |
+} |
+ |
+namespace cricket { |
+class WebRtcMediaEngine; |
+} |
+ |
+namespace talk_base { |
+class Thread; |
+} |
+ |
+namespace WebKit { |
+class WebPeerConnectionHandler; |
+class WebPeerConnectionHandlerClient; |
+} |
+ |
+class MediaStreamDispatcher; |
+class MediaStreamDependencyFactory; |
+class PeerConnectionHandler; |
class VideoCaptureImplManager; |
+class RTCVideoDecoder; |
-// A implementation of StreamClient to provide supporting functions, such as |
-// GetVideoDecoder. |
+// MediaStreamImpl is a delegate for the Media Stream API messages used by |
+// WebKit. It ties together WebKit, native PeerConnection in libjingle and |
+// MediaStreamManager (via MediaStreamDispatcher and MediaStreamDispatcherHost) |
+// in the browser process. It must be created, called and destroyed on the |
+// render thread. |
class MediaStreamImpl |
- : public webkit_media::MediaStreamClient, |
+ : public WebKit::WebUserMediaClient, |
+ public webkit_media::MediaStreamClient, |
+ public MediaStreamDispatcherEventHandler, |
+ public base::NonThreadSafe, |
public base::RefCountedThreadSafe<MediaStreamImpl> { |
public: |
- explicit MediaStreamImpl(VideoCaptureImplManager* vc_manager); |
+ MediaStreamImpl( |
+ MediaStreamDispatcher* media_stream_dispatcher, |
+ content::P2PSocketDispatcher* p2p_socket_dispatcher, |
+ VideoCaptureImplManager* vc_manager, |
+ MediaStreamDependencyFactory* dependency_factory); |
virtual ~MediaStreamImpl(); |
- // Implement webkit_media::StreamClient. |
+ virtual WebKit::WebPeerConnectionHandler* CreatePeerConnectionHandler( |
+ WebKit::WebPeerConnectionHandlerClient* client); |
+ virtual void ClosePeerConnection(); |
+ |
+ // Returns true if created successfully or already exists, false otherwise. |
+ virtual bool SetVideoCaptureModule(const std::string& label); |
+ |
+ // WebKit::WebUserMediaClient implementation |
+ virtual void requestUserMedia( |
+ const WebKit::WebUserMediaRequest& user_media_request, |
+ const WebKit::WebVector<WebKit::WebMediaStreamSource>& |
+ media_stream_source_vector) OVERRIDE; |
+ virtual void cancelUserMediaRequest( |
+ const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE; |
+ |
+ // webkit_media::MediaStreamClient implementation. |
virtual scoped_refptr<media::VideoDecoder> GetVideoDecoder( |
const GURL& url, |
media::MessageLoopFactory* message_loop_factory) OVERRIDE; |
+ // MediaStreamDispatcherEventHandler implementation. |
+ virtual void OnStreamGenerated( |
+ int request_id, |
+ const std::string& label, |
+ const media_stream::StreamDeviceInfoArray& audio_array, |
+ const media_stream::StreamDeviceInfoArray& video_array) OVERRIDE; |
+ virtual void OnStreamGenerationFailed(int request_id) OVERRIDE; |
+ virtual void OnVideoDeviceFailed( |
+ const std::string& label, |
+ int index) OVERRIDE; |
+ virtual void OnAudioDeviceFailed( |
+ const std::string& label, |
+ int index) OVERRIDE; |
+ |
private: |
+ FRIEND_TEST_ALL_PREFIXES(MediaStreamImplTest, Basic); |
+ |
+ void InitializeWorkerThread( |
+ talk_base::Thread** thread, |
+ base::WaitableEvent* event); |
+ void DeleteIpcNetworkManager(); |
+ |
+ scoped_ptr<MediaStreamDependencyFactory> dependency_factory_; |
+ |
+ // media_stream_dispatcher_ is a weak reference, owned by RenderView. It's |
+ // valid for the lifetime of RenderView. |
+ MediaStreamDispatcher* media_stream_dispatcher_; |
+ |
+ // media_engine_ is owned by PeerConnectionFactory (which is owned by |
+ // dependency_factory_) and is valid for the lifetime of |
+ // PeerConnectionFactory. |
+ cricket::WebRtcMediaEngine* media_engine_; |
+ |
+ // p2p_socket_dispatcher_ is a weak reference, owned by RenderView. It's valid |
+ // for the lifetime of RenderView. |
+ content::P2PSocketDispatcher* p2p_socket_dispatcher_; |
+ |
+ // We own network_manager_, must be deleted on the worker thread. |
+ content::IpcNetworkManager* network_manager_; |
+ |
+ scoped_ptr<content::IpcPacketSocketFactory> socket_factory_; |
+ |
scoped_refptr<VideoCaptureImplManager> vc_manager_; |
+ // peer_connection_handler_ is a weak reference, owned by WebKit. It's valid |
+ // until stop is called on it (which will call ClosePeerConnection on us). |
+ // TODO(grunell): Support several PeerConnectionsHandlers. |
+ PeerConnectionHandler* peer_connection_handler_; |
+ |
+ scoped_refptr<RTCVideoDecoder> rtc_video_decoder_; |
+ scoped_refptr<base::MessageLoopProxy> message_loop_proxy_; |
+ |
+ // PeerConnection threads. signaling_thread_ is created from the |
+ // "current" chrome thread. |
+ talk_base::Thread* signaling_thread_; |
+ talk_base::Thread* worker_thread_; |
+ base::Thread chrome_worker_thread_; |
+ |
+ static int next_request_id_; |
+ typedef std::map<int, WebKit::WebUserMediaRequest> MediaRequestMap; |
+ MediaRequestMap user_media_requests_; |
+ |
+ std::list<std::string> stream_labels_; |
+ |
+ // Make sure we only create the video capture module once. This is also |
+ // temporary and will be handled differently when several PeerConnections |
+ // and/or streams is supported. |
+ // TODO(grunell): This shall be removed or changed when native PeerConnection |
+ // has been updated to closer follow the specification. |
+ bool vcm_created_; |
+ |
DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl); |
}; |
-#endif // CONTENT_RENDERER_MEDIA_STREAM_MEDIA_STREAM_IMPL_H_ |
+#endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ |