OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2017 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2017 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 default_adm, audio_encoder_factory, audio_decoder_factory, | 61 default_adm, audio_encoder_factory, audio_decoder_factory, |
62 video_encoder_factory, video_decoder_factory, audio_mixer, | 62 video_encoder_factory, video_decoder_factory, audio_mixer, |
63 audio_processing_use)); | 63 audio_processing_use)); |
64 | 64 |
65 std::unique_ptr<CallFactoryInterface> call_factory = CreateCallFactory(); | 65 std::unique_ptr<CallFactoryInterface> call_factory = CreateCallFactory(); |
66 | 66 |
67 std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory = | 67 std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory = |
68 CreateRtcEventLogFactory(); | 68 CreateRtcEventLogFactory(); |
69 | 69 |
70 return CreateModularPeerConnectionFactory( | 70 return CreateModularPeerConnectionFactory( |
71 network_thread, worker_thread, signaling_thread, default_adm, | 71 network_thread, worker_thread, signaling_thread, video_encoder_factory, |
72 audio_encoder_factory, audio_decoder_factory, video_encoder_factory, | 72 video_decoder_factory, std::move(media_engine), std::move(call_factory), |
73 video_decoder_factory, audio_mixer, std::move(media_engine), | 73 std::move(event_log_factory)); |
74 std::move(call_factory), std::move(event_log_factory)); | |
75 } | 74 } |
76 | 75 |
77 rtc::scoped_refptr<PeerConnectionFactoryInterface> | 76 rtc::scoped_refptr<PeerConnectionFactoryInterface> |
78 CreatePeerConnectionFactoryWithAudioMixer( | 77 CreatePeerConnectionFactoryWithAudioMixer( |
79 rtc::Thread* network_thread, | 78 rtc::Thread* network_thread, |
80 rtc::Thread* worker_thread, | 79 rtc::Thread* worker_thread, |
81 rtc::Thread* signaling_thread, | 80 rtc::Thread* signaling_thread, |
82 AudioDeviceModule* default_adm, | 81 AudioDeviceModule* default_adm, |
83 rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory, | 82 rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory, |
84 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory, | 83 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory, |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory, | 126 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory, |
128 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, | 127 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, |
129 cricket::WebRtcVideoDecoderFactory* video_decoder_factory) { | 128 cricket::WebRtcVideoDecoderFactory* video_decoder_factory) { |
130 return CreatePeerConnectionFactoryWithAudioMixer( | 129 return CreatePeerConnectionFactoryWithAudioMixer( |
131 network_thread, worker_thread, signaling_thread, default_adm, | 130 network_thread, worker_thread, signaling_thread, default_adm, |
132 audio_encoder_factory, audio_decoder_factory, video_encoder_factory, | 131 audio_encoder_factory, audio_decoder_factory, video_encoder_factory, |
133 video_decoder_factory, nullptr); | 132 video_decoder_factory, nullptr); |
134 } | 133 } |
135 | 134 |
136 } // namespace webrtc | 135 } // namespace webrtc |
OLD | NEW |