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

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

Issue 2799033006: Injectable audio encoders: Moved audio encoder, factory and builtin factory to api/. (Closed)
Patch Set: More backwards-compatibility! 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/ortc/ortcfactory.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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 std::unique_ptr<cricket::MediaEngineInterface> CreateMediaEngine_w(); 127 std::unique_ptr<cricket::MediaEngineInterface> CreateMediaEngine_w();
128 128
129 bool owns_ptrs_; 129 bool owns_ptrs_;
130 bool wraps_current_thread_; 130 bool wraps_current_thread_;
131 rtc::Thread* network_thread_; 131 rtc::Thread* network_thread_;
132 rtc::Thread* worker_thread_; 132 rtc::Thread* worker_thread_;
133 rtc::Thread* signaling_thread_; 133 rtc::Thread* signaling_thread_;
134 Options options_; 134 Options options_;
135 // External Audio device used for audio playback. 135 // External Audio device used for audio playback.
136 rtc::scoped_refptr<AudioDeviceModule> default_adm_; 136 rtc::scoped_refptr<AudioDeviceModule> default_adm_;
137 rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory_;
137 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory_; 138 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory_;
138 std::unique_ptr<cricket::ChannelManager> channel_manager_; 139 std::unique_ptr<cricket::ChannelManager> channel_manager_;
139 // External Video encoder factory. This can be NULL if the client has not 140 // External Video encoder factory. This can be NULL if the client has not
140 // injected any. In that case, video engine will use the internal SW encoder. 141 // injected any. In that case, video engine will use the internal SW encoder.
141 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_; 142 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_;
142 // External Video decoder factory. This can be NULL if the client has not 143 // External Video decoder factory. This can be NULL if the client has not
143 // injected any. In that case, video engine will use the internal SW decoder. 144 // injected any. In that case, video engine will use the internal SW decoder.
144 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; 145 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_;
145 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; 146 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_;
146 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; 147 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
147 // External audio mixer. This can be NULL. In that case, internal audio mixer 148 // External audio mixer. This can be NULL. In that case, internal audio mixer
148 // will be created and used. 149 // will be created and used.
149 rtc::scoped_refptr<AudioMixer> external_audio_mixer_; 150 rtc::scoped_refptr<AudioMixer> external_audio_mixer_;
150 }; 151 };
151 152
152 } // namespace webrtc 153 } // namespace webrtc
153 154
154 #endif // WEBRTC_PC_PEERCONNECTIONFACTORY_H_ 155 #endif // WEBRTC_PC_PEERCONNECTIONFACTORY_H_
OLDNEW
« no previous file with comments | « webrtc/ortc/ortcfactory.cc ('k') | webrtc/pc/peerconnectionfactory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698