| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2017 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2017 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 // If we created/own the objects above, these will be non-null and thus will | 128 // If we created/own the objects above, these will be non-null and thus will |
| 129 // be released automatically upon destruction. | 129 // be released automatically upon destruction. |
| 130 std::unique_ptr<rtc::Thread> owned_network_thread_; | 130 std::unique_ptr<rtc::Thread> owned_network_thread_; |
| 131 bool wraps_signaling_thread_ = false; | 131 bool wraps_signaling_thread_ = false; |
| 132 std::unique_ptr<rtc::NetworkManager> owned_network_manager_; | 132 std::unique_ptr<rtc::NetworkManager> owned_network_manager_; |
| 133 std::unique_ptr<rtc::PacketSocketFactory> owned_socket_factory_; | 133 std::unique_ptr<rtc::PacketSocketFactory> owned_socket_factory_; |
| 134 // We always own the worker thread. | 134 // We always own the worker thread. |
| 135 std::unique_ptr<rtc::Thread> worker_thread_; | 135 std::unique_ptr<rtc::Thread> worker_thread_; |
| 136 // Media-releated objects. | 136 // Media-releated objects. |
| 137 std::unique_ptr<RtcEventLog> null_event_log_; | 137 std::unique_ptr<RtcEventLog> null_event_log_; |
| 138 rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory_; |
| 138 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory_; | 139 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory_; |
| 139 std::unique_ptr<cricket::ChannelManager> channel_manager_; | 140 std::unique_ptr<cricket::ChannelManager> channel_manager_; |
| 140 // Default CNAME to use for RtpTransports if none is passed in. | 141 // Default CNAME to use for RtpTransports if none is passed in. |
| 141 std::string default_cname_; | 142 std::string default_cname_; |
| 142 | 143 |
| 143 friend class OrtcFactoryInterface; | 144 friend class OrtcFactoryInterface; |
| 144 | 145 |
| 145 RTC_DISALLOW_COPY_AND_ASSIGN(OrtcFactory); | 146 RTC_DISALLOW_COPY_AND_ASSIGN(OrtcFactory); |
| 146 }; | 147 }; |
| 147 | 148 |
| 148 } // namespace webrtc | 149 } // namespace webrtc |
| 149 | 150 |
| 150 #endif // WEBRTC_ORTC_ORTCFACTORY_H_ | 151 #endif // WEBRTC_ORTC_ORTCFACTORY_H_ |
| OLD | NEW |