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

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

Issue 10703095: New PeerConnection handler in Chrome to support latest PeerConnection draft (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix code review issues found by Wei. Created 8 years, 4 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 namespace talk_base { 43 namespace talk_base {
44 class Thread; 44 class Thread;
45 } 45 }
46 46
47 namespace WebKit { 47 namespace WebKit {
48 class WebFrame; 48 class WebFrame;
49 class WebMediaStreamComponent; 49 class WebMediaStreamComponent;
50 class WebMediaStreamDescriptor; 50 class WebMediaStreamDescriptor;
51 class WebPeerConnection00Handler; 51 class WebPeerConnection00Handler;
52 class WebPeerConnection00HandlerClient; 52 class WebPeerConnection00HandlerClient;
53 class WebRTCPeerConnectionHandler;
54 class WebRTCPeerConnectionHandlerClient;
Ronghua Wu (Left Chromium) 2012/08/14 00:59:03 Let's keep in order
perkj_chrome 2012/08/14 09:15:40 Done.
53 class WebPeerConnectionHandler; 55 class WebPeerConnectionHandler;
54 class WebPeerConnectionHandlerClient; 56 class WebPeerConnectionHandlerClient;
55 } 57 }
56 58
57 class MediaStreamDispatcher; 59 class MediaStreamDispatcher;
58 class MediaStreamDependencyFactory; 60 class MediaStreamDependencyFactory;
59 class PeerConnectionHandlerBase; 61 class PeerConnectionHandlerBase;
60 class VideoCaptureImplManager; 62 class VideoCaptureImplManager;
61 class RTCVideoDecoder; 63 class RTCVideoDecoder;
62 64
(...skipping 17 matching lines...) Expand all
80 MediaStreamImpl( 82 MediaStreamImpl(
81 content::RenderView* render_view, 83 content::RenderView* render_view,
82 MediaStreamDispatcher* media_stream_dispatcher, 84 MediaStreamDispatcher* media_stream_dispatcher,
83 content::P2PSocketDispatcher* p2p_socket_dispatcher, 85 content::P2PSocketDispatcher* p2p_socket_dispatcher,
84 VideoCaptureImplManager* vc_manager, 86 VideoCaptureImplManager* vc_manager,
85 MediaStreamDependencyFactory* dependency_factory); 87 MediaStreamDependencyFactory* dependency_factory);
86 virtual ~MediaStreamImpl(); 88 virtual ~MediaStreamImpl();
87 89
88 virtual WebKit::WebPeerConnection00Handler* CreatePeerConnectionHandlerJsep( 90 virtual WebKit::WebPeerConnection00Handler* CreatePeerConnectionHandlerJsep(
89 WebKit::WebPeerConnection00HandlerClient* client); 91 WebKit::WebPeerConnection00HandlerClient* client);
92 virtual WebKit::WebRTCPeerConnectionHandler* CreateRTCPeerConnectionHandler(
93 WebKit::WebRTCPeerConnectionHandlerClient* client);
90 // Stops a local MediaStream by notifying the MediaStreamDispatcher that the 94 // Stops a local MediaStream by notifying the MediaStreamDispatcher that the
91 // stream no longer may be used. 95 // stream no longer may be used.
92 virtual void StopLocalMediaStream( 96 virtual void StopLocalMediaStream(
93 const WebKit::WebMediaStreamDescriptor& stream); 97 const WebKit::WebMediaStreamDescriptor& stream);
94 // A new MediaStream have been created based on existing tracks. 98 // A new MediaStream have been created based on existing tracks.
95 virtual void CreateMediaStream( 99 virtual void CreateMediaStream(
96 WebKit::WebFrame* frame, 100 WebKit::WebFrame* frame,
97 WebKit::WebMediaStreamDescriptor* stream); 101 WebKit::WebMediaStreamDescriptor* stream);
98 102
99 // WebKit::WebUserMediaClient implementation 103 // WebKit::WebUserMediaClient implementation
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 // PeerConnection threads. signaling_thread_ is created from the 220 // PeerConnection threads. signaling_thread_ is created from the
217 // "current" chrome thread. 221 // "current" chrome thread.
218 talk_base::Thread* signaling_thread_; 222 talk_base::Thread* signaling_thread_;
219 talk_base::Thread* worker_thread_; 223 talk_base::Thread* worker_thread_;
220 base::Thread chrome_worker_thread_; 224 base::Thread chrome_worker_thread_;
221 225
222 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl); 226 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);
223 }; 227 };
224 228
225 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ 229 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698