OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2004--2011 Google Inc. | 3 * Copyright 2004 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, |
11 * this list of conditions and the following disclaimer in the documentation | 11 * this list of conditions and the following disclaimer in the documentation |
12 * and/or other materials provided with the distribution. | 12 * and/or other materials provided with the distribution. |
13 * 3. The name of the author may not be used to endorse or promote products | 13 * 3. The name of the author may not be used to endorse or promote products |
14 * derived from this software without specific prior written permission. | 14 * derived from this software without specific prior written permission. |
15 * | 15 * |
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED | 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED |
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO | 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; |
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 "webrtc/api/peerconnectionfactory.h" |
29 | 29 |
30 #include <utility> | 30 #include <utility> |
31 | 31 |
32 #include "talk/app/webrtc/audiotrack.h" | 32 #include "webrtc/api/audiotrack.h" |
33 #include "talk/app/webrtc/localaudiosource.h" | 33 #include "webrtc/api/localaudiosource.h" |
34 #include "talk/app/webrtc/mediastream.h" | 34 #include "webrtc/api/mediastream.h" |
35 #include "talk/app/webrtc/mediastreamproxy.h" | 35 #include "webrtc/api/mediastreamproxy.h" |
36 #include "talk/app/webrtc/mediastreamtrackproxy.h" | 36 #include "webrtc/api/mediastreamtrackproxy.h" |
37 #include "talk/app/webrtc/peerconnection.h" | 37 #include "webrtc/api/peerconnection.h" |
38 #include "talk/app/webrtc/peerconnectionfactoryproxy.h" | 38 #include "webrtc/api/peerconnectionfactoryproxy.h" |
39 #include "talk/app/webrtc/peerconnectionproxy.h" | 39 #include "webrtc/api/peerconnectionproxy.h" |
40 #include "talk/app/webrtc/videosource.h" | 40 #include "webrtc/api/videosource.h" |
41 #include "talk/app/webrtc/videosourceproxy.h" | 41 #include "webrtc/api/videosourceproxy.h" |
42 #include "talk/app/webrtc/videotrack.h" | 42 #include "webrtc/api/videotrack.h" |
43 #include "webrtc/base/bind.h" | 43 #include "webrtc/base/bind.h" |
44 #include "webrtc/media/webrtc/webrtcmediaengine.h" | 44 #include "webrtc/media/webrtc/webrtcmediaengine.h" |
45 #include "webrtc/media/webrtc/webrtcvideodecoderfactory.h" | 45 #include "webrtc/media/webrtc/webrtcvideodecoderfactory.h" |
46 #include "webrtc/media/webrtc/webrtcvideoencoderfactory.h" | 46 #include "webrtc/media/webrtc/webrtcvideoencoderfactory.h" |
47 #include "webrtc/modules/audio_device/include/audio_device.h" | 47 #include "webrtc/modules/audio_device/include/audio_device.h" |
48 #include "webrtc/p2p/base/basicpacketsocketfactory.h" | 48 #include "webrtc/p2p/base/basicpacketsocketfactory.h" |
49 #include "webrtc/p2p/client/basicportallocator.h" | 49 #include "webrtc/p2p/client/basicportallocator.h" |
50 | 50 |
51 namespace webrtc { | 51 namespace webrtc { |
52 | 52 |
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
322 } | 322 } |
323 | 323 |
324 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { | 324 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { |
325 ASSERT(worker_thread_ == rtc::Thread::Current()); | 325 ASSERT(worker_thread_ == rtc::Thread::Current()); |
326 return cricket::WebRtcMediaEngineFactory::Create( | 326 return cricket::WebRtcMediaEngineFactory::Create( |
327 default_adm_.get(), video_encoder_factory_.get(), | 327 default_adm_.get(), video_encoder_factory_.get(), |
328 video_decoder_factory_.get()); | 328 video_decoder_factory_.get()); |
329 } | 329 } |
330 | 330 |
331 } // namespace webrtc | 331 } // namespace webrtc |
OLD | NEW |