From dc806fd16aab5c2c3d73bdccd1b6d6f00f5ac0dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85sa=20Persson?= Date: Fri, 31 Mar 2023 15:42:38 +0200 Subject: [PATCH] Replace BuiltinVideo{Encoder,Decoder}Factory with Video{Encoder,Decoder}FactoryTemplate. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:13573 Change-Id: Iac9d0eb56a5cae73b75188b9fb257d6815e04bef Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/299701 Reviewed-by: Per Kjellander Commit-Queue: Åsa Persson Cr-Commit-Position: refs/heads/main@{#39733} --- pc/BUILD.gn | 12 ++++++++++-- pc/peer_connection_rampup_tests.cc | 19 ++++++++++++++++--- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/pc/BUILD.gn b/pc/BUILD.gn index 410365e31a..5b9e7f5653 100644 --- a/pc/BUILD.gn +++ b/pc/BUILD.gn @@ -2215,9 +2215,17 @@ if (rtc_include_tests && !build_with_chromium) { "../api/audio_codecs:builtin_audio_encoder_factory", "../api/test/metrics:global_metrics_logger_and_exporter", "../api/test/metrics:metric", - "../api/video_codecs:builtin_video_decoder_factory", - "../api/video_codecs:builtin_video_encoder_factory", "../api/video_codecs:video_codecs_api", + "../api/video_codecs:video_decoder_factory_template", + "../api/video_codecs:video_decoder_factory_template_dav1d_adapter", + "../api/video_codecs:video_decoder_factory_template_libvpx_vp8_adapter", + "../api/video_codecs:video_decoder_factory_template_libvpx_vp9_adapter", + "../api/video_codecs:video_decoder_factory_template_open_h264_adapter", + "../api/video_codecs:video_encoder_factory_template", + "../api/video_codecs:video_encoder_factory_template_libaom_av1_adapter", + "../api/video_codecs:video_encoder_factory_template_libvpx_vp8_adapter", + "../api/video_codecs:video_encoder_factory_template_libvpx_vp9_adapter", + "../api/video_codecs:video_encoder_factory_template_open_h264_adapter", "../media:rtc_media_tests_utils", "../modules/audio_device:audio_device_api", "../modules/audio_processing:api", diff --git a/pc/peer_connection_rampup_tests.cc b/pc/peer_connection_rampup_tests.cc index 0fbbe7502f..34b61b4e14 100644 --- a/pc/peer_connection_rampup_tests.cc +++ b/pc/peer_connection_rampup_tests.cc @@ -29,8 +29,16 @@ #include "api/stats/rtcstats_objects.h" #include "api/test/metrics/global_metrics_logger_and_exporter.h" #include "api/test/metrics/metric.h" -#include "api/video_codecs/builtin_video_decoder_factory.h" -#include "api/video_codecs/builtin_video_encoder_factory.h" +#include "api/video_codecs/video_decoder_factory_template.h" +#include "api/video_codecs/video_decoder_factory_template_dav1d_adapter.h" +#include "api/video_codecs/video_decoder_factory_template_libvpx_vp8_adapter.h" +#include "api/video_codecs/video_decoder_factory_template_libvpx_vp9_adapter.h" +#include "api/video_codecs/video_decoder_factory_template_open_h264_adapter.h" +#include "api/video_codecs/video_encoder_factory_template.h" +#include "api/video_codecs/video_encoder_factory_template_libaom_av1_adapter.h" +#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 "modules/audio_device/include/audio_device.h" #include "modules/audio_processing/include/audio_processing.h" #include "p2p/base/port_allocator.h" @@ -164,7 +172,12 @@ class PeerConnectionRampUpTest : public ::testing::Test { network_thread_.get(), worker_thread_.get(), rtc::Thread::Current(), rtc::scoped_refptr(FakeAudioCaptureModule::Create()), CreateBuiltinAudioEncoderFactory(), CreateBuiltinAudioDecoderFactory(), - CreateBuiltinVideoEncoderFactory(), CreateBuiltinVideoDecoderFactory(), + std::make_unique>(), + std::make_unique>(), nullptr /* audio_mixer */, nullptr /* audio_processing */); }