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 b338a31a6cdb99914a8de2804d3b9a5450647789..0a84360c6d5619e842129d091fc88e28c85ad9f6 100644 |
--- a/content/renderer/media/media_stream_impl.h |
+++ b/content/renderer/media/media_stream_impl.h |
@@ -2,32 +2,138 @@ |
// 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 <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/thread.h" |
+#include "content/renderer/media/media_stream_dispatcher_eventhandler.h" |
#include "webkit/glue/media/media_stream_client.h" |
+namespace base { |
+class WaitableEvent; |
+} |
+ |
+namespace content { |
+class IpcNetworkManager; |
+class IpcPacketSocketFactory; |
+class P2PSocketDispatcher; |
+} |
+ |
+namespace cricket { |
+class HttpPortAllocator; |
+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. |
class MediaStreamImpl |
: public webkit_glue::MediaStreamClient, |
+ public MediaStreamDispatcherEventHandler, |
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_glue::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); |
tommi (sloooow) - chröme
2011/11/08 12:27:24
const&
Henrik Grunell
2011/11/08 22:06:41
Done.
|
+ |
+ // Implement webkit_glue::MediaStreamClient. |
virtual scoped_refptr<media::VideoDecoder> GetVideoDecoder( |
- const GURL& url, media::MessageLoopFactory* message_loop_factory); |
+ const GURL& url, |
+ media::MessageLoopFactory* message_loop_factory) OVERRIDE; |
+ |
+ // Implement MediaStreamDispatcherEventHandler. |
+ 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(MediaStreamImplTest, Basic); |
+ |
+ void InitializeWorkerThread( |
+ talk_base::Thread** thread, |
+ base::WaitableEvent* event); |
+ |
+ // dependency_factory_ is owned by us. |
+ 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_; |
+ |
+ // The media_engine_ is owned by pc_factory_ and is valid for the lifetime of |
+ // pc_factory_. |
+ 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_; |
+ |
scoped_refptr<VideoCaptureImplManager> vc_manager_; |
+ scoped_ptr<content::IpcNetworkManager> ipc_network_manager_; |
+ scoped_ptr<content::IpcPacketSocketFactory> ipc_socket_factory_; |
+ |
+ // TODO(grunell): Support several PeerConnections. |
+ // TODO(grunell): Comment on this. |
tommi (sloooow) - chröme
2011/11/08 12:27:24
I guess you want to address this comment before ch
Henrik Grunell
2011/11/08 22:06:41
Done.
|
+ scoped_ptr<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_; |
+ |
+ // 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_ |