mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
5956a17ed6
This reverts commit 591b2ab82e.
Reason for revert: Breaks downstream project
Original change's description:
> Wires up WebrtcKeyValueBasedConfig in media engines.
>
> This replaces field_trial:: -based functions from system_wrappers.
> Field trials are still used as fallback, but injectable trials are now
> possible.
>
> Bug: webrtc:11926
> Change-Id: I70f28c4fbabf6d9e55052342000e38612b46682c
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174261
> Reviewed-by: Per Kjellander <perkj@webrtc.org>
> Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> Reviewed-by: Sebastian Jansson <srte@webrtc.org>
> Commit-Queue: Erik Språng <sprang@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#32129}
TBR=mbonadei@webrtc.org,kthelgason@webrtc.org,sprang@webrtc.org,stefan@webrtc.org,srte@webrtc.org,perkj@webrtc.org
Change-Id: I3e169149a8b787aa6366bb357abb71794534c63a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:11926
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/184507
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32132}
68 lines
2.9 KiB
C++
68 lines
2.9 KiB
C++
/*
|
|
* Copyright 2018 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "api/create_peerconnection_factory.h"
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
|
|
#include "api/call/call_factory_interface.h"
|
|
#include "api/peer_connection_interface.h"
|
|
#include "api/rtc_event_log/rtc_event_log_factory.h"
|
|
#include "api/scoped_refptr.h"
|
|
#include "api/task_queue/default_task_queue_factory.h"
|
|
#include "media/base/media_engine.h"
|
|
#include "media/engine/webrtc_media_engine.h"
|
|
#include "modules/audio_device/include/audio_device.h"
|
|
#include "modules/audio_processing/include/audio_processing.h"
|
|
#include "rtc_base/thread.h"
|
|
|
|
namespace webrtc {
|
|
|
|
rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
|
|
rtc::Thread* network_thread,
|
|
rtc::Thread* worker_thread,
|
|
rtc::Thread* signaling_thread,
|
|
rtc::scoped_refptr<AudioDeviceModule> default_adm,
|
|
rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory,
|
|
rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory,
|
|
std::unique_ptr<VideoEncoderFactory> video_encoder_factory,
|
|
std::unique_ptr<VideoDecoderFactory> video_decoder_factory,
|
|
rtc::scoped_refptr<AudioMixer> audio_mixer,
|
|
rtc::scoped_refptr<AudioProcessing> audio_processing) {
|
|
PeerConnectionFactoryDependencies dependencies;
|
|
dependencies.network_thread = network_thread;
|
|
dependencies.worker_thread = worker_thread;
|
|
dependencies.signaling_thread = signaling_thread;
|
|
dependencies.task_queue_factory = CreateDefaultTaskQueueFactory();
|
|
dependencies.call_factory = CreateCallFactory();
|
|
dependencies.event_log_factory = std::make_unique<RtcEventLogFactory>(
|
|
dependencies.task_queue_factory.get());
|
|
|
|
cricket::MediaEngineDependencies media_dependencies;
|
|
media_dependencies.task_queue_factory = dependencies.task_queue_factory.get();
|
|
media_dependencies.adm = std::move(default_adm);
|
|
media_dependencies.audio_encoder_factory = std::move(audio_encoder_factory);
|
|
media_dependencies.audio_decoder_factory = std::move(audio_decoder_factory);
|
|
if (audio_processing) {
|
|
media_dependencies.audio_processing = std::move(audio_processing);
|
|
} else {
|
|
media_dependencies.audio_processing = AudioProcessingBuilder().Create();
|
|
}
|
|
media_dependencies.audio_mixer = std::move(audio_mixer);
|
|
media_dependencies.video_encoder_factory = std::move(video_encoder_factory);
|
|
media_dependencies.video_decoder_factory = std::move(video_decoder_factory);
|
|
dependencies.media_engine =
|
|
cricket::CreateMediaEngine(std::move(media_dependencies));
|
|
|
|
return CreateModularPeerConnectionFactory(std::move(dependencies));
|
|
}
|
|
|
|
} // namespace webrtc
|