OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2004--2011 Google Inc. | 3 * Copyright 2004--2011 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 11 matching lines...) Expand all Loading... |
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 */ | 26 */ |
27 | 27 |
28 #include "talk/app/webrtc/peerconnectionfactory.h" | 28 #include "talk/app/webrtc/peerconnectionfactory.h" |
29 | 29 |
30 #include "talk/app/webrtc/audiotrack.h" | 30 #include "talk/app/webrtc/audiotrack.h" |
31 #include "talk/app/webrtc/localaudiosource.h" | 31 #include "talk/app/webrtc/localaudiosource.h" |
| 32 #include "talk/app/webrtc/mediastream.h" |
32 #include "talk/app/webrtc/mediastreamproxy.h" | 33 #include "talk/app/webrtc/mediastreamproxy.h" |
33 #include "talk/app/webrtc/mediastreamtrackproxy.h" | 34 #include "talk/app/webrtc/mediastreamtrackproxy.h" |
34 #include "talk/app/webrtc/peerconnection.h" | 35 #include "talk/app/webrtc/peerconnection.h" |
35 #include "talk/app/webrtc/peerconnectionfactoryproxy.h" | 36 #include "talk/app/webrtc/peerconnectionfactoryproxy.h" |
36 #include "talk/app/webrtc/peerconnectionproxy.h" | 37 #include "talk/app/webrtc/peerconnectionproxy.h" |
37 #include "talk/app/webrtc/portallocatorfactory.h" | 38 #include "talk/app/webrtc/portallocatorfactory.h" |
38 #include "talk/app/webrtc/videosource.h" | 39 #include "talk/app/webrtc/videosource.h" |
39 #include "talk/app/webrtc/videosourceproxy.h" | 40 #include "talk/app/webrtc/videosourceproxy.h" |
40 #include "talk/app/webrtc/videotrack.h" | 41 #include "talk/app/webrtc/videotrack.h" |
41 #include "talk/media/webrtc/webrtcmediaengine.h" | 42 #include "talk/media/webrtc/webrtcmediaengine.h" |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
295 } | 296 } |
296 | 297 |
297 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { | 298 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { |
298 ASSERT(worker_thread_ == rtc::Thread::Current()); | 299 ASSERT(worker_thread_ == rtc::Thread::Current()); |
299 return cricket::WebRtcMediaEngineFactory::Create( | 300 return cricket::WebRtcMediaEngineFactory::Create( |
300 default_adm_.get(), video_encoder_factory_.get(), | 301 default_adm_.get(), video_encoder_factory_.get(), |
301 video_decoder_factory_.get()); | 302 video_decoder_factory_.get()); |
302 } | 303 } |
303 | 304 |
304 } // namespace webrtc | 305 } // namespace webrtc |
OLD | NEW |