mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-12 21:30:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deprecate RtcEventLogFactory constructor taking unused parameter

Browse source 
Bug: webrtc:15656
Change-Id: I22ed4cca4c0ce7ebf9c533ed7434617bf0a0f4a3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/330120
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41338}
This commit is contained in:
Danil Chapovalov 2023-12-07 20:01:06 +01:00 committed by WebRTC LUCI CQ
parent 5f3ac43551
commit 151003d341
15 changed files with 18 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
api/create_peerconnection_factory.cc
View file

@ -48,8 +48,7 @@ rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
dependencies.signaling_thread = signaling_thread; dependencies.signaling_thread = signaling_thread;
dependencies.task_queue_factory = dependencies.task_queue_factory =
CreateDefaultTaskQueueFactory(field_trials.get()); CreateDefaultTaskQueueFactory(field_trials.get());
dependencies.event_log_factory = std::make_unique<RtcEventLogFactory>( dependencies.event_log_factory = std::make_unique<RtcEventLogFactory>();
dependencies.task_queue_factory.get());
dependencies.trials = std::move(field_trials); dependencies.trials = std::move(field_trials);
if (network_thread) { if (network_thread) {

5
api/rtc_event_log/rtc_event_log_factory.h
View file

@ -26,10 +26,9 @@ class RTC_EXPORT RtcEventLogFactory : public RtcEventLogFactoryInterface {
public: public:
RtcEventLogFactory() = default; RtcEventLogFactory() = default;
// TODO(bugs.webrtc.org/15656): deprecate and delete constructor taking [[deprecated("Use default constructor")]] //
// task queue factory in favor of using task queue factory provided through
// the Environment parameter in Create function.
explicit RtcEventLogFactory(TaskQueueFactory* task_queue_factory) {} explicit RtcEventLogFactory(TaskQueueFactory* task_queue_factory) {}
~RtcEventLogFactory() override = default; ~RtcEventLogFactory() override = default;
absl::Nonnull<std::unique_ptr<RtcEventLog>> Create( absl::Nonnull<std::unique_ptr<RtcEventLog>> Create(

3
examples/androidnativeapi/jni/android_call_client.cc
View file

@ -154,8 +154,7 @@ void AndroidCallClient::CreatePeerConnectionFactory() {
pcf_deps.worker_thread = worker_thread_.get(); pcf_deps.worker_thread = worker_thread_.get();
pcf_deps.signaling_thread = signaling_thread_.get(); pcf_deps.signaling_thread = signaling_thread_.get();
pcf_deps.task_queue_factory = webrtc::CreateDefaultTaskQueueFactory(); pcf_deps.task_queue_factory = webrtc::CreateDefaultTaskQueueFactory();
pcf_deps.event_log_factory = std::make_unique<webrtc::RtcEventLogFactory>( pcf_deps.event_log_factory = std::make_unique<webrtc::RtcEventLogFactory>();
pcf_deps.task_queue_factory.get());
pcf_deps.video_encoder_factory = pcf_deps.video_encoder_factory =
std::make_unique<webrtc::InternalEncoderFactory>(); std::make_unique<webrtc::InternalEncoderFactory>();

3
examples/objcnativeapi/objc/objc_call_client.mm
View file

@ -126,8 +126,7 @@ void ObjCCallClient::CreatePeerConnectionFactory() {
[[RTC_OBJC_TYPE(RTCDefaultVideoDecoderFactory) alloc] init]); [[RTC_OBJC_TYPE(RTCDefaultVideoDecoderFactory) alloc] init]);
dependencies.audio_processing = webrtc::AudioProcessingBuilder().Create(); dependencies.audio_processing = webrtc::AudioProcessingBuilder().Create();
webrtc::EnableMedia(dependencies); webrtc::EnableMedia(dependencies);
dependencies.event_log_factory = dependencies.event_log_factory = std::make_unique<webrtc::RtcEventLogFactory>();
std::make_unique<webrtc::RtcEventLogFactory>(dependencies.task_queue_factory.get());
pcf_ = webrtc::CreateModularPeerConnectionFactory(std::move(dependencies)); pcf_ = webrtc::CreateModularPeerConnectionFactory(std::move(dependencies));
RTC_LOG(LS_INFO) << "PeerConnectionFactory created: " << pcf_.get(); RTC_LOG(LS_INFO) << "PeerConnectionFactory created: " << pcf_.get();
} }

3
pc/peer_connection_header_extension_unittest.cc
View file

@ -90,8 +90,7 @@ class PeerConnectionHeaderExtensionTest
EnableFakeMedia(factory_dependencies, std::move(media_engine)); EnableFakeMedia(factory_dependencies, std::move(media_engine));
factory_dependencies.event_log_factory = factory_dependencies.event_log_factory =
std::make_unique<RtcEventLogFactory>( std::make_unique<RtcEventLogFactory>();
factory_dependencies.task_queue_factory.get());
auto pc_factory = auto pc_factory =
CreateModularPeerConnectionFactory(std::move(factory_dependencies)); CreateModularPeerConnectionFactory(std::move(factory_dependencies));

3
pc/peer_connection_interface_unittest.cc
View file

@ -641,8 +641,7 @@ class PeerConnectionFactoryForTest : public PeerConnectionFactory {
// level, and using a real one could make tests flaky when run in parallel. // level, and using a real one could make tests flaky when run in parallel.
dependencies.adm = FakeAudioCaptureModule::Create(); dependencies.adm = FakeAudioCaptureModule::Create();
EnableMediaWithDefaults(dependencies); EnableMediaWithDefaults(dependencies);
dependencies.event_log_factory = std::make_unique<RtcEventLogFactory>( dependencies.event_log_factory = std::make_unique<RtcEventLogFactory>();
dependencies.task_queue_factory.get());
return rtc::make_ref_counted<PeerConnectionFactoryForTest>( return rtc::make_ref_counted<PeerConnectionFactoryForTest>(
std::move(dependencies)); std::move(dependencies));

3
pc/peer_connection_media_unittest.cc
View file

@ -175,8 +175,7 @@ class PeerConnectionMediaBaseTest : public ::testing::Test {
factory_dependencies.task_queue_factory = CreateDefaultTaskQueueFactory(); factory_dependencies.task_queue_factory = CreateDefaultTaskQueueFactory();
EnableFakeMedia(factory_dependencies, std::move(media_engine)); EnableFakeMedia(factory_dependencies, std::move(media_engine));
factory_dependencies.event_log_factory = factory_dependencies.event_log_factory =
std::make_unique<RtcEventLogFactory>( std::make_unique<RtcEventLogFactory>();
factory_dependencies.task_queue_factory.get());
auto pc_factory = auto pc_factory =
CreateModularPeerConnectionFactory(std::move(factory_dependencies)); CreateModularPeerConnectionFactory(std::move(factory_dependencies));

3
pc/test/integration_test_helpers.h
View file

@ -800,8 +800,7 @@ class PeerConnectionIntegrationWrapper : public PeerConnectionObserver,
pc_factory_dependencies.event_log_factory = std::move(event_log_factory); pc_factory_dependencies.event_log_factory = std::move(event_log_factory);
} else { } else {
pc_factory_dependencies.event_log_factory = pc_factory_dependencies.event_log_factory =
std::make_unique<RtcEventLogFactory>( std::make_unique<RtcEventLogFactory>();
pc_factory_dependencies.task_queue_factory.get());
} }
peer_connection_factory_ = peer_connection_factory_ =
CreateModularPeerConnectionFactory(std::move(pc_factory_dependencies)); CreateModularPeerConnectionFactory(std::move(pc_factory_dependencies));

3
sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc
View file

@ -50,8 +50,7 @@ rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> CreateTestPCF(
pcf_deps.worker_thread = worker_thread; pcf_deps.worker_thread = worker_thread;
pcf_deps.signaling_thread = signaling_thread; pcf_deps.signaling_thread = signaling_thread;
pcf_deps.task_queue_factory = CreateDefaultTaskQueueFactory(); pcf_deps.task_queue_factory = CreateDefaultTaskQueueFactory();
pcf_deps.event_log_factory = pcf_deps.event_log_factory = std::make_unique<RtcEventLogFactory>();
std::make_unique<RtcEventLogFactory>(pcf_deps.task_queue_factory.get());
pcf_deps.adm = CreateJavaAudioDeviceModule(jni, GetAppContext(jni).obj()); pcf_deps.adm = CreateJavaAudioDeviceModule(jni, GetAppContext(jni).obj());
pcf_deps.video_encoder_factory = pcf_deps.video_encoder_factory =

3
sdk/android/src/jni/pc/peer_connection_factory.cc
View file

@ -269,8 +269,7 @@ ScopedJavaLocalRef<jobject> CreatePeerConnectionFactoryForJava(
dependencies.worker_thread = worker_thread.get(); dependencies.worker_thread = worker_thread.get();
dependencies.signaling_thread = signaling_thread.get(); dependencies.signaling_thread = signaling_thread.get();
dependencies.task_queue_factory = CreateDefaultTaskQueueFactory(); dependencies.task_queue_factory = CreateDefaultTaskQueueFactory();
dependencies.event_log_factory = std::make_unique<RtcEventLogFactory>( dependencies.event_log_factory = std::make_unique<RtcEventLogFactory>();
dependencies.task_queue_factory.get());
dependencies.fec_controller_factory = std::move(fec_controller_factory); dependencies.fec_controller_factory = std::move(fec_controller_factory);
dependencies.network_controller_factory = dependencies.network_controller_factory =
std::move(network_controller_factory); std::move(network_controller_factory);

3
sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm
View file

@ -206,8 +206,7 @@
dependencies.audio_processing = webrtc::AudioProcessingBuilder().Create(); dependencies.audio_processing = webrtc::AudioProcessingBuilder().Create();
} }
webrtc::EnableMedia(dependencies); webrtc::EnableMedia(dependencies);
dependencies.event_log_factory = dependencies.event_log_factory = std::make_unique<webrtc::RtcEventLogFactory>();
std::make_unique<webrtc::RtcEventLogFactory>(dependencies.task_queue_factory.get());
dependencies.network_controller_factory = std::move(networkControllerFactory); dependencies.network_controller_factory = std::move(networkControllerFactory);
_nativeFactory = webrtc::CreateModularPeerConnectionFactory(std::move(dependencies)); _nativeFactory = webrtc::CreateModularPeerConnectionFactory(std::move(dependencies));
NSAssert(_nativeFactory, @"Failed to initialize PeerConnectionFactory!"); NSAssert(_nativeFactory, @"Failed to initialize PeerConnectionFactory!");

3
test/network/network_emulation_pc_unittest.cc
View file

@ -56,8 +56,7 @@ rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
rtc::Thread* network_thread) { rtc::Thread* network_thread) {
PeerConnectionFactoryDependencies pcf_deps; PeerConnectionFactoryDependencies pcf_deps;
pcf_deps.task_queue_factory = CreateDefaultTaskQueueFactory(); pcf_deps.task_queue_factory = CreateDefaultTaskQueueFactory();
pcf_deps.event_log_factory = pcf_deps.event_log_factory = std::make_unique<RtcEventLogFactory>();
std::make_unique<RtcEventLogFactory>(pcf_deps.task_queue_factory.get());
pcf_deps.network_thread = network_thread; pcf_deps.network_thread = network_thread;
pcf_deps.signaling_thread = signaling_thread; pcf_deps.signaling_thread = signaling_thread;
pcf_deps.trials = std::make_unique<FieldTrialBasedConfig>(); pcf_deps.trials = std::make_unique<FieldTrialBasedConfig>();

8
test/pc/e2e/test_peer_factory.cc
View file

@ -43,16 +43,14 @@ constexpr int kDefaultSamplingFrequencyInHz = 48000;
// and `pc_dependencies` if they are omitted. Also setup required // and `pc_dependencies` if they are omitted. Also setup required
// dependencies, that won't be specially provided by factory and will be just // dependencies, that won't be specially provided by factory and will be just
// transferred to peer connection creation code. // transferred to peer connection creation code.
void SetMandatoryEntities(InjectableComponents* components, void SetMandatoryEntities(InjectableComponents* components) {
TimeController& time_controller) {
RTC_DCHECK(components->pcf_dependencies); RTC_DCHECK(components->pcf_dependencies);
RTC_DCHECK(components->pc_dependencies); RTC_DCHECK(components->pc_dependencies);
// Setup required peer connection factory dependencies. // Setup required peer connection factory dependencies.
if (components->pcf_dependencies->event_log_factory == nullptr) { if (components->pcf_dependencies->event_log_factory == nullptr) {
components->pcf_dependencies->event_log_factory = components->pcf_dependencies->event_log_factory =
std::make_unique<RtcEventLogFactory>( std::make_unique<RtcEventLogFactory>();
time_controller.GetTaskQueueFactory());
} }
if (!components->pcf_dependencies->trials) { if (!components->pcf_dependencies->trials) {
components->pcf_dependencies->trials = components->pcf_dependencies->trials =
@ -286,7 +284,7 @@ std::unique_ptr<TestPeer> TestPeerFactory::CreateTestPeer(
RTC_DCHECK(configurable_params); RTC_DCHECK(configurable_params);
RTC_DCHECK_EQ(configurable_params->video_configs.size(), RTC_DCHECK_EQ(configurable_params->video_configs.size(),
video_sources.size()); video_sources.size());
SetMandatoryEntities(components.get(), time_controller_); SetMandatoryEntities(components.get());
params->rtc_configuration.sdp_semantics = SdpSemantics::kUnifiedPlan; params->rtc_configuration.sdp_semantics = SdpSemantics::kUnifiedPlan;
// Create peer connection factory. // Create peer connection factory.

3
test/peer_scenario/peer_scenario_client.cc
View file

@ -248,8 +248,7 @@ PeerScenarioClient::PeerScenarioClient(
pcf_deps.worker_thread = worker_thread_.get(); pcf_deps.worker_thread = worker_thread_.get();
pcf_deps.task_queue_factory = pcf_deps.task_queue_factory =
net->time_controller()->CreateTaskQueueFactory(); net->time_controller()->CreateTaskQueueFactory();
pcf_deps.event_log_factory = pcf_deps.event_log_factory = std::make_unique<RtcEventLogFactory>();
std::make_unique<RtcEventLogFactory>(task_queue_factory_);
pcf_deps.trials = std::make_unique<FieldTrialBasedConfig>(); pcf_deps.trials = std::make_unique<FieldTrialBasedConfig>();
pcf_deps.adm = TestAudioDeviceModule::Create( pcf_deps.adm = TestAudioDeviceModule::Create(

3
webrtc_lib_link_test.cc
View file

@ -57,8 +57,7 @@ webrtc::PeerConnectionFactoryDependencies CreateSomePcfDeps() {
pcf_deps.signaling_thread = rtc::Thread::Current(); pcf_deps.signaling_thread = rtc::Thread::Current();
pcf_deps.network_thread = rtc::Thread::Current(); pcf_deps.network_thread = rtc::Thread::Current();
pcf_deps.worker_thread = rtc::Thread::Current(); pcf_deps.worker_thread = rtc::Thread::Current();
pcf_deps.event_log_factory = std::make_unique<webrtc::RtcEventLogFactory>( pcf_deps.event_log_factory = std::make_unique<webrtc::RtcEventLogFactory>();
pcf_deps.task_queue_factory.get());
CreateSomeMediaDeps(pcf_deps); CreateSomeMediaDeps(pcf_deps);
EnableMedia(pcf_deps); EnableMedia(pcf_deps);
return pcf_deps; return pcf_deps;