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

Side by Side Diff: webrtc/pc/peerconnectionfactory.cc

Issue 2514883002: Create //webrtc/api:libjingle_peerconnection_api + refactorings. (Closed)
Patch Set: Rebase Created 3 years, 11 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
« no previous file with comments | « webrtc/pc/peerconnectionfactory.h ('k') | webrtc/pc/peerconnectionfactory_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/base/checks.h" 22 #include "webrtc/base/checks.h"
29 #include "webrtc/media/engine/webrtcmediaengine.h" 23 #include "webrtc/media/engine/webrtcmediaengine.h"
30 #include "webrtc/media/engine/webrtcvideodecoderfactory.h" 24 #include "webrtc/media/engine/webrtcvideodecoderfactory.h"
31 #include "webrtc/media/engine/webrtcvideoencoderfactory.h" 25 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
32 #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h" 26 #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
33 #include "webrtc/modules/audio_device/include/audio_device.h" 27 #include "webrtc/modules/audio_device/include/audio_device.h"
34 #include "webrtc/p2p/base/basicpacketsocketfactory.h" 28 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
35 #include "webrtc/p2p/client/basicportallocator.h" 29 #include "webrtc/p2p/client/basicportallocator.h"
30 #include "webrtc/pc/audiotrack.h"
31 #include "webrtc/pc/localaudiosource.h"
32 #include "webrtc/pc/mediastream.h"
33 #include "webrtc/pc/peerconnection.h"
34 #include "webrtc/pc/videocapturertracksource.h"
35 #include "webrtc/pc/videotrack.h"
36 36
37 namespace webrtc { 37 namespace webrtc {
38 38
39 rtc::scoped_refptr<PeerConnectionFactoryInterface> 39 rtc::scoped_refptr<PeerConnectionFactoryInterface>
40 CreatePeerConnectionFactory() { 40 CreatePeerConnectionFactory() {
41 rtc::scoped_refptr<PeerConnectionFactory> pc_factory( 41 rtc::scoped_refptr<PeerConnectionFactory> pc_factory(
42 new rtc::RefCountedObject<PeerConnectionFactory>()); 42 new rtc::RefCountedObject<PeerConnectionFactory>());
43 43
44 RTC_CHECK(rtc::Thread::Current() == pc_factory->signaling_thread()); 44 RTC_CHECK(rtc::Thread::Current() == pc_factory->signaling_thread());
45 // The signaling thread is the current thread so we can 45 // The signaling thread is the current thread so we can
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 } 346 }
347 347
348 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { 348 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() {
349 RTC_DCHECK(worker_thread_ == rtc::Thread::Current()); 349 RTC_DCHECK(worker_thread_ == rtc::Thread::Current());
350 return cricket::WebRtcMediaEngineFactory::Create( 350 return cricket::WebRtcMediaEngineFactory::Create(
351 default_adm_.get(), audio_decoder_factory_, video_encoder_factory_.get(), 351 default_adm_.get(), audio_decoder_factory_, video_encoder_factory_.get(),
352 video_decoder_factory_.get(), external_audio_mixer_); 352 video_decoder_factory_.get(), external_audio_mixer_);
353 } 353 }
354 354
355 } // namespace webrtc 355 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/pc/peerconnectionfactory.h ('k') | webrtc/pc/peerconnectionfactory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698