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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 #ifndef WEBRTC_API_PEERCONNECTIONINTERFACE_H_ | 51 #ifndef WEBRTC_API_PEERCONNECTIONINTERFACE_H_ |
52 #define WEBRTC_API_PEERCONNECTIONINTERFACE_H_ | 52 #define WEBRTC_API_PEERCONNECTIONINTERFACE_H_ |
53 | 53 |
54 #include <memory> | 54 #include <memory> |
55 #include <string> | 55 #include <string> |
56 #include <utility> | 56 #include <utility> |
57 #include <vector> | 57 #include <vector> |
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/dtlsidentitystore.h" | |
62 #include "webrtc/api/dtmfsenderinterface.h" | 61 #include "webrtc/api/dtmfsenderinterface.h" |
63 #include "webrtc/api/jsep.h" | 62 #include "webrtc/api/jsep.h" |
64 #include "webrtc/api/mediastreaminterface.h" | 63 #include "webrtc/api/mediastreaminterface.h" |
65 #include "webrtc/api/rtpreceiverinterface.h" | 64 #include "webrtc/api/rtpreceiverinterface.h" |
66 #include "webrtc/api/rtpsenderinterface.h" | 65 #include "webrtc/api/rtpsenderinterface.h" |
67 #include "webrtc/api/statstypes.h" | 66 #include "webrtc/api/statstypes.h" |
68 #include "webrtc/api/umametrics.h" | 67 #include "webrtc/api/umametrics.h" |
| 68 #include "webrtc/base/deprecation.h" |
69 #include "webrtc/base/fileutils.h" | 69 #include "webrtc/base/fileutils.h" |
70 #include "webrtc/base/network.h" | 70 #include "webrtc/base/network.h" |
71 #include "webrtc/base/rtccertificate.h" | 71 #include "webrtc/base/rtccertificate.h" |
72 #include "webrtc/base/socketaddress.h" | 72 #include "webrtc/base/socketaddress.h" |
73 #include "webrtc/base/sslstreamadapter.h" | 73 #include "webrtc/base/sslstreamadapter.h" |
74 #include "webrtc/media/base/mediachannel.h" | 74 #include "webrtc/media/base/mediachannel.h" |
75 #include "webrtc/p2p/base/portallocator.h" | 75 #include "webrtc/p2p/base/portallocator.h" |
76 | 76 |
77 namespace rtc { | 77 namespace rtc { |
78 class SSLIdentity; | 78 class SSLIdentity; |
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
672 // As such, if the current thread is not already running an rtc::Thread message | 672 // As such, if the current thread is not already running an rtc::Thread message |
673 // loop, an application using this method must eventually either call | 673 // loop, an application using this method must eventually either call |
674 // rtc::Thread::Current()->Run(), or call | 674 // rtc::Thread::Current()->Run(), or call |
675 // rtc::Thread::Current()->ProcessMessages() within the application's own | 675 // rtc::Thread::Current()->ProcessMessages() within the application's own |
676 // message loop. | 676 // message loop. |
677 rtc::scoped_refptr<PeerConnectionFactoryInterface> | 677 rtc::scoped_refptr<PeerConnectionFactoryInterface> |
678 CreatePeerConnectionFactory(); | 678 CreatePeerConnectionFactory(); |
679 | 679 |
680 // Create a new instance of PeerConnectionFactoryInterface. | 680 // Create a new instance of PeerConnectionFactoryInterface. |
681 // | 681 // |
682 // |worker_thread| and |signaling_thread| are the only mandatory | 682 // |network_thread|, |worker_thread| and |signaling_thread| are |
683 // parameters. | 683 // the only mandatory parameters. |
684 // | 684 // |
685 // If non-null, ownership of |default_adm|, |encoder_factory| and | 685 // If non-null, ownership of |default_adm|, |encoder_factory| and |
686 // |decoder_factory| are transferred to the returned factory. | 686 // |decoder_factory| are transferred to the returned factory. |
687 rtc::scoped_refptr<PeerConnectionFactoryInterface> | 687 rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory( |
688 CreatePeerConnectionFactory( | 688 rtc::Thread* network_thread, |
689 rtc::Thread* worker_thread, | 689 rtc::Thread* worker_thread, |
690 rtc::Thread* signaling_thread, | 690 rtc::Thread* signaling_thread, |
691 AudioDeviceModule* default_adm, | 691 AudioDeviceModule* default_adm, |
692 cricket::WebRtcVideoEncoderFactory* encoder_factory, | 692 cricket::WebRtcVideoEncoderFactory* encoder_factory, |
693 cricket::WebRtcVideoDecoderFactory* decoder_factory); | 693 cricket::WebRtcVideoDecoderFactory* decoder_factory); |
694 | 694 |
| 695 // Create a new instance of PeerConnectionFactoryInterface. |
| 696 // Same thread is used as worker and network thread. |
| 697 RTC_DEPRECATED |
| 698 inline rtc::scoped_refptr<PeerConnectionFactoryInterface> |
| 699 CreatePeerConnectionFactory( |
| 700 rtc::Thread* worker_and_network_thread, |
| 701 rtc::Thread* signaling_thread, |
| 702 AudioDeviceModule* default_adm, |
| 703 cricket::WebRtcVideoEncoderFactory* encoder_factory, |
| 704 cricket::WebRtcVideoDecoderFactory* decoder_factory) { |
| 705 return CreatePeerConnectionFactory( |
| 706 worker_and_network_thread, worker_and_network_thread, signaling_thread, |
| 707 default_adm, encoder_factory, decoder_factory); |
| 708 } |
| 709 |
695 } // namespace webrtc | 710 } // namespace webrtc |
696 | 711 |
697 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ | 712 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ |
OLD | NEW |