From 554f7db01ca8c26ef2d6292a50537b21479b5f66 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Wed, 1 Nov 2023 11:08:20 +0100 Subject: [PATCH] Add EnableMediaWithDefaults to replace SetMediaEngineDefaults Update most of the webrtc tests to use EnableMediaWithDefaults instead of SetMediaEngineDefaults Bug: webrtc:15574 Change-Id: I489a09e4ea3479dc26829ee0c1235e67bcbca7c7 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/325485 Commit-Queue: Danil Chapovalov Reviewed-by: Harald Alvestrand Cr-Commit-Position: refs/heads/main@{#41059} --- api/BUILD.gn | 24 ++++++++++ api/enable_media_with_defaults.cc | 46 +++++++++++++++++++ api/enable_media_with_defaults.h | 28 +++++++++++ examples/androidnativeapi/BUILD.gn | 2 +- .../jni/android_call_client.cc | 13 ++---- media/engine/webrtc_media_engine_defaults.cc | 2 +- media/engine/webrtc_media_engine_defaults.h | 8 +++- media/engine/webrtc_media_engine_unittest.cc | 2 +- pc/BUILD.gn | 1 + pc/peer_connection_field_trial_tests.cc | 11 ++--- pc/peer_connection_interface_unittest.cc | 12 ++--- pc/peer_connection_jsep_unittest.cc | 11 ++--- pc/test/integration_test_helpers.h | 5 +- sdk/android/BUILD.gn | 2 +- .../peer_connection_factory_unittest.cc | 18 +++----- test/network/BUILD.gn | 2 +- test/network/network_emulation_pc_unittest.cc | 14 ++---- test/pc/e2e/test_peer_factory.cc | 4 +- 18 files changed, 141 insertions(+), 64 deletions(-) create mode 100644 api/enable_media_with_defaults.cc create mode 100644 api/enable_media_with_defaults.h diff --git a/api/BUILD.gn b/api/BUILD.gn index 692c4f4822..4aac6e8b5b 100644 --- a/api/BUILD.gn +++ b/api/BUILD.gn @@ -50,6 +50,30 @@ rtc_source_set("enable_media") { ] } +rtc_source_set("enable_media_with_defaults") { + visibility = [ "*" ] + allow_poison = [ + "audio_codecs", + "default_task_queue", + "software_video_codecs", + ] + sources = [ + "enable_media_with_defaults.cc", + "enable_media_with_defaults.h", + ] + deps = [ + ":enable_media", + ":libjingle_peerconnection_api", + "../modules/audio_processing:api", + "../rtc_base/system:rtc_export", + "audio_codecs:builtin_audio_decoder_factory", + "audio_codecs:builtin_audio_encoder_factory", + "task_queue:default_task_queue_factory", + "video_codecs:builtin_video_decoder_factory", + "video_codecs:builtin_video_encoder_factory", + ] +} + if (!build_with_chromium) { rtc_library("create_peerconnection_factory") { visibility = [ "*" ] diff --git a/api/enable_media_with_defaults.cc b/api/enable_media_with_defaults.cc new file mode 100644 index 0000000000..81462f703e --- /dev/null +++ b/api/enable_media_with_defaults.cc @@ -0,0 +1,46 @@ +/* + * Copyright 2023 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/enable_media_with_defaults.h" + +#include "api/audio_codecs/builtin_audio_decoder_factory.h" +#include "api/audio_codecs/builtin_audio_encoder_factory.h" +#include "api/enable_media.h" +#include "api/task_queue/default_task_queue_factory.h" +#include "api/video_codecs/builtin_video_decoder_factory.h" +#include "api/video_codecs/builtin_video_encoder_factory.h" +#include "modules/audio_processing/include/audio_processing.h" + +namespace webrtc { + +void EnableMediaWithDefaults(PeerConnectionFactoryDependencies& deps) { + if (deps.task_queue_factory == nullptr) { + deps.task_queue_factory = CreateDefaultTaskQueueFactory(); + } + if (deps.audio_encoder_factory == nullptr) { + deps.audio_encoder_factory = CreateBuiltinAudioEncoderFactory(); + } + if (deps.audio_decoder_factory == nullptr) { + deps.audio_decoder_factory = CreateBuiltinAudioDecoderFactory(); + } + if (deps.audio_processing == nullptr) { + deps.audio_processing = AudioProcessingBuilder().Create(); + } + + if (deps.video_encoder_factory == nullptr) { + deps.video_encoder_factory = CreateBuiltinVideoEncoderFactory(); + } + if (deps.video_decoder_factory == nullptr) { + deps.video_decoder_factory = CreateBuiltinVideoDecoderFactory(); + } + EnableMedia(deps); +} + +} // namespace webrtc diff --git a/api/enable_media_with_defaults.h b/api/enable_media_with_defaults.h new file mode 100644 index 0000000000..1b13a98fc9 --- /dev/null +++ b/api/enable_media_with_defaults.h @@ -0,0 +1,28 @@ +/* + * Copyright 2023 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. + */ + +#ifndef API_ENABLE_MEDIA_WITH_DEFAULTS_H_ +#define API_ENABLE_MEDIA_WITH_DEFAULTS_H_ + +#include "api/peer_connection_interface.h" +#include "rtc_base/system/rtc_export.h" + +namespace webrtc { + +// Fills unset media related dependencies in `deps` and enables media support +// for a PeerConnectionFactory created from `deps`. +// This function is located in its own build target as it pulls additional +// dependencies compared to `EnableMedia`, and thus may add extra binary size. +RTC_EXPORT void EnableMediaWithDefaults( + PeerConnectionFactoryDependencies& deps); + +} // namespace webrtc + +#endif // API_ENABLE_MEDIA_WITH_DEFAULTS_H_ diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn index e0eb6d8b24..d1088b3e61 100644 --- a/examples/androidnativeapi/BUILD.gn +++ b/examples/androidnativeapi/BUILD.gn @@ -47,6 +47,7 @@ if (is_android) { deps = [ ":generated_jni", + "../../api:enable_media_with_defaults", "../../api:scoped_refptr", "../../api:sequence_checker", "../../rtc_base:ssl", @@ -56,7 +57,6 @@ if (is_android) { "//api/task_queue:default_task_queue_factory", "//media:rtc_audio_video", "//media:rtc_internal_video_codecs", - "//media:rtc_media_engine_defaults", "//modules/utility", "//pc:libjingle_peerconnection", "//sdk/android:native_api_base", diff --git a/examples/androidnativeapi/jni/android_call_client.cc b/examples/androidnativeapi/jni/android_call_client.cc index 2713a563cd..40af78cdac 100644 --- a/examples/androidnativeapi/jni/android_call_client.cc +++ b/examples/androidnativeapi/jni/android_call_client.cc @@ -13,6 +13,7 @@ #include #include +#include "api/enable_media_with_defaults.h" #include "api/peer_connection_interface.h" #include "api/rtc_event_log/rtc_event_log_factory.h" #include "api/task_queue/default_task_queue_factory.h" @@ -20,7 +21,6 @@ #include "media/engine/internal_decoder_factory.h" #include "media/engine/internal_encoder_factory.h" #include "media/engine/webrtc_media_engine.h" -#include "media/engine/webrtc_media_engine_defaults.h" #include "sdk/android/native_api/jni/java_types.h" #include "sdk/android/native_api/video/wrapper.h" @@ -154,19 +154,14 @@ void AndroidCallClient::CreatePeerConnectionFactory() { pcf_deps.worker_thread = worker_thread_.get(); pcf_deps.signaling_thread = signaling_thread_.get(); pcf_deps.task_queue_factory = webrtc::CreateDefaultTaskQueueFactory(); - pcf_deps.call_factory = webrtc::CreateCallFactory(); pcf_deps.event_log_factory = std::make_unique( pcf_deps.task_queue_factory.get()); - cricket::MediaEngineDependencies media_deps; - media_deps.task_queue_factory = pcf_deps.task_queue_factory.get(); - media_deps.video_encoder_factory = + pcf_deps.video_encoder_factory = std::make_unique(); - media_deps.video_decoder_factory = + pcf_deps.video_decoder_factory = std::make_unique(); - webrtc::SetMediaEngineDefaults(&media_deps); - pcf_deps.media_engine = cricket::CreateMediaEngine(std::move(media_deps)); - RTC_LOG(LS_INFO) << "Media engine created: " << pcf_deps.media_engine.get(); + EnableMediaWithDefaults(pcf_deps); pcf_ = CreateModularPeerConnectionFactory(std::move(pcf_deps)); RTC_LOG(LS_INFO) << "PeerConnectionFactory created: " << pcf_.get(); diff --git a/media/engine/webrtc_media_engine_defaults.cc b/media/engine/webrtc_media_engine_defaults.cc index 1660873e8b..fed646610b 100644 --- a/media/engine/webrtc_media_engine_defaults.cc +++ b/media/engine/webrtc_media_engine_defaults.cc @@ -20,7 +20,7 @@ namespace webrtc { -void SetMediaEngineDefaults(cricket::MediaEngineDependencies* deps) { +void DeprecatedSetMediaEngineDefaults(cricket::MediaEngineDependencies* deps) { RTC_DCHECK(deps); if (deps->task_queue_factory == nullptr) { static TaskQueueFactory* const task_queue_factory = diff --git a/media/engine/webrtc_media_engine_defaults.h b/media/engine/webrtc_media_engine_defaults.h index 16b1d462e3..a0ed059a2b 100644 --- a/media/engine/webrtc_media_engine_defaults.h +++ b/media/engine/webrtc_media_engine_defaults.h @@ -17,7 +17,13 @@ namespace webrtc { // Sets required but null dependencies with default factories. -RTC_EXPORT void SetMediaEngineDefaults(cricket::MediaEngineDependencies* deps); +// Deprecated in favor of EnableMediaWithDefaults. +RTC_EXPORT void DeprecatedSetMediaEngineDefaults( + cricket::MediaEngineDependencies* deps); +[[deprecated("bugs.webrc.org/15574")]] inline void SetMediaEngineDefaults( + cricket::MediaEngineDependencies* deps) { + DeprecatedSetMediaEngineDefaults(deps); +} } // namespace webrtc diff --git a/media/engine/webrtc_media_engine_unittest.cc b/media/engine/webrtc_media_engine_unittest.cc index 4615f03deb..738ce45972 100644 --- a/media/engine/webrtc_media_engine_unittest.cc +++ b/media/engine/webrtc_media_engine_unittest.cc @@ -324,7 +324,7 @@ TEST(WebRtcMediaEngineTest, FilterRtpExtensionsRemoveRedundantBwe3) { TEST(WebRtcMediaEngineTest, Create) { MediaEngineDependencies deps; - webrtc::SetMediaEngineDefaults(&deps); + webrtc::DeprecatedSetMediaEngineDefaults(&deps); webrtc::test::ScopedKeyValueConfig trials; deps.trials = &trials; diff --git a/pc/BUILD.gn b/pc/BUILD.gn index 7952ffd408..b4508b6529 100644 --- a/pc/BUILD.gn +++ b/pc/BUILD.gn @@ -2416,6 +2416,7 @@ if (rtc_include_tests && !build_with_chromium) { "../api:dtls_transport_interface", "../api:dtmf_sender_interface", "../api:enable_media", + "../api:enable_media_with_defaults", "../api:fake_frame_decryptor", "../api:fake_frame_encryptor", "../api:field_trials_view", diff --git a/pc/peer_connection_field_trial_tests.cc b/pc/peer_connection_field_trial_tests.cc index 7799c9d6e3..c009475c7e 100644 --- a/pc/peer_connection_field_trial_tests.cc +++ b/pc/peer_connection_field_trial_tests.cc @@ -16,13 +16,13 @@ #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/create_peerconnection_factory.h" +#include "api/enable_media_with_defaults.h" #include "api/peer_connection_interface.h" #include "api/stats/rtcstats_objects.h" #include "api/task_queue/default_task_queue_factory.h" #include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/builtin_video_encoder_factory.h" #include "media/engine/webrtc_media_engine.h" -#include "media/engine/webrtc_media_engine_defaults.h" #include "pc/peer_connection_wrapper.h" #include "pc/session_description.h" #include "pc/test/fake_audio_capture_module.h" @@ -81,13 +81,8 @@ class PeerConnectionFieldTrialTest : public ::testing::Test { pcf_deps.signaling_thread = rtc::Thread::Current(); pcf_deps.trials = std::move(field_trials); pcf_deps.task_queue_factory = CreateDefaultTaskQueueFactory(); - pcf_deps.call_factory = webrtc::CreateCallFactory(); - cricket::MediaEngineDependencies media_deps; - media_deps.task_queue_factory = pcf_deps.task_queue_factory.get(); - media_deps.adm = FakeAudioCaptureModule::Create(); - media_deps.trials = pcf_deps.trials.get(); - webrtc::SetMediaEngineDefaults(&media_deps); - pcf_deps.media_engine = cricket::CreateMediaEngine(std::move(media_deps)); + pcf_deps.adm = FakeAudioCaptureModule::Create(); + EnableMediaWithDefaults(pcf_deps); pc_factory_ = CreateModularPeerConnectionFactory(std::move(pcf_deps)); // Allow ADAPTER_TYPE_LOOPBACK to create PeerConnections with loopback in diff --git a/pc/peer_connection_interface_unittest.cc b/pc/peer_connection_interface_unittest.cc index 1f5ab2f449..5aa9715c99 100644 --- a/pc/peer_connection_interface_unittest.cc +++ b/pc/peer_connection_interface_unittest.cc @@ -25,6 +25,7 @@ #include "api/call/call_factory_interface.h" #include "api/create_peerconnection_factory.h" #include "api/data_channel_interface.h" +#include "api/enable_media_with_defaults.h" #include "api/jsep.h" #include "api/media_stream_interface.h" #include "api/media_types.h" @@ -53,7 +54,6 @@ #include "media/base/media_engine.h" #include "media/base/stream_params.h" #include "media/engine/webrtc_media_engine.h" -#include "media/engine/webrtc_media_engine_defaults.h" #include "media/sctp/sctp_transport_internal.h" #include "modules/audio_device/include/audio_device.h" #include "modules/audio_processing/include/audio_processing.h" @@ -641,16 +641,10 @@ class PeerConnectionFactoryForTest : public webrtc::PeerConnectionFactory { dependencies.signaling_thread = rtc::Thread::Current(); dependencies.task_queue_factory = CreateDefaultTaskQueueFactory(); dependencies.trials = std::make_unique(); - cricket::MediaEngineDependencies media_deps; - media_deps.task_queue_factory = dependencies.task_queue_factory.get(); // Use fake audio device module since we're only testing the interface // level, and using a real one could make tests flaky when run in parallel. - media_deps.adm = FakeAudioCaptureModule::Create(); - SetMediaEngineDefaults(&media_deps); - media_deps.trials = dependencies.trials.get(); - dependencies.media_engine = - cricket::CreateMediaEngine(std::move(media_deps)); - dependencies.call_factory = webrtc::CreateCallFactory(); + dependencies.adm = FakeAudioCaptureModule::Create(); + EnableMediaWithDefaults(dependencies); dependencies.event_log_factory = std::make_unique( dependencies.task_queue_factory.get()); diff --git a/pc/peer_connection_jsep_unittest.cc b/pc/peer_connection_jsep_unittest.cc index 1369253ad6..7988f8be44 100644 --- a/pc/peer_connection_jsep_unittest.cc +++ b/pc/peer_connection_jsep_unittest.cc @@ -21,6 +21,7 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "api/call/call_factory_interface.h" +#include "api/enable_media_with_defaults.h" #include "api/field_trials_view.h" #include "api/jsep.h" #include "api/media_stream_interface.h" @@ -40,7 +41,6 @@ #include "media/base/media_engine.h" #include "media/base/stream_params.h" #include "media/engine/webrtc_media_engine.h" -#include "media/engine/webrtc_media_engine_defaults.h" #include "modules/audio_device/include/audio_device.h" #include "p2p/base/p2p_constants.h" #include "p2p/base/port_allocator.h" @@ -84,13 +84,8 @@ PeerConnectionFactoryDependencies CreatePeerConnectionFactoryDependencies() { dependencies.signaling_thread = rtc::Thread::Current(); dependencies.task_queue_factory = CreateDefaultTaskQueueFactory(); dependencies.trials = std::make_unique(); - cricket::MediaEngineDependencies media_deps; - media_deps.task_queue_factory = dependencies.task_queue_factory.get(); - media_deps.adm = FakeAudioCaptureModule::Create(); - media_deps.trials = dependencies.trials.get(); - SetMediaEngineDefaults(&media_deps); - dependencies.media_engine = cricket::CreateMediaEngine(std::move(media_deps)); - dependencies.call_factory = CreateCallFactory(); + dependencies.adm = FakeAudioCaptureModule::Create(); + EnableMediaWithDefaults(dependencies); dependencies.sctp_factory = std::make_unique(); return dependencies; } diff --git a/pc/test/integration_test_helpers.h b/pc/test/integration_test_helpers.h index 36b2111324..435a6da4fd 100644 --- a/pc/test/integration_test_helpers.h +++ b/pc/test/integration_test_helpers.h @@ -786,7 +786,10 @@ class PeerConnectionIntegrationWrapper : public webrtc::PeerConnectionObserver, media_deps.task_queue_factory = pc_factory_dependencies.task_queue_factory.get(); media_deps.adm = fake_audio_capture_module_; - webrtc::SetMediaEngineDefaults(&media_deps); + // TODO(bugs.webrtc.org/15574): Migrate this test helper to use EnableMedia + // instead of creating media_engine directly. In particular ensure no tests + // rely on behaviour where call_factory is set, while media_engine is not. + webrtc::DeprecatedSetMediaEngineDefaults(&media_deps); if (reset_encoder_factory) { media_deps.video_encoder_factory.reset(); diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index b0598b4d4e..b412d2f6a9 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -1632,6 +1632,7 @@ if (is_android) { ":native_test_jni_onload", ":opensles_audio_device_module", ":video_jni", + "../../api:enable_media_with_defaults", "../../api:field_trials_view", "../../api:scoped_refptr", "../../api/rtc_event_log:rtc_event_log_factory", @@ -1642,7 +1643,6 @@ if (is_android) { "../../media:rtc_audio_video", "../../media:rtc_internal_video_codecs", "../../media:rtc_media_base", - "../../media:rtc_media_engine_defaults", "../../modules/audio_device", "../../modules/audio_device:mock_audio_device", "../../modules/audio_processing:api", diff --git a/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc b/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc index b7513909a4..df97e768e6 100644 --- a/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc +++ b/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc @@ -11,20 +11,20 @@ #include +#include "api/enable_media_with_defaults.h" #include "api/rtc_event_log/rtc_event_log_factory.h" #include "api/task_queue/default_task_queue_factory.h" #include "media/base/media_engine.h" #include "media/engine/internal_decoder_factory.h" #include "media/engine/internal_encoder_factory.h" #include "media/engine/webrtc_media_engine.h" -#include "media/engine/webrtc_media_engine_defaults.h" #include "rtc_base/logging.h" #include "rtc_base/physical_socket_server.h" #include "rtc_base/thread.h" #include "sdk/android/generated_native_unittests_jni/PeerConnectionFactoryInitializationHelper_jni.h" #include "sdk/android/native_api/audio_device_module/audio_device_android.h" -#include "sdk/android/native_api/jni/jvm.h" #include "sdk/android/native_api/jni/application_context_provider.h" +#include "sdk/android/native_api/jni/jvm.h" #include "sdk/android/src/jni/jni_helpers.h" #include "test/gtest.h" @@ -50,21 +50,15 @@ rtc::scoped_refptr CreateTestPCF( pcf_deps.worker_thread = worker_thread; pcf_deps.signaling_thread = signaling_thread; pcf_deps.task_queue_factory = CreateDefaultTaskQueueFactory(); - pcf_deps.call_factory = CreateCallFactory(); pcf_deps.event_log_factory = std::make_unique(pcf_deps.task_queue_factory.get()); - cricket::MediaEngineDependencies media_deps; - media_deps.task_queue_factory = pcf_deps.task_queue_factory.get(); - media_deps.adm = - CreateJavaAudioDeviceModule(jni, GetAppContext(jni).obj()); - media_deps.video_encoder_factory = + pcf_deps.adm = CreateJavaAudioDeviceModule(jni, GetAppContext(jni).obj()); + pcf_deps.video_encoder_factory = std::make_unique(); - media_deps.video_decoder_factory = + pcf_deps.video_decoder_factory = std::make_unique(); - SetMediaEngineDefaults(&media_deps); - pcf_deps.media_engine = cricket::CreateMediaEngine(std::move(media_deps)); - RTC_LOG(LS_INFO) << "Media engine created: " << pcf_deps.media_engine.get(); + EnableMediaWithDefaults(pcf_deps); auto factory = CreateModularPeerConnectionFactory(std::move(pcf_deps)); RTC_LOG(LS_INFO) << "PeerConnectionFactory created: " << factory.get(); diff --git a/test/network/BUILD.gn b/test/network/BUILD.gn index 5a6cb31f4b..2b4c39624f 100644 --- a/test/network/BUILD.gn +++ b/test/network/BUILD.gn @@ -117,6 +117,7 @@ if (rtc_include_tests && !build_with_chromium) { ":emulated_network", "../:test_support", "../../api:callfactory_api", + "../../api:enable_media_with_defaults", "../../api:libjingle_peerconnection_api", "../../api:scoped_refptr", "../../api:simulated_network_api", @@ -125,7 +126,6 @@ if (rtc_include_tests && !build_with_chromium) { "../../api/transport:field_trial_based_config", "../../call:simulated_network", "../../media:rtc_audio_video", - "../../media:rtc_media_engine_defaults", "../../modules/audio_device:test_audio_device_module", "../../p2p:rtc_p2p", "../../pc:pc_test_utils", diff --git a/test/network/network_emulation_pc_unittest.cc b/test/network/network_emulation_pc_unittest.cc index 51a45a8234..09d3946747 100644 --- a/test/network/network_emulation_pc_unittest.cc +++ b/test/network/network_emulation_pc_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "api/call/call_factory_interface.h" +#include "api/enable_media_with_defaults.h" #include "api/peer_connection_interface.h" #include "api/rtc_event_log/rtc_event_log_factory.h" #include "api/scoped_refptr.h" @@ -19,7 +19,6 @@ #include "api/transport/field_trial_based_config.h" #include "call/simulated_network.h" #include "media/engine/webrtc_media_engine.h" -#include "media/engine/webrtc_media_engine_defaults.h" #include "modules/audio_device/include/test_audio_device.h" #include "p2p/base/basic_packet_socket_factory.h" #include "p2p/client/basic_port_allocator.h" @@ -57,23 +56,18 @@ rtc::scoped_refptr CreatePeerConnectionFactory( rtc::Thread* network_thread) { PeerConnectionFactoryDependencies pcf_deps; pcf_deps.task_queue_factory = CreateDefaultTaskQueueFactory(); - pcf_deps.call_factory = CreateCallFactory(); pcf_deps.event_log_factory = std::make_unique(pcf_deps.task_queue_factory.get()); pcf_deps.network_thread = network_thread; pcf_deps.signaling_thread = signaling_thread; pcf_deps.trials = std::make_unique(); - cricket::MediaEngineDependencies media_deps; - media_deps.task_queue_factory = pcf_deps.task_queue_factory.get(); - media_deps.adm = TestAudioDeviceModule::Create( - media_deps.task_queue_factory, + pcf_deps.adm = TestAudioDeviceModule::Create( + pcf_deps.task_queue_factory.get(), TestAudioDeviceModule::CreatePulsedNoiseCapturer(kMaxAptitude, kSamplingFrequency), TestAudioDeviceModule::CreateDiscardRenderer(kSamplingFrequency), /*speed=*/1.f); - media_deps.trials = pcf_deps.trials.get(); - SetMediaEngineDefaults(&media_deps); - pcf_deps.media_engine = cricket::CreateMediaEngine(std::move(media_deps)); + EnableMediaWithDefaults(pcf_deps); return CreateModularPeerConnectionFactory(std::move(pcf_deps)); } diff --git a/test/pc/e2e/test_peer_factory.cc b/test/pc/e2e/test_peer_factory.cc index 41f7533c3a..281dac5c55 100644 --- a/test/pc/e2e/test_peer_factory.cc +++ b/test/pc/e2e/test_peer_factory.cc @@ -161,7 +161,9 @@ std::unique_ptr CreateMediaEngine( std::move(pcf_dependencies->video_decoder_factory); media_deps.audio_encoder_factory = pcf_dependencies->audio_encoder_factory; media_deps.audio_decoder_factory = pcf_dependencies->audio_decoder_factory; - webrtc::SetMediaEngineDefaults(&media_deps); + // TODO(bugs.webrtc.org/15574): Migrate to enabling media with EnableMedia + // kind of helper when TimeController aware test helper is implemented. + webrtc::DeprecatedSetMediaEngineDefaults(&media_deps); RTC_DCHECK(pcf_dependencies->trials); media_deps.trials = pcf_dependencies->trials.get();