Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(504)

Side by Side Diff: webrtc/api/peerconnectionfactory.h

Issue 2353033005: Refactoring: move ownership of RtcEventLog from Call to PeerConnection (Closed)
Patch Set: Moved the constructor Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/api/peerconnection.cc ('k') | webrtc/api/peerconnectionfactory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 11 matching lines...) Expand all
22 #include "webrtc/base/rtccertificategenerator.h" 22 #include "webrtc/base/rtccertificategenerator.h"
23 #include "webrtc/pc/channelmanager.h" 23 #include "webrtc/pc/channelmanager.h"
24 24
25 namespace rtc { 25 namespace rtc {
26 class BasicNetworkManager; 26 class BasicNetworkManager;
27 class BasicPacketSocketFactory; 27 class BasicPacketSocketFactory;
28 } 28 }
29 29
30 namespace webrtc { 30 namespace webrtc {
31 31
32 class RtcEventLog;
33
32 class PeerConnectionFactory : public PeerConnectionFactoryInterface { 34 class PeerConnectionFactory : public PeerConnectionFactoryInterface {
33 public: 35 public:
34 void SetOptions(const Options& options) override; 36 void SetOptions(const Options& options) override;
35 37
36 // Deprecated, use version without constraints. 38 // Deprecated, use version without constraints.
37 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( 39 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
38 const PeerConnectionInterface::RTCConfiguration& configuration, 40 const PeerConnectionInterface::RTCConfiguration& configuration,
39 const MediaConstraintsInterface* constraints, 41 const MediaConstraintsInterface* constraints,
40 std::unique_ptr<cricket::PortAllocator> allocator, 42 std::unique_ptr<cricket::PortAllocator> allocator,
41 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator, 43 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator,
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 bool StartRtcEventLog(rtc::PlatformFile file) override { return false; } 84 bool StartRtcEventLog(rtc::PlatformFile file) override { return false; }
83 // TODO(ivoc) Remove after Chrome is updated. 85 // TODO(ivoc) Remove after Chrome is updated.
84 bool StartRtcEventLog(rtc::PlatformFile file, 86 bool StartRtcEventLog(rtc::PlatformFile file,
85 int64_t max_size_bytes) override { 87 int64_t max_size_bytes) override {
86 return false; 88 return false;
87 } 89 }
88 // TODO(ivoc) Remove after Chrome is updated. 90 // TODO(ivoc) Remove after Chrome is updated.
89 void StopRtcEventLog() override {} 91 void StopRtcEventLog() override {}
90 92
91 virtual webrtc::MediaControllerInterface* CreateMediaController( 93 virtual webrtc::MediaControllerInterface* CreateMediaController(
92 const cricket::MediaConfig& config) const; 94 const cricket::MediaConfig& config,
95 RtcEventLog* event_log) const;
93 virtual cricket::TransportController* CreateTransportController( 96 virtual cricket::TransportController* CreateTransportController(
94 cricket::PortAllocator* port_allocator, 97 cricket::PortAllocator* port_allocator,
95 bool redetermine_role_on_ice_restart); 98 bool redetermine_role_on_ice_restart);
96 virtual rtc::Thread* signaling_thread(); 99 virtual rtc::Thread* signaling_thread();
97 virtual rtc::Thread* worker_thread(); 100 virtual rtc::Thread* worker_thread();
98 virtual rtc::Thread* network_thread(); 101 virtual rtc::Thread* network_thread();
99 const Options& options() const { return options_; } 102 const Options& options() const { return options_; }
100 103
101 protected: 104 protected:
102 PeerConnectionFactory(); 105 PeerConnectionFactory();
(...skipping 27 matching lines...) Expand all
130 // External Video decoder factory. This can be NULL if the client has not 133 // External Video decoder factory. This can be NULL if the client has not
131 // injected any. In that case, video engine will use the internal SW decoder. 134 // injected any. In that case, video engine will use the internal SW decoder.
132 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; 135 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_;
133 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; 136 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_;
134 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; 137 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
135 }; 138 };
136 139
137 } // namespace webrtc 140 } // namespace webrtc
138 141
139 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_ 142 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_
OLDNEW
« no previous file with comments | « webrtc/api/peerconnection.cc ('k') | webrtc/api/peerconnectionfactory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698