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

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

Issue 3005153002: Reland of Make RtcEventLogImpl to use a TaskQueue instead of a helper-thread (Closed)
Patch Set: . Created 3 years, 3 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/pc/peerconnection.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::scoped_refptr<webrtc::AudioDecoderFactory> audio_decoder_factory, 114 rtc::scoped_refptr<webrtc::AudioDecoderFactory> audio_decoder_factory,
115 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, 115 cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
116 cricket::WebRtcVideoDecoderFactory* video_decoder_factory, 116 cricket::WebRtcVideoDecoderFactory* video_decoder_factory,
117 rtc::scoped_refptr<AudioMixer> audio_mixer, 117 rtc::scoped_refptr<AudioMixer> audio_mixer,
118 std::unique_ptr<cricket::MediaEngineInterface> media_engine, 118 std::unique_ptr<cricket::MediaEngineInterface> media_engine,
119 std::unique_ptr<webrtc::CallFactoryInterface> call_factory, 119 std::unique_ptr<webrtc::CallFactoryInterface> call_factory,
120 std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory); 120 std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory);
121 virtual ~PeerConnectionFactory(); 121 virtual ~PeerConnectionFactory();
122 122
123 private: 123 private:
124 std::unique_ptr<RtcEventLog> CreateRtcEventLog_w();
124 std::unique_ptr<Call> CreateCall_w(RtcEventLog* event_log); 125 std::unique_ptr<Call> CreateCall_w(RtcEventLog* event_log);
125 126
126 bool wraps_current_thread_; 127 bool wraps_current_thread_;
127 rtc::Thread* network_thread_; 128 rtc::Thread* network_thread_;
128 rtc::Thread* worker_thread_; 129 rtc::Thread* worker_thread_;
129 rtc::Thread* signaling_thread_; 130 rtc::Thread* signaling_thread_;
130 std::unique_ptr<rtc::Thread> owned_network_thread_; 131 std::unique_ptr<rtc::Thread> owned_network_thread_;
131 std::unique_ptr<rtc::Thread> owned_worker_thread_; 132 std::unique_ptr<rtc::Thread> owned_worker_thread_;
132 Options options_; 133 Options options_;
133 // External Audio device used for audio playback. 134 // External Audio device used for audio playback.
(...skipping 13 matching lines...) Expand all
147 // will be created and used. 148 // will be created and used.
148 rtc::scoped_refptr<AudioMixer> external_audio_mixer_; 149 rtc::scoped_refptr<AudioMixer> external_audio_mixer_;
149 std::unique_ptr<cricket::MediaEngineInterface> media_engine_; 150 std::unique_ptr<cricket::MediaEngineInterface> media_engine_;
150 std::unique_ptr<webrtc::CallFactoryInterface> call_factory_; 151 std::unique_ptr<webrtc::CallFactoryInterface> call_factory_;
151 std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory_; 152 std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory_;
152 }; 153 };
153 154
154 } // namespace webrtc 155 } // namespace webrtc
155 156
156 #endif // WEBRTC_PC_PEERCONNECTIONFACTORY_H_ 157 #endif // WEBRTC_PC_PEERCONNECTIONFACTORY_H_
OLDNEW
« no previous file with comments | « webrtc/pc/peerconnection.cc ('k') | webrtc/pc/peerconnectionfactory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698