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

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

Issue 2888303003: Work-in-progress upload to add worker task queue to PC factory.
Patch Set: Rebase. Created 3 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/media/engine/webrtcvoiceengine_unittest.cc ('k') | webrtc/pc/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
11 #ifndef WEBRTC_PC_PEERCONNECTIONFACTORY_H_ 11 #ifndef WEBRTC_PC_PEERCONNECTIONFACTORY_H_
12 #define WEBRTC_PC_PEERCONNECTIONFACTORY_H_ 12 #define WEBRTC_PC_PEERCONNECTIONFACTORY_H_
13 13
14 #include <memory> 14 #include <memory>
15 #include <string> 15 #include <string>
16 16
17 #include "webrtc/api/mediastreaminterface.h" 17 #include "webrtc/api/mediastreaminterface.h"
18 #include "webrtc/api/peerconnectioninterface.h" 18 #include "webrtc/api/peerconnectioninterface.h"
19 #include "webrtc/base/rtccertificategenerator.h"
19 #include "webrtc/base/scoped_ref_ptr.h" 20 #include "webrtc/base/scoped_ref_ptr.h"
21 #include "webrtc/base/task_queue.h"
20 #include "webrtc/base/thread.h" 22 #include "webrtc/base/thread.h"
21 #include "webrtc/base/rtccertificategenerator.h"
22 #include "webrtc/pc/channelmanager.h" 23 #include "webrtc/pc/channelmanager.h"
23 24
24 namespace rtc { 25 namespace rtc {
25 class BasicNetworkManager; 26 class BasicNetworkManager;
26 class BasicPacketSocketFactory; 27 class BasicPacketSocketFactory;
27 } 28 }
28 29
29 namespace webrtc { 30 namespace webrtc {
30 31
31 class RtcEventLog; 32 class RtcEventLog;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 123
123 private: 124 private:
124 std::unique_ptr<cricket::MediaEngineInterface> CreateMediaEngine_w(); 125 std::unique_ptr<cricket::MediaEngineInterface> CreateMediaEngine_w();
125 126
126 bool owns_ptrs_; 127 bool owns_ptrs_;
127 bool wraps_current_thread_; 128 bool wraps_current_thread_;
128 rtc::Thread* network_thread_; 129 rtc::Thread* network_thread_;
129 rtc::Thread* worker_thread_; 130 rtc::Thread* worker_thread_;
130 rtc::Thread* signaling_thread_; 131 rtc::Thread* signaling_thread_;
131 Options options_; 132 Options options_;
133 rtc::TaskQueue low_priority_worker_queue_;
132 // External Audio device used for audio playback. 134 // External Audio device used for audio playback.
133 rtc::scoped_refptr<AudioDeviceModule> default_adm_; 135 rtc::scoped_refptr<AudioDeviceModule> default_adm_;
134 rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory_; 136 rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory_;
135 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory_; 137 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory_;
136 std::unique_ptr<cricket::ChannelManager> channel_manager_; 138 std::unique_ptr<cricket::ChannelManager> channel_manager_;
137 // External Video encoder factory. This can be NULL if the client has not 139 // External Video encoder factory. This can be NULL if the client has not
138 // injected any. In that case, video engine will use the internal SW encoder. 140 // injected any. In that case, video engine will use the internal SW encoder.
139 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_; 141 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_;
140 // External Video decoder factory. This can be NULL if the client has not 142 // External Video decoder factory. This can be NULL if the client has not
141 // injected any. In that case, video engine will use the internal SW decoder. 143 // injected any. In that case, video engine will use the internal SW decoder.
142 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; 144 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_;
143 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; 145 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_;
144 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; 146 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
145 // External audio mixer. This can be NULL. In that case, internal audio mixer 147 // External audio mixer. This can be NULL. In that case, internal audio mixer
146 // will be created and used. 148 // will be created and used.
147 rtc::scoped_refptr<AudioMixer> external_audio_mixer_; 149 rtc::scoped_refptr<AudioMixer> external_audio_mixer_;
148 }; 150 };
149 151
150 } // namespace webrtc 152 } // namespace webrtc
151 153
152 #endif // WEBRTC_PC_PEERCONNECTIONFACTORY_H_ 154 #endif // WEBRTC_PC_PEERCONNECTIONFACTORY_H_
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvoiceengine_unittest.cc ('k') | webrtc/pc/peerconnectionfactory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698