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

Side by Side Diff: webrtc/ortc/ortcfactory.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/ortc/ortcfactory.h ('k') | webrtc/ortc/ortcfactory_integrationtest.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 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/ortc/ortcfactory.h" 11 #include "webrtc/ortc/ortcfactory.h"
12 12
13 #include <sstream> 13 #include <sstream>
14 #include <utility> // For std::move. 14 #include <utility> // For std::move.
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" 17 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
18 #include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h" 18 #include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
19 #include "webrtc/api/mediastreamtrackproxy.h" 19 #include "webrtc/api/mediastreamtrackproxy.h"
20 #include "webrtc/api/proxy.h" 20 #include "webrtc/api/proxy.h"
21 #include "webrtc/api/rtcerror.h" 21 #include "webrtc/api/rtcerror.h"
22 #include "webrtc/api/videosourceproxy.h" 22 #include "webrtc/api/videosourceproxy.h"
23 #include "webrtc/base/asyncpacketsocket.h"
24 #include "webrtc/base/bind.h"
25 #include "webrtc/base/checks.h"
26 #include "webrtc/base/helpers.h"
27 #include "webrtc/base/logging.h"
28 #include "webrtc/logging/rtc_event_log/rtc_event_log.h" 23 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
29 #include "webrtc/media/base/mediaconstants.h" 24 #include "webrtc/media/base/mediaconstants.h"
30 #include "webrtc/modules/audio_processing/include/audio_processing.h" 25 #include "webrtc/modules/audio_processing/include/audio_processing.h"
31 #include "webrtc/ortc/ortcrtpreceiveradapter.h" 26 #include "webrtc/ortc/ortcrtpreceiveradapter.h"
32 #include "webrtc/ortc/ortcrtpsenderadapter.h" 27 #include "webrtc/ortc/ortcrtpsenderadapter.h"
33 #include "webrtc/ortc/rtpparametersconversion.h" 28 #include "webrtc/ortc/rtpparametersconversion.h"
34 #include "webrtc/ortc/rtptransportadapter.h" 29 #include "webrtc/ortc/rtptransportadapter.h"
35 #include "webrtc/ortc/rtptransportcontrolleradapter.h" 30 #include "webrtc/ortc/rtptransportcontrolleradapter.h"
36 #include "webrtc/p2p/base/basicpacketsocketfactory.h" 31 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
37 #include "webrtc/p2p/base/udptransport.h" 32 #include "webrtc/p2p/base/udptransport.h"
38 #include "webrtc/pc/audiotrack.h" 33 #include "webrtc/pc/audiotrack.h"
39 #include "webrtc/pc/channelmanager.h" 34 #include "webrtc/pc/channelmanager.h"
40 #include "webrtc/pc/localaudiosource.h" 35 #include "webrtc/pc/localaudiosource.h"
41 #include "webrtc/pc/videocapturertracksource.h" 36 #include "webrtc/pc/videocapturertracksource.h"
42 #include "webrtc/pc/videotrack.h" 37 #include "webrtc/pc/videotrack.h"
38 #include "webrtc/rtc_base/asyncpacketsocket.h"
39 #include "webrtc/rtc_base/bind.h"
40 #include "webrtc/rtc_base/checks.h"
41 #include "webrtc/rtc_base/helpers.h"
42 #include "webrtc/rtc_base/logging.h"
43 43
44 namespace { 44 namespace {
45 45
46 const int kDefaultRtcpCnameLength = 16; 46 const int kDefaultRtcpCnameLength = 16;
47 47
48 // Asserts that all of the built-in capabilities can be converted to 48 // Asserts that all of the built-in capabilities can be converted to
49 // RtpCapabilities. If they can't, something's wrong (for example, maybe a new 49 // RtpCapabilities. If they can't, something's wrong (for example, maybe a new
50 // feedback mechanism is supported, but an enum value wasn't added to 50 // feedback mechanism is supported, but an enum value wasn't added to
51 // rtpparameters.h). 51 // rtpparameters.h).
52 template <typename C> 52 template <typename C>
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 // 544 //
545 // Note that |adm_| may be null, in which case the platform-specific default 545 // Note that |adm_| may be null, in which case the platform-specific default
546 // AudioDeviceModule will be used. 546 // AudioDeviceModule will be used.
547 return std::unique_ptr<cricket::MediaEngineInterface>( 547 return std::unique_ptr<cricket::MediaEngineInterface>(
548 cricket::WebRtcMediaEngineFactory::Create( 548 cricket::WebRtcMediaEngineFactory::Create(
549 adm_, audio_encoder_factory_, audio_decoder_factory_, nullptr, 549 adm_, audio_encoder_factory_, audio_decoder_factory_, nullptr,
550 nullptr, nullptr, webrtc::AudioProcessing::Create())); 550 nullptr, nullptr, webrtc::AudioProcessing::Create()));
551 } 551 }
552 552
553 } // namespace webrtc 553 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/ortc/ortcfactory.h ('k') | webrtc/ortc/ortcfactory_integrationtest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698