| 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 #include "webrtc/api/statstypes.h" | 84 #include "webrtc/api/statstypes.h" |
| 85 #include "webrtc/api/umametrics.h" | 85 #include "webrtc/api/umametrics.h" |
| 86 #include "webrtc/base/fileutils.h" | 86 #include "webrtc/base/fileutils.h" |
| 87 #include "webrtc/base/network.h" | 87 #include "webrtc/base/network.h" |
| 88 #include "webrtc/base/rtccertificate.h" | 88 #include "webrtc/base/rtccertificate.h" |
| 89 #include "webrtc/base/rtccertificategenerator.h" | 89 #include "webrtc/base/rtccertificategenerator.h" |
| 90 #include "webrtc/base/socketaddress.h" | 90 #include "webrtc/base/socketaddress.h" |
| 91 #include "webrtc/base/sslstreamadapter.h" | 91 #include "webrtc/base/sslstreamadapter.h" |
| 92 #include "webrtc/media/base/mediachannel.h" | 92 #include "webrtc/media/base/mediachannel.h" |
| 93 #include "webrtc/media/base/videocapturer.h" | 93 #include "webrtc/media/base/videocapturer.h" |
| 94 #include "webrtc/modules/audio_coding/codecs/audio_encoder_factory.h" |
| 94 #include "webrtc/p2p/base/portallocator.h" | 95 #include "webrtc/p2p/base/portallocator.h" |
| 95 | 96 |
| 96 namespace rtc { | 97 namespace rtc { |
| 97 class SSLIdentity; | 98 class SSLIdentity; |
| 98 class Thread; | 99 class Thread; |
| 99 } | 100 } |
| 100 | 101 |
| 101 namespace cricket { | 102 namespace cricket { |
| 102 class WebRtcVideoDecoderFactory; | 103 class WebRtcVideoDecoderFactory; |
| 103 class WebRtcVideoEncoderFactory; | 104 class WebRtcVideoEncoderFactory; |
| (...skipping 873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 977 // TODO(ivoc) Remove after Chrome is updated. | 978 // TODO(ivoc) Remove after Chrome is updated. |
| 978 virtual void StopRtcEventLog() = 0; | 979 virtual void StopRtcEventLog() = 0; |
| 979 | 980 |
| 980 protected: | 981 protected: |
| 981 // Dtor and ctor protected as objects shouldn't be created or deleted via | 982 // Dtor and ctor protected as objects shouldn't be created or deleted via |
| 982 // this interface. | 983 // this interface. |
| 983 PeerConnectionFactoryInterface() {} | 984 PeerConnectionFactoryInterface() {} |
| 984 ~PeerConnectionFactoryInterface() {} // NOLINT | 985 ~PeerConnectionFactoryInterface() {} // NOLINT |
| 985 }; | 986 }; |
| 986 | 987 |
| 987 // TODO(ossu): Remove these and define a real builtin audio encoder factory | |
| 988 // instead. | |
| 989 class AudioEncoderFactory : public rtc::RefCountInterface {}; | |
| 990 inline rtc::scoped_refptr<AudioEncoderFactory> | |
| 991 CreateBuiltinAudioEncoderFactory() { | |
| 992 return nullptr; | |
| 993 } | |
| 994 | |
| 995 // Create a new instance of PeerConnectionFactoryInterface. | 988 // Create a new instance of PeerConnectionFactoryInterface. |
| 996 // | 989 // |
| 997 // This method relies on the thread it's called on as the "signaling thread" | 990 // This method relies on the thread it's called on as the "signaling thread" |
| 998 // for the PeerConnectionFactory it creates. | 991 // for the PeerConnectionFactory it creates. |
| 999 // | 992 // |
| 1000 // As such, if the current thread is not already running an rtc::Thread message | 993 // As such, if the current thread is not already running an rtc::Thread message |
| 1001 // loop, an application using this method must eventually either call | 994 // loop, an application using this method must eventually either call |
| 1002 // rtc::Thread::Current()->Run(), or call | 995 // rtc::Thread::Current()->Run(), or call |
| 1003 // rtc::Thread::Current()->ProcessMessages() within the application's own | 996 // rtc::Thread::Current()->ProcessMessages() within the application's own |
| 1004 // message loop. | 997 // message loop. |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1096 cricket::WebRtcVideoEncoderFactory* encoder_factory, | 1089 cricket::WebRtcVideoEncoderFactory* encoder_factory, |
| 1097 cricket::WebRtcVideoDecoderFactory* decoder_factory) { | 1090 cricket::WebRtcVideoDecoderFactory* decoder_factory) { |
| 1098 return CreatePeerConnectionFactory( | 1091 return CreatePeerConnectionFactory( |
| 1099 worker_and_network_thread, worker_and_network_thread, signaling_thread, | 1092 worker_and_network_thread, worker_and_network_thread, signaling_thread, |
| 1100 default_adm, encoder_factory, decoder_factory); | 1093 default_adm, encoder_factory, decoder_factory); |
| 1101 } | 1094 } |
| 1102 | 1095 |
| 1103 } // namespace webrtc | 1096 } // namespace webrtc |
| 1104 | 1097 |
| 1105 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ | 1098 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ |
| OLD | NEW |