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

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

Issue 9284020: Enabling usage of native PeerConnection v2 in libjingle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 11 months 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 | Annotate | Revision Log
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_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>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/gtest_prod_util.h" 14 #include "base/gtest_prod_util.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/message_loop_proxy.h" 17 #include "base/message_loop_proxy.h"
18 #include "base/threading/non_thread_safe.h" 18 #include "base/threading/non_thread_safe.h"
19 #include "base/threading/thread.h" 19 #include "base/threading/thread.h"
20 #include "content/common/content_export.h" 20 #include "content/common/content_export.h"
21 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h" 21 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
22 #include "content/renderer/media/rtc_video_decoder.h"
23 #include "third_party/libjingle/source/talk/app/webrtc/mediastream.h"
24 #include "third_party/libjingle/source/talk/base/scoped_ref_ptr.h"
22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaClient.h" 25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaClient.h"
23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaRequest.h " 26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaRequest.h "
24 #include "webkit/media/media_stream_client.h" 27 #include "webkit/media/media_stream_client.h"
25 28
26 namespace base { 29 namespace base {
27 class WaitableEvent; 30 class WaitableEvent;
28 } 31 }
29 32
30 namespace content { 33 namespace content {
31 class IpcNetworkManager; 34 class IpcNetworkManager;
32 class IpcPacketSocketFactory; 35 class IpcPacketSocketFactory;
33 class P2PSocketDispatcher; 36 class P2PSocketDispatcher;
34 } 37 }
35 38
36 namespace cricket {
37 class WebRtcMediaEngine;
38 }
39
40 namespace talk_base { 39 namespace talk_base {
41 class Thread; 40 class Thread;
42 } 41 }
43 42
44 namespace WebKit { 43 namespace WebKit {
45 class WebPeerConnectionHandler; 44 class WebPeerConnectionHandler;
46 class WebPeerConnectionHandlerClient; 45 class WebPeerConnectionHandlerClient;
47 } 46 }
48 47
49 class MediaStreamDispatcher; 48 class MediaStreamDispatcher;
(...skipping 17 matching lines...) Expand all
67 MediaStreamImpl( 66 MediaStreamImpl(
68 MediaStreamDispatcher* media_stream_dispatcher, 67 MediaStreamDispatcher* media_stream_dispatcher,
69 content::P2PSocketDispatcher* p2p_socket_dispatcher, 68 content::P2PSocketDispatcher* p2p_socket_dispatcher,
70 VideoCaptureImplManager* vc_manager, 69 VideoCaptureImplManager* vc_manager,
71 MediaStreamDependencyFactory* dependency_factory); 70 MediaStreamDependencyFactory* dependency_factory);
72 virtual ~MediaStreamImpl(); 71 virtual ~MediaStreamImpl();
73 72
74 virtual WebKit::WebPeerConnectionHandler* CreatePeerConnectionHandler( 73 virtual WebKit::WebPeerConnectionHandler* CreatePeerConnectionHandler(
75 WebKit::WebPeerConnectionHandlerClient* client); 74 WebKit::WebPeerConnectionHandlerClient* client);
76 virtual void ClosePeerConnection(); 75 virtual void ClosePeerConnection();
77 76 virtual webrtc::MediaStreamTrackInterface* GetLocalMediaStreamTrack(
78 // Returns true if created successfully or already exists, false otherwise. 77 const std::string& label);
79 virtual bool SetVideoCaptureModule(const std::string& label);
80 78
81 // WebKit::WebUserMediaClient implementation 79 // WebKit::WebUserMediaClient implementation
82 virtual void requestUserMedia( 80 virtual void requestUserMedia(
83 const WebKit::WebUserMediaRequest& user_media_request, 81 const WebKit::WebUserMediaRequest& user_media_request,
84 const WebKit::WebVector<WebKit::WebMediaStreamSource>& 82 const WebKit::WebVector<WebKit::WebMediaStreamSource>&
85 media_stream_source_vector) OVERRIDE; 83 media_stream_source_vector) OVERRIDE;
86 virtual void cancelUserMediaRequest( 84 virtual void cancelUserMediaRequest(
87 const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE; 85 const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE;
88 86
89 // webkit_media::MediaStreamClient implementation. 87 // webkit_media::MediaStreamClient implementation.
(...skipping 20 matching lines...) Expand all
110 virtual void OnDevicesEnumerationFailed(int request_id) OVERRIDE; 108 virtual void OnDevicesEnumerationFailed(int request_id) OVERRIDE;
111 virtual void OnDeviceOpened( 109 virtual void OnDeviceOpened(
112 int request_id, 110 int request_id,
113 const std::string& label, 111 const std::string& label,
114 const media_stream::StreamDeviceInfo& device_info) OVERRIDE; 112 const media_stream::StreamDeviceInfo& device_info) OVERRIDE;
115 virtual void OnDeviceOpenFailed(int request_id) OVERRIDE; 113 virtual void OnDeviceOpenFailed(int request_id) OVERRIDE;
116 114
117 private: 115 private:
118 FRIEND_TEST_ALL_PREFIXES(MediaStreamImplTest, Basic); 116 FRIEND_TEST_ALL_PREFIXES(MediaStreamImplTest, Basic);
119 117
118 class VideoRendererWrapper : public webrtc::VideoRendererWrapperInterface {
119 public:
120 VideoRendererWrapper();
121 virtual cricket::VideoRenderer* renderer() OVERRIDE {
122 return rtc_video_decoder_.get();
123 }
124 void SetVideoDecoder(RTCVideoDecoder* decoder);
125
126 protected:
127 virtual ~VideoRendererWrapper();
128
129 private:
130 scoped_refptr<RTCVideoDecoder> rtc_video_decoder_;
131 };
132
120 void InitializeWorkerThread( 133 void InitializeWorkerThread(
121 talk_base::Thread** thread, 134 talk_base::Thread** thread,
122 base::WaitableEvent* event); 135 base::WaitableEvent* event);
123 void DeleteIpcNetworkManager(); 136 void DeleteIpcNetworkManager();
137 bool EnsurePeerConnectionFactory();
124 138
125 scoped_ptr<MediaStreamDependencyFactory> dependency_factory_; 139 scoped_ptr<MediaStreamDependencyFactory> dependency_factory_;
126 140
127 // media_stream_dispatcher_ is a weak reference, owned by RenderView. It's 141 // media_stream_dispatcher_ is a weak reference, owned by RenderView. It's
128 // valid for the lifetime of RenderView. 142 // valid for the lifetime of RenderView.
129 MediaStreamDispatcher* media_stream_dispatcher_; 143 MediaStreamDispatcher* media_stream_dispatcher_;
130 144
131 // media_engine_ is owned by PeerConnectionFactory (which is owned by
132 // dependency_factory_) and is valid for the lifetime of
133 // PeerConnectionFactory.
134 cricket::WebRtcMediaEngine* media_engine_;
135
136 // p2p_socket_dispatcher_ is a weak reference, owned by RenderView. It's valid 145 // p2p_socket_dispatcher_ is a weak reference, owned by RenderView. It's valid
137 // for the lifetime of RenderView. 146 // for the lifetime of RenderView.
138 content::P2PSocketDispatcher* p2p_socket_dispatcher_; 147 content::P2PSocketDispatcher* p2p_socket_dispatcher_;
139 148
140 // We own network_manager_, must be deleted on the worker thread. 149 // We own network_manager_, must be deleted on the worker thread.
141 content::IpcNetworkManager* network_manager_; 150 content::IpcNetworkManager* network_manager_;
142 151
143 scoped_ptr<content::IpcPacketSocketFactory> socket_factory_; 152 scoped_ptr<content::IpcPacketSocketFactory> socket_factory_;
144 153
145 scoped_refptr<VideoCaptureImplManager> vc_manager_; 154 scoped_refptr<VideoCaptureImplManager> vc_manager_;
146 155
147 // peer_connection_handler_ is a weak reference, owned by WebKit. It's valid 156 // peer_connection_handler_ is a weak reference, owned by WebKit. It's valid
148 // until stop is called on it (which will call ClosePeerConnection on us). 157 // until stop is called on it (which will call ClosePeerConnection on us).
149 // TODO(grunell): Support several PeerConnectionsHandlers. 158 // TODO(grunell): Support several PeerConnectionsHandlers.
150 PeerConnectionHandler* peer_connection_handler_; 159 PeerConnectionHandler* peer_connection_handler_;
151 160
152 scoped_refptr<RTCVideoDecoder> rtc_video_decoder_; 161 // 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.
163 typedef talk_base::scoped_refptr<webrtc::MediaStreamTrackInterface>
164 MediaStreamTrackPtr;
165 typedef std::map<std::string, MediaStreamTrackPtr> MediaStreamTrackPtrMap;
166 MediaStreamTrackPtrMap local_tracks_;
167
168 talk_base::scoped_refptr<VideoRendererWrapper> video_renderer_;
153 scoped_refptr<base::MessageLoopProxy> message_loop_proxy_; 169 scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
154 170
155 // PeerConnection threads. signaling_thread_ is created from the 171 // PeerConnection threads. signaling_thread_ is created from the
156 // "current" chrome thread. 172 // "current" chrome thread.
157 talk_base::Thread* signaling_thread_; 173 talk_base::Thread* signaling_thread_;
158 talk_base::Thread* worker_thread_; 174 talk_base::Thread* worker_thread_;
159 base::Thread chrome_worker_thread_; 175 base::Thread chrome_worker_thread_;
160 176
161 static int next_request_id_; 177 static int next_request_id_;
162 typedef std::map<int, WebKit::WebUserMediaRequest> MediaRequestMap; 178 typedef std::map<int, WebKit::WebUserMediaRequest> MediaRequestMap;
163 MediaRequestMap user_media_requests_; 179 MediaRequestMap user_media_requests_;
164 180
165 std::list<std::string> stream_labels_;
166
167 // Make sure we only create the video capture module once. This is also
168 // temporary and will be handled differently when several PeerConnections
169 // and/or streams is supported.
170 // TODO(grunell): This shall be removed or changed when native PeerConnection
171 // has been updated to closer follow the specification.
172 bool vcm_created_;
173
174 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl); 181 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);
175 }; 182 };
176 183
177 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ 184 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_dependency_factory.cc ('k') | content/renderer/media/media_stream_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698