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

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

Issue 2961723004: Allow an external audio processing module to be used in WebRTC (Closed)
Patch Set: Moved creation of APMs from CreateVoiceEngines Created 3 years, 5 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 | « no previous file | webrtc/audio/audio_receive_stream_unittest.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 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 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 1145 matching lines...) Expand 10 before | Expand all | Expand 10 after
1156 // 1156 //
1157 // If |network_thread| or |worker_thread| are null, the PeerConnectionFactory 1157 // If |network_thread| or |worker_thread| are null, the PeerConnectionFactory
1158 // will create the necessary thread internally. If |signaling_thread| is null, 1158 // will create the necessary thread internally. If |signaling_thread| is null,
1159 // the PeerConnectionFactory will use the thread on which this method is called 1159 // the PeerConnectionFactory will use the thread on which this method is called
1160 // as the signaling thread, wrapping it in an rtc::Thread object if needed. 1160 // as the signaling thread, wrapping it in an rtc::Thread object if needed.
1161 // 1161 //
1162 // If non-null, a reference is added to |default_adm|, and ownership of 1162 // If non-null, a reference is added to |default_adm|, and ownership of
1163 // |video_encoder_factory| and |video_decoder_factory| is transferred to the 1163 // |video_encoder_factory| and |video_decoder_factory| is transferred to the
1164 // returned factory. 1164 // returned factory.
1165 // 1165 //
1166 // If |audio_mixer| is null, an internal audio mixer will be created and used.
1167 //
1166 // TODO(deadbeef): Use rtc::scoped_refptr<> and std::unique_ptr<> to make this 1168 // TODO(deadbeef): Use rtc::scoped_refptr<> and std::unique_ptr<> to make this
1167 // ownership transfer and ref counting more obvious. 1169 // ownership transfer and ref counting more obvious.
1168 // 1170 //
1169 // TODO(deadbeef): Encapsulate these modules in a struct, so that when a new 1171 // TODO(deadbeef): Encapsulate these modules in a struct, so that when a new
1170 // module is inevitably exposed, we can just add a field to the struct instead 1172 // module is inevitably exposed, we can just add a field to the struct instead
1171 // of adding a whole new CreateModularPeerConnectionFactory overload. 1173 // of adding a whole new CreateModularPeerConnectionFactory overload.
1172 rtc::scoped_refptr<PeerConnectionFactoryInterface> 1174 rtc::scoped_refptr<PeerConnectionFactoryInterface>
1173 CreateModularPeerConnectionFactory( 1175 CreateModularPeerConnectionFactory(
1174 rtc::Thread* network_thread, 1176 rtc::Thread* network_thread,
1175 rtc::Thread* worker_thread, 1177 rtc::Thread* worker_thread,
1176 rtc::Thread* signaling_thread, 1178 rtc::Thread* signaling_thread,
1177 AudioDeviceModule* default_adm, 1179 AudioDeviceModule* default_adm,
1178 rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory, 1180 rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory,
1179 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory, 1181 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory,
1180 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, 1182 cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
1181 cricket::WebRtcVideoDecoderFactory* video_decoder_factory, 1183 cricket::WebRtcVideoDecoderFactory* video_decoder_factory,
1182 rtc::scoped_refptr<AudioMixer> audio_mixer, 1184 rtc::scoped_refptr<AudioMixer> audio_mixer,
1183 std::unique_ptr<cricket::MediaEngineInterface> media_engine, 1185 std::unique_ptr<cricket::MediaEngineInterface> media_engine,
1184 std::unique_ptr<CallFactoryInterface> call_factory, 1186 std::unique_ptr<CallFactoryInterface> call_factory,
1185 std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory); 1187 std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory);
1186 1188
1187 } // namespace webrtc 1189 } // namespace webrtc
1188 1190
1189 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 1191 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/audio/audio_receive_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698