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

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

Issue 2965703002: Enable the injection of an APM into a peerconnection (Closed)
Patch Set: 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
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 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after
1073 // Deprecated variant of the above. 1073 // Deprecated variant of the above.
1074 // TODO(kwiberg): Remove. 1074 // TODO(kwiberg): Remove.
1075 rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory( 1075 rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
1076 rtc::Thread* network_thread, 1076 rtc::Thread* network_thread,
1077 rtc::Thread* worker_thread, 1077 rtc::Thread* worker_thread,
1078 rtc::Thread* signaling_thread, 1078 rtc::Thread* signaling_thread,
1079 AudioDeviceModule* default_adm, 1079 AudioDeviceModule* default_adm,
1080 cricket::WebRtcVideoEncoderFactory* encoder_factory, 1080 cricket::WebRtcVideoEncoderFactory* encoder_factory,
1081 cricket::WebRtcVideoDecoderFactory* decoder_factory); 1081 cricket::WebRtcVideoDecoderFactory* decoder_factory);
1082 1082
1083 // Create a new instance of PeerConnectionFactoryInterface with optional
1084 // external audio mixed and audio processing modules.
1085 //
1086 // If |audio_mixer| is null, an internal audio mixer will be created and used.
1087 // If |audio_processing| is null, an internal audio processing module will be
1088 // created and used.
1089 rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
peah-webrtc 2017/06/30 11:48:46 This name was chosen in discussion with kwiberg@ a
Taylor Brandstetter 2017/06/30 14:18:39 Agreed. We touched on this is a "slim/modular webr
1090 rtc::Thread* network_thread,
1091 rtc::Thread* worker_thread,
1092 rtc::Thread* signaling_thread,
1093 AudioDeviceModule* default_adm,
1094 rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory,
1095 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory,
1096 cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
1097 cricket::WebRtcVideoDecoderFactory* video_decoder_factory,
1098 rtc::scoped_refptr<AudioMixer> audio_mixer,
1099 rtc::scoped_refptr<AudioProcessing> audio_processing);
1100
1083 // Create a new instance of PeerConnectionFactoryInterface with external audio 1101 // Create a new instance of PeerConnectionFactoryInterface with external audio
1084 // mixer. 1102 // mixer.
1085 // 1103 //
1086 // If |audio_mixer| is null, an internal audio mixer will be created and used. 1104 // If |audio_mixer| is null, an internal audio mixer will be created and used.
1087 rtc::scoped_refptr<PeerConnectionFactoryInterface> 1105 rtc::scoped_refptr<PeerConnectionFactoryInterface>
1088 CreatePeerConnectionFactoryWithAudioMixer( 1106 CreatePeerConnectionFactoryWithAudioMixer(
1089 rtc::Thread* network_thread, 1107 rtc::Thread* network_thread,
1090 rtc::Thread* worker_thread, 1108 rtc::Thread* worker_thread,
1091 rtc::Thread* signaling_thread, 1109 rtc::Thread* signaling_thread,
1092 AudioDeviceModule* default_adm, 1110 AudioDeviceModule* default_adm,
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
1182 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, 1200 cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
1183 cricket::WebRtcVideoDecoderFactory* video_decoder_factory, 1201 cricket::WebRtcVideoDecoderFactory* video_decoder_factory,
1184 rtc::scoped_refptr<AudioMixer> audio_mixer, 1202 rtc::scoped_refptr<AudioMixer> audio_mixer,
1185 std::unique_ptr<cricket::MediaEngineInterface> media_engine, 1203 std::unique_ptr<cricket::MediaEngineInterface> media_engine,
1186 std::unique_ptr<CallFactoryInterface> call_factory, 1204 std::unique_ptr<CallFactoryInterface> call_factory,
1187 std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory); 1205 std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory);
1188 1206
1189 } // namespace webrtc 1207 } // namespace webrtc
1190 1208
1191 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 1209 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/pc/createpeerconnectionfactory.cc » ('j') | webrtc/pc/createpeerconnectionfactory.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698