0dd1b0a4b2
This reverts commit 00733015fafbbc61ddc12dfdc88b21a9fcd9d122. Reason for revert: The reason for a downstream test failure on the original commit and a workaround has been found. Solution is to keep a PeerConnectionFactory constructor implementation as the same as before. Original change's description: > Revert "Enables PeerConnectionFactory using external fec controller" > > This reverts commit 4f07bdb25567d8ef528311e0b50a62c61d543fc3. > > Reason for revert: Speculatively reverting, because downstream test is now hitting "PeerConnectionFactory.initialize was not called before creating a PeerConnectionFactory" error, even though it did call initialize. I don't see how any change in this CL could cause that, but it's the only CL on the blamelist, and it does modify PeerConnectionFactory.java > > Original change's description: > > Enables PeerConnectionFactory using external fec controller > > > > Bug: webrtc:8799 > > Change-Id: Ieb2cf6163b9a83844ab9ed4822b4a7f1db4c24b8 > > Reviewed-on: https://webrtc-review.googlesource.com/43961 > > Commit-Queue: Ying Wang <yinwa@webrtc.org> > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> > > Reviewed-by: Niels Moller <nisse@webrtc.org> > > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#22038} > > TBR=sakal@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org,stefan@webrtc.org,yinwa@webrtc.org > > Change-Id: I95868c35d6f9973e0ebf563814cd71d0fcbd433d > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:8799 > Reviewed-on: https://webrtc-review.googlesource.com/54080 > Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> > Commit-Queue: Taylor Brandstetter <deadbeef@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22040} TBR=deadbeef@webrtc.org,sakal@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org,stefan@webrtc.org,yinwa@webrtc.org Bug: webrtc:8799 Change-Id: If9f3292bfcc739782967530c49f006d0abbc38a8 Reviewed-on: https://webrtc-review.googlesource.com/55400 Commit-Queue: Ying Wang <yinwa@webrtc.org> Reviewed-by: Ying Wang <yinwa@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22100}
171 lines
7.3 KiB
C++
171 lines
7.3 KiB
C++
/*
|
|
* Copyright 2017 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/call/callfactoryinterface.h"
|
|
#include "api/peerconnectioninterface.h"
|
|
#include "api/video_codecs/video_decoder_factory.h"
|
|
#include "api/video_codecs/video_encoder_factory.h"
|
|
#include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
|
|
#include "media/engine/webrtcmediaengine.h"
|
|
#include "modules/audio_device/include/audio_device.h"
|
|
#include "modules/audio_processing/include/audio_processing.h"
|
|
#include "rtc_base/bind.h"
|
|
#include "rtc_base/scoped_ref_ptr.h"
|
|
#include "rtc_base/thread.h"
|
|
|
|
namespace webrtc {
|
|
|
|
#if defined(USE_BUILTIN_SW_CODECS)
|
|
rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
|
|
rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory,
|
|
rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory) {
|
|
return CreatePeerConnectionFactoryWithAudioMixer(
|
|
nullptr /*network_thread*/, nullptr /*worker_thread*/,
|
|
nullptr /*signaling_thread*/, nullptr /*default_adm*/,
|
|
audio_encoder_factory, audio_decoder_factory,
|
|
nullptr /*video_encoder_factory*/, nullptr /*video_decoder_factory*/,
|
|
nullptr /*audio_mixer*/);
|
|
}
|
|
|
|
// Note: all the other CreatePeerConnectionFactory variants just end up calling
|
|
// this, ultimately.
|
|
rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
|
|
rtc::Thread* network_thread,
|
|
rtc::Thread* worker_thread,
|
|
rtc::Thread* signaling_thread,
|
|
AudioDeviceModule* default_adm,
|
|
rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory,
|
|
rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory,
|
|
cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
|
|
cricket::WebRtcVideoDecoderFactory* video_decoder_factory,
|
|
rtc::scoped_refptr<AudioMixer> audio_mixer,
|
|
rtc::scoped_refptr<AudioProcessing> audio_processing) {
|
|
rtc::scoped_refptr<AudioProcessing> audio_processing_use = audio_processing;
|
|
if (!audio_processing_use) {
|
|
audio_processing_use = AudioProcessingBuilder().Create();
|
|
}
|
|
|
|
std::unique_ptr<cricket::MediaEngineInterface> media_engine(
|
|
cricket::WebRtcMediaEngineFactory::Create(
|
|
default_adm, audio_encoder_factory, audio_decoder_factory,
|
|
video_encoder_factory, video_decoder_factory, audio_mixer,
|
|
audio_processing_use));
|
|
|
|
std::unique_ptr<CallFactoryInterface> call_factory = CreateCallFactory();
|
|
|
|
std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory =
|
|
CreateRtcEventLogFactory();
|
|
|
|
return CreateModularPeerConnectionFactory(
|
|
network_thread, worker_thread, signaling_thread, std::move(media_engine),
|
|
std::move(call_factory), std::move(event_log_factory));
|
|
}
|
|
#endif
|
|
|
|
rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
|
|
rtc::Thread* network_thread,
|
|
rtc::Thread* worker_thread,
|
|
rtc::Thread* signaling_thread,
|
|
AudioDeviceModule* default_adm,
|
|
rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory,
|
|
rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory,
|
|
cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
|
|
cricket::WebRtcVideoDecoderFactory* video_decoder_factory,
|
|
rtc::scoped_refptr<AudioMixer> audio_mixer,
|
|
rtc::scoped_refptr<AudioProcessing> audio_processing,
|
|
std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory) {
|
|
rtc::scoped_refptr<AudioProcessing> audio_processing_use = audio_processing;
|
|
if (!audio_processing_use) {
|
|
audio_processing_use = AudioProcessingBuilder().Create();
|
|
}
|
|
|
|
std::unique_ptr<cricket::MediaEngineInterface> media_engine(
|
|
cricket::WebRtcMediaEngineFactory::Create(
|
|
default_adm, audio_encoder_factory, audio_decoder_factory,
|
|
video_encoder_factory, video_decoder_factory, audio_mixer,
|
|
audio_processing_use));
|
|
|
|
std::unique_ptr<CallFactoryInterface> call_factory = CreateCallFactory();
|
|
|
|
std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory =
|
|
CreateRtcEventLogFactory();
|
|
|
|
return CreateModularPeerConnectionFactory(
|
|
network_thread, worker_thread, signaling_thread, std::move(media_engine),
|
|
std::move(call_factory), std::move(event_log_factory),
|
|
std::move(fec_controller_factory));
|
|
}
|
|
|
|
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) {
|
|
if (!audio_processing)
|
|
audio_processing = AudioProcessingBuilder().Create();
|
|
|
|
std::unique_ptr<cricket::MediaEngineInterface> media_engine =
|
|
cricket::WebRtcMediaEngineFactory::Create(
|
|
default_adm, audio_encoder_factory, audio_decoder_factory,
|
|
std::move(video_encoder_factory), std::move(video_decoder_factory),
|
|
audio_mixer, audio_processing);
|
|
|
|
std::unique_ptr<CallFactoryInterface> call_factory = CreateCallFactory();
|
|
|
|
std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory =
|
|
CreateRtcEventLogFactory();
|
|
|
|
return CreateModularPeerConnectionFactory(
|
|
network_thread, worker_thread, signaling_thread, std::move(media_engine),
|
|
std::move(call_factory), std::move(event_log_factory));
|
|
}
|
|
|
|
#if defined(USE_BUILTIN_SW_CODECS)
|
|
rtc::scoped_refptr<PeerConnectionFactoryInterface>
|
|
CreatePeerConnectionFactoryWithAudioMixer(
|
|
rtc::Thread* network_thread,
|
|
rtc::Thread* worker_thread,
|
|
rtc::Thread* signaling_thread,
|
|
AudioDeviceModule* default_adm,
|
|
rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory,
|
|
rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory,
|
|
cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
|
|
cricket::WebRtcVideoDecoderFactory* video_decoder_factory,
|
|
rtc::scoped_refptr<AudioMixer> audio_mixer) {
|
|
return CreatePeerConnectionFactory(
|
|
network_thread, worker_thread, signaling_thread, default_adm,
|
|
audio_encoder_factory, audio_decoder_factory, video_encoder_factory,
|
|
video_decoder_factory, audio_mixer, nullptr);
|
|
}
|
|
|
|
rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
|
|
rtc::Thread* network_thread,
|
|
rtc::Thread* worker_thread,
|
|
rtc::Thread* signaling_thread,
|
|
AudioDeviceModule* default_adm,
|
|
rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory,
|
|
rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory,
|
|
cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
|
|
cricket::WebRtcVideoDecoderFactory* video_decoder_factory) {
|
|
return CreatePeerConnectionFactoryWithAudioMixer(
|
|
network_thread, worker_thread, signaling_thread, default_adm,
|
|
audio_encoder_factory, audio_decoder_factory, video_encoder_factory,
|
|
video_decoder_factory, nullptr);
|
|
}
|
|
#endif
|
|
|
|
} // namespace webrtc
|