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

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

Issue 1888903003: Network thread (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 84
85 bool StartAecDump(rtc::PlatformFile file, int64_t max_size_bytes) override; 85 bool StartAecDump(rtc::PlatformFile file, int64_t max_size_bytes) override;
86 void StopAecDump() override; 86 void StopAecDump() override;
87 bool StartRtcEventLog(rtc::PlatformFile file) override; 87 bool StartRtcEventLog(rtc::PlatformFile file) override;
88 void StopRtcEventLog() override; 88 void StopRtcEventLog() override;
89 89
90 virtual webrtc::MediaControllerInterface* CreateMediaController( 90 virtual webrtc::MediaControllerInterface* CreateMediaController(
91 const cricket::MediaConfig& config) const; 91 const cricket::MediaConfig& config) const;
92 virtual rtc::Thread* signaling_thread(); 92 virtual rtc::Thread* signaling_thread();
93 virtual rtc::Thread* worker_thread(); 93 virtual rtc::Thread* worker_thread();
94 rtc::Thread* network_thread();
94 const Options& options() const { return options_; } 95 const Options& options() const { return options_; }
95 96
96 protected: 97 protected:
97 PeerConnectionFactory(); 98 PeerConnectionFactory();
98 PeerConnectionFactory( 99 PeerConnectionFactory(
100 rtc::Thread* network_thread,
99 rtc::Thread* worker_thread, 101 rtc::Thread* worker_thread,
100 rtc::Thread* signaling_thread, 102 rtc::Thread* signaling_thread,
101 AudioDeviceModule* default_adm, 103 AudioDeviceModule* default_adm,
102 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, 104 cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
103 cricket::WebRtcVideoDecoderFactory* video_decoder_factory); 105 cricket::WebRtcVideoDecoderFactory* video_decoder_factory);
104 virtual ~PeerConnectionFactory(); 106 virtual ~PeerConnectionFactory();
105 107
106 private: 108 private:
107 cricket::MediaEngineInterface* CreateMediaEngine_w(); 109 cricket::MediaEngineInterface* CreateMediaEngine_w();
108 110
109 bool owns_ptrs_; 111 bool owns_ptrs_;
110 bool wraps_current_thread_; 112 bool wraps_current_thread_;
111 rtc::Thread* signaling_thread_; 113 rtc::Thread* signaling_thread_;
114 rtc::Thread* network_thread_;
112 rtc::Thread* worker_thread_; 115 rtc::Thread* worker_thread_;
113 Options options_; 116 Options options_;
114 // External Audio device used for audio playback. 117 // External Audio device used for audio playback.
115 rtc::scoped_refptr<AudioDeviceModule> default_adm_; 118 rtc::scoped_refptr<AudioDeviceModule> default_adm_;
116 std::unique_ptr<cricket::ChannelManager> channel_manager_; 119 std::unique_ptr<cricket::ChannelManager> channel_manager_;
117 // External Video encoder factory. This can be NULL if the client has not 120 // External Video encoder factory. This can be NULL if the client has not
118 // injected any. In that case, video engine will use the internal SW encoder. 121 // injected any. In that case, video engine will use the internal SW encoder.
119 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_; 122 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_;
120 // External Video decoder factory. This can be NULL if the client has not 123 // External Video decoder factory. This can be NULL if the client has not
121 // injected any. In that case, video engine will use the internal SW decoder. 124 // injected any. In that case, video engine will use the internal SW decoder.
122 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; 125 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_;
123 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; 126 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_;
124 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; 127 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
125 128
126 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_; 129 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_;
127 }; 130 };
128 131
129 } // namespace webrtc 132 } // namespace webrtc
130 133
131 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_ 134 #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