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

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

Issue 1968393002: Propogate network-worker thread split to api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase including nits Created 4 years, 7 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/peerconnectionendtoend_unittest.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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 return StartRtcEventLog(file, -1); 88 return StartRtcEventLog(file, -1);
89 } 89 }
90 bool StartRtcEventLog(rtc::PlatformFile file, 90 bool StartRtcEventLog(rtc::PlatformFile file,
91 int64_t max_size_bytes) override; 91 int64_t max_size_bytes) override;
92 void StopRtcEventLog() override; 92 void StopRtcEventLog() override;
93 93
94 virtual webrtc::MediaControllerInterface* CreateMediaController( 94 virtual webrtc::MediaControllerInterface* CreateMediaController(
95 const cricket::MediaConfig& config) const; 95 const cricket::MediaConfig& config) const;
96 virtual rtc::Thread* signaling_thread(); 96 virtual rtc::Thread* signaling_thread();
97 virtual rtc::Thread* worker_thread(); 97 virtual rtc::Thread* worker_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(
104 rtc::Thread* network_thread,
103 rtc::Thread* worker_thread, 105 rtc::Thread* worker_thread,
104 rtc::Thread* signaling_thread, 106 rtc::Thread* signaling_thread,
105 AudioDeviceModule* default_adm, 107 AudioDeviceModule* default_adm,
106 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, 108 cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
107 cricket::WebRtcVideoDecoderFactory* video_decoder_factory); 109 cricket::WebRtcVideoDecoderFactory* video_decoder_factory);
108 virtual ~PeerConnectionFactory(); 110 virtual ~PeerConnectionFactory();
109 111
110 private: 112 private:
111 cricket::MediaEngineInterface* CreateMediaEngine_w(); 113 cricket::MediaEngineInterface* CreateMediaEngine_w();
112 114
113 bool owns_ptrs_; 115 bool owns_ptrs_;
114 bool wraps_current_thread_; 116 bool wraps_current_thread_;
117 rtc::Thread* network_thread_;
118 rtc::Thread* worker_thread_;
115 rtc::Thread* signaling_thread_; 119 rtc::Thread* signaling_thread_;
116 rtc::Thread* worker_thread_;
117 Options options_; 120 Options options_;
118 // External Audio device used for audio playback. 121 // External Audio device used for audio playback.
119 rtc::scoped_refptr<AudioDeviceModule> default_adm_; 122 rtc::scoped_refptr<AudioDeviceModule> default_adm_;
120 std::unique_ptr<cricket::ChannelManager> channel_manager_; 123 std::unique_ptr<cricket::ChannelManager> channel_manager_;
121 // External Video encoder factory. This can be NULL if the client has not 124 // External Video encoder factory. This can be NULL if the client has not
122 // injected any. In that case, video engine will use the internal SW encoder. 125 // injected any. In that case, video engine will use the internal SW encoder.
123 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_; 126 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_;
124 // External Video decoder factory. This can be NULL if the client has not 127 // External Video decoder factory. This can be NULL if the client has not
125 // injected any. In that case, video engine will use the internal SW decoder. 128 // injected any. In that case, video engine will use the internal SW decoder.
126 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; 129 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_;
127 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; 130 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_;
128 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; 131 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
129 132
130 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_; 133 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_;
131 }; 134 };
132 135
133 } // namespace webrtc 136 } // namespace webrtc
134 137
135 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_ 138 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_
OLDNEW
« no previous file with comments | « webrtc/api/peerconnectionendtoend_unittest.cc ('k') | webrtc/api/peerconnectionfactory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698