From 0892215dc090ff90633cf02154efd055e88c76e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Sat, 18 Mar 2023 10:13:24 +0100 Subject: [PATCH] Revert "Ensure AV1 is always available in PeerConnectionSimulcastTests." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2d3b294e49027607c80766c50f1c3c8d7d4b38b9. Reason for revert: The CL was believed to make AV1 always available but it turned out that the import bots still failed due to not having AV1, so it is better to use the built in factories than to make custom test-only ones. Original change's description: > Ensure AV1 is always available in PeerConnectionSimulcastTests. > > Unblocks a WebRTC import where a bot without AV1 support would > otherwise have been running and failing during setting codec > preferences. > > # Non-chromium bots passed, no need to wait for chromium to land. > # Want to unblock importer. > NOTRY=True > > Bug: webrtc:15005 > Change-Id: I93c6a0ce5591a057c3a0ee49f6dbaef3676c0e1d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/298021 > Reviewed-by: Mirko Bonadei > Commit-Queue: Henrik Boström > Reviewed-by: Jeremy Leconte > Cr-Commit-Position: refs/heads/main@{#39592} Bug: webrtc:15005 Change-Id: I8f0850852edb0d0234000b2d956e2648a9adf904 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/298120 Reviewed-by: Jeremy Leconte Auto-Submit: Henrik Boström Bot-Commit: rubber-stamper@appspot.gserviceaccount.com Commit-Queue: Jeremy Leconte Cr-Commit-Position: refs/heads/main@{#39596} --- pc/BUILD.gn | 10 ------ pc/peer_connection_simulcast_unittest.cc | 42 ++++++++---------------- 2 files changed, 13 insertions(+), 39 deletions(-) diff --git a/pc/BUILD.gn b/pc/BUILD.gn index 0eae82a80a..ea1909bc4f 100644 --- a/pc/BUILD.gn +++ b/pc/BUILD.gn @@ -2535,16 +2535,6 @@ if (rtc_include_tests && !build_with_chromium) { "../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", "../call:call_interfaces", "../media:rtc_audio_video", "../media:rtc_media_base", diff --git a/pc/peer_connection_simulcast_unittest.cc b/pc/peer_connection_simulcast_unittest.cc index 8e110aa9cc..1e8955be03 100644 --- a/pc/peer_connection_simulcast_unittest.cc +++ b/pc/peer_connection_simulcast_unittest.cc @@ -38,16 +38,8 @@ #include "api/stats/rtcstats_objects.h" #include "api/uma_metrics.h" #include "api/video/video_codec_constants.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 "api/video_codecs/builtin_video_decoder_factory.h" +#include "api/video_codecs/builtin_video_encoder_factory.h" #include "media/base/media_constants.h" #include "media/base/rid_description.h" #include "media/base/stream_params.h" @@ -181,25 +173,17 @@ constexpr TimeDelta kLongTimeoutForRampingUp = TimeDelta::Seconds(30); class PeerConnectionSimulcastTests : public ::testing::Test { public: PeerConnectionSimulcastTests() - : pc_factory_(CreatePeerConnectionFactory( - rtc::Thread::Current(), - rtc::Thread::Current(), - rtc::Thread::Current(), - FakeAudioCaptureModule::Create(), - CreateBuiltinAudioEncoderFactory(), - CreateBuiltinAudioDecoderFactory(), - std::make_unique< - VideoEncoderFactoryTemplate>(), - std::make_unique< - VideoDecoderFactoryTemplate>(), - nullptr, - nullptr)) {} + : pc_factory_( + CreatePeerConnectionFactory(rtc::Thread::Current(), + rtc::Thread::Current(), + rtc::Thread::Current(), + FakeAudioCaptureModule::Create(), + CreateBuiltinAudioEncoderFactory(), + CreateBuiltinAudioDecoderFactory(), + CreateBuiltinVideoEncoderFactory(), + CreateBuiltinVideoDecoderFactory(), + nullptr, + nullptr)) {} rtc::scoped_refptr CreatePeerConnection( MockPeerConnectionObserver* observer) {