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

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

Issue 10918052: create a separate WebMediaPlayer for URL derived from media stream (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix win build Created 8 years, 3 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>
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 // WebKit::WebUserMediaClient implementation 99 // WebKit::WebUserMediaClient implementation
100 virtual void requestUserMedia( 100 virtual void requestUserMedia(
101 const WebKit::WebUserMediaRequest& user_media_request, 101 const WebKit::WebUserMediaRequest& user_media_request,
102 const WebKit::WebVector<WebKit::WebMediaStreamSource>& audio_sources, 102 const WebKit::WebVector<WebKit::WebMediaStreamSource>& audio_sources,
103 const WebKit::WebVector<WebKit::WebMediaStreamSource>& video_sources) 103 const WebKit::WebVector<WebKit::WebMediaStreamSource>& video_sources)
104 OVERRIDE; 104 OVERRIDE;
105 virtual void cancelUserMediaRequest( 105 virtual void cancelUserMediaRequest(
106 const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE; 106 const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE;
107 107
108 // webkit_media::MediaStreamClient implementation. 108 // webkit_media::MediaStreamClient implementation.
109 virtual bool IsMediaStream(const GURL& url) OVERRIDE;
110 virtual scoped_refptr<webkit_media::VideoFrameProvider> GetVideoFrameProvider(
111 const GURL& url,
112 const base::Closure& error_cb,
113 const webkit_media::RepaintCB& repaint_cb) OVERRIDE;
109 virtual scoped_refptr<media::VideoDecoder> GetVideoDecoder( 114 virtual scoped_refptr<media::VideoDecoder> GetVideoDecoder(
110 const GURL& url, 115 const GURL& url,
111 media::MessageLoopFactory* message_loop_factory) OVERRIDE; 116 media::MessageLoopFactory* message_loop_factory) OVERRIDE;
112 117
113 // MediaStreamDispatcherEventHandler implementation. 118 // MediaStreamDispatcherEventHandler implementation.
114 virtual void OnStreamGenerated( 119 virtual void OnStreamGenerated(
115 int request_id, 120 int request_id,
116 const std::string& label, 121 const std::string& label,
117 const media_stream::StreamDeviceInfoArray& audio_array, 122 const media_stream::StreamDeviceInfoArray& audio_array,
118 const media_stream::StreamDeviceInfoArray& video_array) OVERRIDE; 123 const media_stream::StreamDeviceInfoArray& video_array) OVERRIDE;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 178
174 void InitializeWorkerThread(talk_base::Thread** thread, 179 void InitializeWorkerThread(talk_base::Thread** thread,
175 base::WaitableEvent* event); 180 base::WaitableEvent* event);
176 181
177 void CreateIpcNetworkManagerOnWorkerThread(base::WaitableEvent* event); 182 void CreateIpcNetworkManagerOnWorkerThread(base::WaitableEvent* event);
178 void DeleteIpcNetworkManager(); 183 void DeleteIpcNetworkManager();
179 184
180 bool EnsurePeerConnectionFactory(); 185 bool EnsurePeerConnectionFactory();
181 void CleanupPeerConnectionFactory(); 186 void CleanupPeerConnectionFactory();
182 187
188 scoped_refptr<webkit_media::VideoFrameProvider>
189 CreateLocalVideoFrameProvider(
190 webrtc::MediaStreamInterface* stream,
191 const base::Closure& error_cb,
192 const webkit_media::RepaintCB& repaint_cb);
193 scoped_refptr<webkit_media::VideoFrameProvider>
194 CreateRemoteVideoFrameProvider(
195 webrtc::MediaStreamInterface* stream,
196 const base::Closure& error_cb,
197 const webkit_media::RepaintCB& repaint_cb);
183 scoped_refptr<media::VideoDecoder> CreateLocalVideoDecoder( 198 scoped_refptr<media::VideoDecoder> CreateLocalVideoDecoder(
184 webrtc::MediaStreamInterface* stream, 199 webrtc::MediaStreamInterface* stream,
185 media::MessageLoopFactory* message_loop_factory); 200 media::MessageLoopFactory* message_loop_factory);
186 scoped_refptr<media::VideoDecoder> CreateRemoteVideoDecoder( 201 scoped_refptr<media::VideoDecoder> CreateRemoteVideoDecoder(
187 webrtc::MediaStreamInterface* stream, 202 webrtc::MediaStreamInterface* stream,
188 media::MessageLoopFactory* message_loop_factory); 203 media::MessageLoopFactory* message_loop_factory);
189 LocalNativeStreamPtr CreateNativeLocalMediaStream( 204 LocalNativeStreamPtr CreateNativeLocalMediaStream(
190 const std::string& label, 205 const std::string& label,
191 WebKit::WebFrame* frame, 206 WebKit::WebFrame* frame,
192 const WebKit::WebVector<WebKit::WebMediaStreamSource>& audio_sources, 207 const WebKit::WebVector<WebKit::WebMediaStreamSource>& audio_sources,
(...skipping 21 matching lines...) Expand all
214 // PeerConnection threads. signaling_thread_ is created from the 229 // PeerConnection threads. signaling_thread_ is created from the
215 // "current" chrome thread. 230 // "current" chrome thread.
216 talk_base::Thread* signaling_thread_; 231 talk_base::Thread* signaling_thread_;
217 talk_base::Thread* worker_thread_; 232 talk_base::Thread* worker_thread_;
218 base::Thread chrome_worker_thread_; 233 base::Thread chrome_worker_thread_;
219 234
220 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl); 235 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);
221 }; 236 };
222 237
223 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ 238 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698