OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 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 |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 | 58 |
59 #include "webrtc/api/datachannelinterface.h" | 59 #include "webrtc/api/datachannelinterface.h" |
60 #include "webrtc/api/dtlsidentitystore.h" | 60 #include "webrtc/api/dtlsidentitystore.h" |
61 #include "webrtc/api/dtmfsenderinterface.h" | 61 #include "webrtc/api/dtmfsenderinterface.h" |
62 #include "webrtc/api/jsep.h" | 62 #include "webrtc/api/jsep.h" |
63 #include "webrtc/api/mediastreaminterface.h" | 63 #include "webrtc/api/mediastreaminterface.h" |
64 #include "webrtc/api/rtpreceiverinterface.h" | 64 #include "webrtc/api/rtpreceiverinterface.h" |
65 #include "webrtc/api/rtpsenderinterface.h" | 65 #include "webrtc/api/rtpsenderinterface.h" |
66 #include "webrtc/api/statstypes.h" | 66 #include "webrtc/api/statstypes.h" |
67 #include "webrtc/api/umametrics.h" | 67 #include "webrtc/api/umametrics.h" |
68 #include "webrtc/base/deprecation.h" | |
69 #include "webrtc/base/fileutils.h" | 68 #include "webrtc/base/fileutils.h" |
70 #include "webrtc/base/network.h" | 69 #include "webrtc/base/network.h" |
71 #include "webrtc/base/rtccertificate.h" | 70 #include "webrtc/base/rtccertificate.h" |
72 #include "webrtc/base/socketaddress.h" | 71 #include "webrtc/base/socketaddress.h" |
73 #include "webrtc/base/sslstreamadapter.h" | 72 #include "webrtc/base/sslstreamadapter.h" |
74 #include "webrtc/media/base/mediachannel.h" | 73 #include "webrtc/media/base/mediachannel.h" |
75 #include "webrtc/p2p/base/portallocator.h" | 74 #include "webrtc/p2p/base/portallocator.h" |
76 | 75 |
77 namespace rtc { | 76 namespace rtc { |
78 class SSLIdentity; | 77 class SSLIdentity; |
(...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
687 rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory( | 686 rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory( |
688 rtc::Thread* network_thread, | 687 rtc::Thread* network_thread, |
689 rtc::Thread* worker_thread, | 688 rtc::Thread* worker_thread, |
690 rtc::Thread* signaling_thread, | 689 rtc::Thread* signaling_thread, |
691 AudioDeviceModule* default_adm, | 690 AudioDeviceModule* default_adm, |
692 cricket::WebRtcVideoEncoderFactory* encoder_factory, | 691 cricket::WebRtcVideoEncoderFactory* encoder_factory, |
693 cricket::WebRtcVideoDecoderFactory* decoder_factory); | 692 cricket::WebRtcVideoDecoderFactory* decoder_factory); |
694 | 693 |
695 // Create a new instance of PeerConnectionFactoryInterface. | 694 // Create a new instance of PeerConnectionFactoryInterface. |
696 // Same thread is used as worker and network thread. | 695 // Same thread is used as worker and network thread. |
697 RTC_DEPRECATED | |
698 inline rtc::scoped_refptr<PeerConnectionFactoryInterface> | 696 inline rtc::scoped_refptr<PeerConnectionFactoryInterface> |
699 CreatePeerConnectionFactory( | 697 CreatePeerConnectionFactory( |
700 rtc::Thread* worker_and_network_thread, | 698 rtc::Thread* worker_and_network_thread, |
701 rtc::Thread* signaling_thread, | 699 rtc::Thread* signaling_thread, |
702 AudioDeviceModule* default_adm, | 700 AudioDeviceModule* default_adm, |
703 cricket::WebRtcVideoEncoderFactory* encoder_factory, | 701 cricket::WebRtcVideoEncoderFactory* encoder_factory, |
704 cricket::WebRtcVideoDecoderFactory* decoder_factory) { | 702 cricket::WebRtcVideoDecoderFactory* decoder_factory) { |
705 return CreatePeerConnectionFactory( | 703 return CreatePeerConnectionFactory( |
706 worker_and_network_thread, worker_and_network_thread, signaling_thread, | 704 worker_and_network_thread, worker_and_network_thread, signaling_thread, |
707 default_adm, encoder_factory, decoder_factory); | 705 default_adm, encoder_factory, decoder_factory); |
708 } | 706 } |
709 | 707 |
710 } // namespace webrtc | 708 } // namespace webrtc |
711 | 709 |
712 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ | 710 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ |
OLD | NEW |