| 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 |
| 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" | 23 #include "webrtc/base/asyncpacketsocket.h" |
| 24 #include "webrtc/base/bind.h" | 24 #include "webrtc/base/bind.h" |
| 25 #include "webrtc/base/checks.h" | 25 #include "webrtc/base/checks.h" |
| 26 #include "webrtc/base/helpers.h" | 26 #include "webrtc/base/helpers.h" |
| 27 #include "webrtc/base/logging.h" | 27 #include "webrtc/base/logging.h" |
| 28 #include "webrtc/logging/rtc_event_log/rtc_event_log.h" | 28 #include "webrtc/logging/rtc_event_log/rtc_event_log.h" |
| 29 #include "webrtc/media/base/mediaconstants.h" | 29 #include "webrtc/media/base/mediaconstants.h" |
| 30 #include "webrtc/modules/audio_processing/include/audio_processing.h" |
| 30 #include "webrtc/ortc/ortcrtpreceiveradapter.h" | 31 #include "webrtc/ortc/ortcrtpreceiveradapter.h" |
| 31 #include "webrtc/ortc/ortcrtpsenderadapter.h" | 32 #include "webrtc/ortc/ortcrtpsenderadapter.h" |
| 32 #include "webrtc/ortc/rtpparametersconversion.h" | 33 #include "webrtc/ortc/rtpparametersconversion.h" |
| 33 #include "webrtc/ortc/rtptransportadapter.h" | 34 #include "webrtc/ortc/rtptransportadapter.h" |
| 34 #include "webrtc/ortc/rtptransportcontrolleradapter.h" | 35 #include "webrtc/ortc/rtptransportcontrolleradapter.h" |
| 35 #include "webrtc/p2p/base/basicpacketsocketfactory.h" | 36 #include "webrtc/p2p/base/basicpacketsocketfactory.h" |
| 36 #include "webrtc/p2p/base/udptransport.h" | 37 #include "webrtc/p2p/base/udptransport.h" |
| 37 #include "webrtc/pc/audiotrack.h" | 38 #include "webrtc/pc/audiotrack.h" |
| 38 #include "webrtc/pc/channelmanager.h" | 39 #include "webrtc/pc/channelmanager.h" |
| 39 #include "webrtc/pc/localaudiosource.h" | 40 #include "webrtc/pc/localaudiosource.h" |
| (...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 537 | 538 |
| 538 std::unique_ptr<cricket::MediaEngineInterface> | 539 std::unique_ptr<cricket::MediaEngineInterface> |
| 539 OrtcFactory::CreateMediaEngine_w() { | 540 OrtcFactory::CreateMediaEngine_w() { |
| 540 RTC_DCHECK_RUN_ON(worker_thread_.get()); | 541 RTC_DCHECK_RUN_ON(worker_thread_.get()); |
| 541 // The null arguments are optional factories that could be passed into the | 542 // The null arguments are optional factories that could be passed into the |
| 542 // OrtcFactory, but aren't yet. | 543 // OrtcFactory, but aren't yet. |
| 543 // | 544 // |
| 544 // 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 |
| 545 // AudioDeviceModule will be used. | 546 // AudioDeviceModule will be used. |
| 546 return std::unique_ptr<cricket::MediaEngineInterface>( | 547 return std::unique_ptr<cricket::MediaEngineInterface>( |
| 547 cricket::WebRtcMediaEngineFactory::Create(adm_, audio_encoder_factory_, | 548 cricket::WebRtcMediaEngineFactory::Create( |
| 548 audio_decoder_factory_, nullptr, | 549 adm_, audio_encoder_factory_, audio_decoder_factory_, nullptr, |
| 549 nullptr, nullptr)); | 550 nullptr, nullptr, webrtc::AudioProcessing::Create())); |
| 550 } | 551 } |
| 551 | 552 |
| 552 } // namespace webrtc | 553 } // namespace webrtc |
| OLD | NEW |