Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright 2011 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2011 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 bool StartRtcEventLog(rtc::PlatformFile file, | 84 bool StartRtcEventLog(rtc::PlatformFile file, |
| 85 int64_t max_size_bytes) override { | 85 int64_t max_size_bytes) override { |
| 86 return false; | 86 return false; |
| 87 } | 87 } |
| 88 // TODO(ivoc) Remove after Chrome is updated. | 88 // TODO(ivoc) Remove after Chrome is updated. |
| 89 void StopRtcEventLog() override {} | 89 void StopRtcEventLog() override {} |
| 90 | 90 |
| 91 virtual webrtc::MediaControllerInterface* CreateMediaController( | 91 virtual webrtc::MediaControllerInterface* CreateMediaController( |
| 92 const cricket::MediaConfig& config) const; | 92 const cricket::MediaConfig& config) const; |
| 93 virtual cricket::TransportController* CreateTransportController( | 93 virtual cricket::TransportController* CreateTransportController( |
| 94 cricket::PortAllocator* port_allocator); | 94 cricket::PortAllocator* port_allocator, |
| 95 bool redetermine_role_on_ice_restart); | |
|
pthatcher1
2016/08/29 22:18:07
Can we make this a struct instead of a bool? Then
honghaiz3
2016/08/29 23:16:59
Can we delay using a struct until we need to add a
pthatcher1
2016/08/29 23:27:42
Good point about removing it soon.
| |
| 95 virtual rtc::Thread* signaling_thread(); | 96 virtual rtc::Thread* signaling_thread(); |
| 96 virtual rtc::Thread* worker_thread(); | 97 virtual rtc::Thread* worker_thread(); |
| 97 virtual rtc::Thread* network_thread(); | 98 virtual rtc::Thread* network_thread(); |
| 98 const Options& options() const { return options_; } | 99 const Options& options() const { return options_; } |
| 99 | 100 |
| 100 protected: | 101 protected: |
| 101 PeerConnectionFactory(); | 102 PeerConnectionFactory(); |
| 102 PeerConnectionFactory( | 103 PeerConnectionFactory( |
| 103 rtc::Thread* network_thread, | 104 rtc::Thread* network_thread, |
| 104 rtc::Thread* worker_thread, | 105 rtc::Thread* worker_thread, |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 129 // External Video decoder factory. This can be NULL if the client has not | 130 // External Video decoder factory. This can be NULL if the client has not |
| 130 // injected any. In that case, video engine will use the internal SW decoder. | 131 // injected any. In that case, video engine will use the internal SW decoder. |
| 131 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; | 132 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; |
| 132 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; | 133 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; |
| 133 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; | 134 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; |
| 134 }; | 135 }; |
| 135 | 136 |
| 136 } // namespace webrtc | 137 } // namespace webrtc |
| 137 | 138 |
| 138 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_ | 139 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_ |
| OLD | NEW |