admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate PeerConnectionIntegrationWrapper to EnableMedia api

Browse Source 
Bug: webrtc:15574
Change-Id: I164916b6ba9d29519660b119ed38580c478ea7f7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/325528
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Auto-Submit: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41064}
This commit is contained in:
Danil Chapovalov 2023-11-01 14:43:07 +01:00 committed by WebRTC LUCI CQ
parent a6ce338a2c
commit 166111da62
2 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pc/BUILD.gn
View File

@ -2639,9 +2639,9 @@ if (rtc_include_tests && !build_with_chromium) {
":video_track_source",
"../api:array_view",
"../api:audio_options_api",
"../api:callfactory_api",
"../api:candidate",
"../api:create_peerconnection_factory",
"../api:enable_media_with_defaults",
"../api:fake_frame_decryptor",
"../api:fake_frame_encryptor",
"../api:field_trials_view",
@ -2677,10 +2677,8 @@ if (rtc_include_tests && !build_with_chromium) {
"../call:call_interfaces",
"../call/adaptation:resource_adaptation_test_utilities",
"../logging:fake_rtc_event_log",
"../media:rtc_audio_video",
"../media:rtc_media_base",
"../media:rtc_media_config",
"../media:rtc_media_engine_defaults",
"../media:rtc_media_tests_utils",
"../media:stream_params",
"../modules/audio_device:audio_device_api",

33
pc/test/integration_test_helpers.h
View File

@ -31,10 +31,10 @@
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
#include "api/audio_options.h"
#include "api/call/call_factory_interface.h"
#include "api/candidate.h"
#include "api/crypto/crypto_options.h"
#include "api/data_channel_interface.h"
#include "api/enable_media_with_defaults.h"
#include "api/field_trials_view.h"
#include "api/ice_transport_interface.h"
#include "api/jsep.h"
@ -68,8 +68,6 @@
#include "media/base/media_engine.h"
#include "media/base/stream_params.h"
#include "media/engine/fake_webrtc_video_engine.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 "modules/audio_processing/include/audio_processing.h"
#include "modules/audio_processing/test/audio_processing_builder_for_testing.h"
@ -782,35 +780,26 @@ class PeerConnectionIntegrationWrapper : public webrtc::PeerConnectionObserver,
pc_factory_dependencies.trials = std::make_unique<FieldTrialBasedConfig>();
pc_factory_dependencies.metronome =
std::make_unique<TaskQueueMetronome>(TimeDelta::Millis(8));
cricket::MediaEngineDependencies media_deps;
media_deps.task_queue_factory =
pc_factory_dependencies.task_queue_factory.get();
media_deps.adm = fake_audio_capture_module_;
// 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);
pc_factory_dependencies.adm = fake_audio_capture_module_;
if (create_media_engine) {
EnableMediaWithDefaults(pc_factory_dependencies);
}
if (reset_encoder_factory) {
media_deps.video_encoder_factory.reset();
pc_factory_dependencies.video_encoder_factory.reset();
}
if (reset_decoder_factory) {
media_deps.video_decoder_factory.reset();
pc_factory_dependencies.video_decoder_factory.reset();
}
if (!media_deps.audio_processing) {
if (!pc_factory_dependencies.audio_processing) {
// If the standard Creation method for APM returns a null pointer, instead
// use the builder for testing to create an APM object.
media_deps.audio_processing = AudioProcessingBuilderForTesting().Create();
pc_factory_dependencies.audio_processing =
AudioProcessingBuilderForTesting().Create();
}
media_deps.trials = pc_factory_dependencies.trials.get();
if (create_media_engine) {
pc_factory_dependencies.media_engine =
cricket::CreateMediaEngine(std::move(media_deps));
}
pc_factory_dependencies.call_factory = webrtc::CreateCallFactory();
if (event_log_factory) {
event_log_factory_ = event_log_factory.get();
pc_factory_dependencies.event_log_factory = std::move(event_log_factory);