| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #include "webrtc/api/peerconnectionfactory.h" | 11 #include "webrtc/pc/peerconnectionfactory.h" |
| 12 | 12 |
| 13 #include <utility> | 13 #include <utility> |
| 14 | 14 |
| 15 #include "webrtc/api/audiotrack.h" | |
| 16 #include "webrtc/api/localaudiosource.h" | |
| 17 #include "webrtc/api/mediaconstraintsinterface.h" | 15 #include "webrtc/api/mediaconstraintsinterface.h" |
| 18 #include "webrtc/api/mediastream.h" | |
| 19 #include "webrtc/api/mediastreamproxy.h" | 16 #include "webrtc/api/mediastreamproxy.h" |
| 20 #include "webrtc/api/mediastreamtrackproxy.h" | 17 #include "webrtc/api/mediastreamtrackproxy.h" |
| 21 #include "webrtc/api/peerconnection.h" | |
| 22 #include "webrtc/api/peerconnectionfactoryproxy.h" | 18 #include "webrtc/api/peerconnectionfactoryproxy.h" |
| 23 #include "webrtc/api/peerconnectionproxy.h" | 19 #include "webrtc/api/peerconnectionproxy.h" |
| 24 #include "webrtc/api/videocapturertracksource.h" | |
| 25 #include "webrtc/api/videosourceproxy.h" | 20 #include "webrtc/api/videosourceproxy.h" |
| 26 #include "webrtc/api/videotrack.h" | |
| 27 #include "webrtc/base/bind.h" | 21 #include "webrtc/base/bind.h" |
| 28 #include "webrtc/media/engine/webrtcmediaengine.h" | 22 #include "webrtc/media/engine/webrtcmediaengine.h" |
| 29 #include "webrtc/media/engine/webrtcvideodecoderfactory.h" | 23 #include "webrtc/media/engine/webrtcvideodecoderfactory.h" |
| 30 #include "webrtc/media/engine/webrtcvideoencoderfactory.h" | 24 #include "webrtc/media/engine/webrtcvideoencoderfactory.h" |
| 31 #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h" | 25 #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h" |
| 32 #include "webrtc/modules/audio_device/include/audio_device.h" | 26 #include "webrtc/modules/audio_device/include/audio_device.h" |
| 33 #include "webrtc/p2p/base/basicpacketsocketfactory.h" | 27 #include "webrtc/p2p/base/basicpacketsocketfactory.h" |
| 34 #include "webrtc/p2p/client/basicportallocator.h" | 28 #include "webrtc/p2p/client/basicportallocator.h" |
| 29 #include "webrtc/pc/audiotrack.h" |
| 30 #include "webrtc/pc/localaudiosource.h" |
| 31 #include "webrtc/pc/mediastream.h" |
| 32 #include "webrtc/pc/peerconnection.h" |
| 33 #include "webrtc/pc/videocapturertracksource.h" |
| 34 #include "webrtc/pc/videotrack.h" |
| 35 | 35 |
| 36 namespace webrtc { | 36 namespace webrtc { |
| 37 | 37 |
| 38 rtc::scoped_refptr<PeerConnectionFactoryInterface> | 38 rtc::scoped_refptr<PeerConnectionFactoryInterface> |
| 39 CreatePeerConnectionFactory() { | 39 CreatePeerConnectionFactory() { |
| 40 rtc::scoped_refptr<PeerConnectionFactory> pc_factory( | 40 rtc::scoped_refptr<PeerConnectionFactory> pc_factory( |
| 41 new rtc::RefCountedObject<PeerConnectionFactory>()); | 41 new rtc::RefCountedObject<PeerConnectionFactory>()); |
| 42 | 42 |
| 43 RTC_CHECK(rtc::Thread::Current() == pc_factory->signaling_thread()); | 43 RTC_CHECK(rtc::Thread::Current() == pc_factory->signaling_thread()); |
| 44 // The signaling thread is the current thread so we can | 44 // The signaling thread is the current thread so we can |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 336 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { | 336 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { |
| 337 ASSERT(worker_thread_ == rtc::Thread::Current()); | 337 ASSERT(worker_thread_ == rtc::Thread::Current()); |
| 338 return cricket::WebRtcMediaEngineFactory::Create( | 338 return cricket::WebRtcMediaEngineFactory::Create( |
| 339 default_adm_.get(), | 339 default_adm_.get(), |
| 340 audio_decoder_factory_, | 340 audio_decoder_factory_, |
| 341 video_encoder_factory_.get(), | 341 video_encoder_factory_.get(), |
| 342 video_decoder_factory_.get()); | 342 video_decoder_factory_.get()); |
| 343 } | 343 } |
| 344 | 344 |
| 345 } // namespace webrtc | 345 } // namespace webrtc |
| OLD | NEW |