From 13fffbbe4045571eae74b446c7e6ed6bf45b0d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85sa=20Persson?= Date: Fri, 31 Mar 2023 13:13:37 +0200 Subject: [PATCH] Replace BuiltinVideoDecoderFactory with VideoDecoderFactoryTemplate. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:13573 Change-Id: Ie933b7902d6b7a548159885178161ed5cb752e22 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/299602 Reviewed-by: Per Kjellander Commit-Queue: Åsa Persson Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#39748} --- pc/BUILD.gn | 6 +++++- pc/test/peer_connection_test_wrapper.cc | 14 +++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/pc/BUILD.gn b/pc/BUILD.gn index e098181743..1ac1a01079 100644 --- a/pc/BUILD.gn +++ b/pc/BUILD.gn @@ -2791,9 +2791,13 @@ if (rtc_include_tests && !build_with_chromium) { "../api/video:resolution", "../api/video:video_frame", "../api/video:video_rtp_headers", - "../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", "../call:call_interfaces", "../media:media_channel", "../media:media_channel_impl", diff --git a/pc/test/peer_connection_test_wrapper.cc b/pc/test/peer_connection_test_wrapper.cc index 84a01f4438..9b22aea0bc 100644 --- a/pc/test/peer_connection_test_wrapper.cc +++ b/pc/test/peer_connection_test_wrapper.cc @@ -21,9 +21,13 @@ #include "api/audio/audio_mixer.h" #include "api/create_peerconnection_factory.h" #include "api/sequence_checker.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.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.h" #include "modules/audio_device/include/audio_device.h" #include "modules/audio_processing/include/audio_processing.h" @@ -119,8 +123,12 @@ bool PeerConnectionTestWrapper::CreatePc( rtc::scoped_refptr(fake_audio_capture_module_), audio_encoder_factory, audio_decoder_factory, webrtc::CreateBuiltinVideoEncoderFactory(), - webrtc::CreateBuiltinVideoDecoderFactory(), nullptr /* audio_mixer */, - nullptr /* audio_processing */); + std::make_unique>(), + nullptr /* audio_mixer */, nullptr /* audio_processing */); if (!peer_connection_factory_) { return false; }