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

Side by Side Diff: webrtc/pc/createpeerconnectionfactory.cc

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc 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 | « webrtc/pc/channelmanager_unittest.cc ('k') | webrtc/pc/currentspeakermonitor.h » ('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 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
11 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" 11 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
12 #include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" 12 #include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
13 #include "webrtc/api/peerconnectioninterface.h" 13 #include "webrtc/api/peerconnectioninterface.h"
14 #include "webrtc/base/bind.h"
15 #include "webrtc/base/scoped_ref_ptr.h"
16 #include "webrtc/base/thread.h"
17 #include "webrtc/call/callfactoryinterface.h" 14 #include "webrtc/call/callfactoryinterface.h"
18 #include "webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h" 15 #include "webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h"
19 #include "webrtc/media/engine/webrtcmediaengine.h" 16 #include "webrtc/media/engine/webrtcmediaengine.h"
20 #include "webrtc/modules/audio_processing/include/audio_processing.h" 17 #include "webrtc/modules/audio_processing/include/audio_processing.h"
18 #include "webrtc/rtc_base/bind.h"
19 #include "webrtc/rtc_base/scoped_ref_ptr.h"
20 #include "webrtc/rtc_base/thread.h"
21 21
22 namespace webrtc { 22 namespace webrtc {
23 23
24 rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory( 24 rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
25 rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory, 25 rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory,
26 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory) { 26 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory) {
27 return CreatePeerConnectionFactoryWithAudioMixer( 27 return CreatePeerConnectionFactoryWithAudioMixer(
28 nullptr /*network_thread*/, nullptr /*worker_thread*/, 28 nullptr /*network_thread*/, nullptr /*worker_thread*/,
29 nullptr /*signaling_thread*/, nullptr /*default_adm*/, 29 nullptr /*signaling_thread*/, nullptr /*default_adm*/,
30 audio_encoder_factory, audio_decoder_factory, 30 audio_encoder_factory, audio_decoder_factory,
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory, 127 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory,
128 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, 128 cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
129 cricket::WebRtcVideoDecoderFactory* video_decoder_factory) { 129 cricket::WebRtcVideoDecoderFactory* video_decoder_factory) {
130 return CreatePeerConnectionFactoryWithAudioMixer( 130 return CreatePeerConnectionFactoryWithAudioMixer(
131 network_thread, worker_thread, signaling_thread, default_adm, 131 network_thread, worker_thread, signaling_thread, default_adm,
132 audio_encoder_factory, audio_decoder_factory, video_encoder_factory, 132 audio_encoder_factory, audio_decoder_factory, video_encoder_factory,
133 video_decoder_factory, nullptr); 133 video_decoder_factory, nullptr);
134 } 134 }
135 135
136 } // namespace webrtc 136 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/pc/channelmanager_unittest.cc ('k') | webrtc/pc/currentspeakermonitor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698