OLD | NEW |
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_DEPENDENCY_FACTORY_H_ | 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ |
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ | 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 WebKit::WebMediaStream* description); | 82 WebKit::WebMediaStream* description); |
83 | 83 |
84 // Creates a libjingle representation of a MediaStream and stores | 84 // Creates a libjingle representation of a MediaStream and stores |
85 // it in the extra data field of |description|. | 85 // it in the extra data field of |description|. |
86 // |stream_stopped| is a callback that is run when a MediaStream have been | 86 // |stream_stopped| is a callback that is run when a MediaStream have been |
87 // stopped. | 87 // stopped. |
88 void CreateNativeLocalMediaStream( | 88 void CreateNativeLocalMediaStream( |
89 WebKit::WebMediaStream* description, | 89 WebKit::WebMediaStream* description, |
90 const MediaStreamExtraData::StreamStopCallback& stream_stop); | 90 const MediaStreamExtraData::StreamStopCallback& stream_stop); |
91 | 91 |
| 92 bool AddNativeLocalMediaTrack( |
| 93 const WebKit::WebMediaStream& stream, |
| 94 const WebKit::WebMediaStreamTrack& track); |
| 95 |
92 // Asks the libjingle PeerConnection factory to create a libjingle | 96 // Asks the libjingle PeerConnection factory to create a libjingle |
93 // PeerConnection object. | 97 // PeerConnection object. |
94 // The PeerConnection object is owned by PeerConnectionHandler. | 98 // The PeerConnection object is owned by PeerConnectionHandler. |
95 virtual scoped_refptr<webrtc::PeerConnectionInterface> | 99 virtual scoped_refptr<webrtc::PeerConnectionInterface> |
96 CreatePeerConnection( | 100 CreatePeerConnection( |
97 const webrtc::PeerConnectionInterface::IceServers& ice_servers, | 101 const webrtc::PeerConnectionInterface::IceServers& ice_servers, |
98 const webrtc::MediaConstraintsInterface* constraints, | 102 const webrtc::MediaConstraintsInterface* constraints, |
99 WebKit::WebFrame* web_frame, | 103 WebKit::WebFrame* web_frame, |
100 webrtc::PeerConnectionObserver* observer); | 104 webrtc::PeerConnectionObserver* observer); |
101 | 105 |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
188 talk_base::Thread* signaling_thread_; | 192 talk_base::Thread* signaling_thread_; |
189 talk_base::Thread* worker_thread_; | 193 talk_base::Thread* worker_thread_; |
190 base::Thread chrome_worker_thread_; | 194 base::Thread chrome_worker_thread_; |
191 | 195 |
192 DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory); | 196 DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory); |
193 }; | 197 }; |
194 | 198 |
195 } // namespace content | 199 } // namespace content |
196 | 200 |
197 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ | 201 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ |
OLD | NEW |