From 0b148e91a4151cec5045b8129faf40191290711f Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Tue, 4 Apr 2023 07:17:52 +0000 Subject: [PATCH] Revert "Migrate away from builtin video encoder/decoder factories in pc tests" This reverts commit 8be11b0d05012fbc7577693f896c2d70a8867b19. Reason for revert: Breaks downstream project (speculative rollback) Original change's description: > Migrate away from builtin video encoder/decoder factories in pc tests > > Bug: webrtc:13573 > Change-Id: I076535d57568b653813da7b550689ce171589bce > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/299662 > Auto-Submit: Danil Chapovalov > Reviewed-by: Artem Titov > Commit-Queue: Artem Titov > Cr-Commit-Position: refs/heads/main@{#39736} Bug: webrtc:13573 Change-Id: Ibe4cc19cffe9b780244c44fb8d16ba66fc0a9542 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/300221 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com Owners-Override: Mirko Bonadei Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#39753} --- test/pc/e2e/BUILD.gn | 12 ++---------- test/pc/e2e/test_peer_factory.cc | 21 ++++----------------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn index 138fdff4f0..0d5d13d03d 100644 --- a/test/pc/e2e/BUILD.gn +++ b/test/pc/e2e/BUILD.gn @@ -103,16 +103,8 @@ if (!build_with_chromium) { "../../../api/test/pclf:media_quality_test_params", "../../../api/test/pclf:peer_configurer", "../../../api/transport:field_trial_based_config", - "../../../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", + "../../../api/video_codecs:builtin_video_decoder_factory", + "../../../api/video_codecs:builtin_video_encoder_factory", "../../../media:rtc_audio_video", "../../../media:rtc_media_engine_defaults", "../../../modules/audio_device:audio_device_impl", diff --git a/test/pc/e2e/test_peer_factory.cc b/test/pc/e2e/test_peer_factory.cc index d03a98d996..858676fd7a 100644 --- a/test/pc/e2e/test_peer_factory.cc +++ b/test/pc/e2e/test_peer_factory.cc @@ -9,7 +9,6 @@ */ #include "test/pc/e2e/test_peer_factory.h" -#include #include #include "absl/memory/memory.h" @@ -20,16 +19,8 @@ #include "api/test/pclf/peer_configurer.h" #include "api/test/time_controller.h" #include "api/transport/field_trial_based_config.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/engine/webrtc_media_engine.h" #include "media/engine/webrtc_media_engine_defaults.h" #include "modules/audio_processing/aec_dump/aec_dump_factory.h" @@ -194,9 +185,7 @@ void WrapVideoEncoderFactory( if (pcf_dependencies->video_encoder_factory != nullptr) { video_encoder_factory = std::move(pcf_dependencies->video_encoder_factory); } else { - video_encoder_factory = std::make_unique>(); + video_encoder_factory = CreateBuiltinVideoEncoderFactory(); } pcf_dependencies->video_encoder_factory = video_analyzer_helper->WrapVideoEncoderFactory( @@ -212,9 +201,7 @@ void WrapVideoDecoderFactory( if (pcf_dependencies->video_decoder_factory != nullptr) { video_decoder_factory = std::move(pcf_dependencies->video_decoder_factory); } else { - video_decoder_factory = std::make_unique>(); + video_decoder_factory = CreateBuiltinVideoDecoderFactory(); } pcf_dependencies->video_decoder_factory = video_analyzer_helper->WrapVideoDecoderFactory(