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

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

Issue 2934103002: Allow WebRtcMediaEngine to be created from any thread. (Closed)
Patch Set: Adding DCHECK for encoder_factory Created 3 years, 6 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
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 rtc::Thread* signaling_thread, 114 rtc::Thread* signaling_thread,
115 AudioDeviceModule* default_adm, 115 AudioDeviceModule* default_adm,
116 rtc::scoped_refptr<webrtc::AudioEncoderFactory> audio_encoder_factory, 116 rtc::scoped_refptr<webrtc::AudioEncoderFactory> audio_encoder_factory,
117 rtc::scoped_refptr<webrtc::AudioDecoderFactory> audio_decoder_factory, 117 rtc::scoped_refptr<webrtc::AudioDecoderFactory> audio_decoder_factory,
118 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, 118 cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
119 cricket::WebRtcVideoDecoderFactory* video_decoder_factory, 119 cricket::WebRtcVideoDecoderFactory* video_decoder_factory,
120 rtc::scoped_refptr<AudioMixer> audio_mixer); 120 rtc::scoped_refptr<AudioMixer> audio_mixer);
121 virtual ~PeerConnectionFactory(); 121 virtual ~PeerConnectionFactory();
122 122
123 private: 123 private:
124 std::unique_ptr<cricket::MediaEngineInterface> CreateMediaEngine_w();
125
126 bool owns_ptrs_; 124 bool owns_ptrs_;
127 bool wraps_current_thread_; 125 bool wraps_current_thread_;
128 rtc::Thread* network_thread_; 126 rtc::Thread* network_thread_;
129 rtc::Thread* worker_thread_; 127 rtc::Thread* worker_thread_;
130 rtc::Thread* signaling_thread_; 128 rtc::Thread* signaling_thread_;
131 Options options_; 129 Options options_;
132 // External Audio device used for audio playback. 130 // External Audio device used for audio playback.
133 rtc::scoped_refptr<AudioDeviceModule> default_adm_; 131 rtc::scoped_refptr<AudioDeviceModule> default_adm_;
134 rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory_; 132 rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory_;
135 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory_; 133 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory_;
136 std::unique_ptr<cricket::ChannelManager> channel_manager_; 134 std::unique_ptr<cricket::ChannelManager> channel_manager_;
137 // External Video encoder factory. This can be NULL if the client has not 135 // 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. 136 // injected any. In that case, video engine will use the internal SW encoder.
139 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_; 137 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_;
140 // External Video decoder factory. This can be NULL if the client has not 138 // 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. 139 // injected any. In that case, video engine will use the internal SW decoder.
142 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; 140 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_;
143 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; 141 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_;
144 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; 142 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
145 // External audio mixer. This can be NULL. In that case, internal audio mixer 143 // External audio mixer. This can be NULL. In that case, internal audio mixer
146 // will be created and used. 144 // will be created and used.
147 rtc::scoped_refptr<AudioMixer> external_audio_mixer_; 145 rtc::scoped_refptr<AudioMixer> external_audio_mixer_;
148 }; 146 };
149 147
150 } // namespace webrtc 148 } // namespace webrtc
151 149
152 #endif // WEBRTC_PC_PEERCONNECTIONFACTORY_H_ 150 #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