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

Migrate webrtc_link_test to include EnableMedia api

Browse Source 
Bug: webrtc:15574
Change-Id: Ic0cbf0032587560fbb206c029d5f7692effe39a5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/325900
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@{#41068}
This commit is contained in:
Danil Chapovalov 2023-11-02 19:18:04 +01:00 committed by WebRTC LUCI CQ
parent 78f905e5cc
commit b29ff000da
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BUILD.gn
View File

@ -500,6 +500,7 @@ if (!build_with_chromium) {
deps = [
"api:create_peerconnection_factory",
"api:enable_media",
"api:libjingle_peerconnection_api",
"api:rtc_error",
"api:transport_api",

21
webrtc_lib_link_test.cc
View File

@ -12,8 +12,8 @@
#include "api/audio_codecs/audio_encoder_factory_template.h"
#include "api/audio_codecs/opus/audio_decoder_opus.h"
#include "api/audio_codecs/opus/audio_encoder_opus.h"
#include "api/call/call_factory_interface.h"
#include "api/create_peerconnection_factory.h"
#include "api/enable_media.h"
#include "api/peer_connection_interface.h"
#include "api/rtc_event_log/rtc_event_log_factory.h"
#include "api/stats/rtcstats_objects.h"
@ -28,18 +28,14 @@
#include "api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter.h"
#include "api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter.h"
#include "api/video_codecs/video_encoder_factory_template_open_h264_adapter.h"
#include "media/engine/webrtc_media_engine.h"
#include "modules/audio_device/include/audio_device.h"
#include "modules/audio_processing/include/audio_processing.h"
namespace webrtc {
cricket::MediaEngineDependencies CreateSomeMediaDeps(
TaskQueueFactory* task_queue_factory) {
cricket::MediaEngineDependencies media_deps;
media_deps.task_queue_factory = task_queue_factory;
void CreateSomeMediaDeps(PeerConnectionFactoryDependencies& media_deps) {
media_deps.adm = AudioDeviceModule::CreateForTest(
AudioDeviceModule::kDummyAudio, task_queue_factory);
AudioDeviceModule::kDummyAudio, media_deps.task_queue_factory.get());
media_deps.audio_encoder_factory =
webrtc::CreateAudioEncoderFactory<webrtc::AudioEncoderOpus>();
media_deps.audio_decoder_factory =
@ -53,7 +49,6 @@ cricket::MediaEngineDependencies CreateSomeMediaDeps(
LibvpxVp8DecoderTemplateAdapter, LibvpxVp9DecoderTemplateAdapter,
OpenH264DecoderTemplateAdapter, Dav1dDecoderTemplateAdapter>>();
media_deps.audio_processing = webrtc::AudioProcessingBuilder().Create();
return media_deps;
}
webrtc::PeerConnectionFactoryDependencies CreateSomePcfDeps() {
@ -62,11 +57,10 @@ webrtc::PeerConnectionFactoryDependencies CreateSomePcfDeps() {
pcf_deps.signaling_thread = rtc::Thread::Current();
pcf_deps.network_thread = rtc::Thread::Current();
pcf_deps.worker_thread = rtc::Thread::Current();
pcf_deps.call_factory = webrtc::CreateCallFactory();
pcf_deps.event_log_factory = std::make_unique<webrtc::RtcEventLogFactory>(
pcf_deps.task_queue_factory.get());
auto media_deps = CreateSomeMediaDeps(pcf_deps.task_queue_factory.get());
pcf_deps.media_engine = cricket::CreateMediaEngine(std::move(media_deps));
CreateSomeMediaDeps(pcf_deps);
EnableMedia(pcf_deps);
return pcf_deps;
}
@ -86,8 +80,9 @@ void TestCase1ModularFactory() {
}
void TestCase2RegularFactory() {
auto task_queue_factory = CreateDefaultTaskQueueFactory();
auto media_deps = CreateSomeMediaDeps(task_queue_factory.get());
PeerConnectionFactoryDependencies media_deps;
media_deps.task_queue_factory = CreateDefaultTaskQueueFactory();
CreateSomeMediaDeps(media_deps);
auto peer_connection_factory = webrtc::CreatePeerConnectionFactory(
rtc::Thread::Current(), rtc::Thread::Current(), rtc::Thread::Current(),