From 2a66531b286b44b61f22ab79251565c89f320895 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Tue, 16 Apr 2024 19:06:41 +0200 Subject: [PATCH] Delete deprecated CreateVideoEncoderSoftwareFallbackWrapper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:15860 Change-Id: I26e6401a4d56f19e059ae8cd69d75d2cdee3db94 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/347740 Auto-Submit: Danil Chapovalov Reviewed-by: Erik Språng Commit-Queue: Danil Chapovalov Reviewed-by: Erik Språng Cr-Commit-Position: refs/heads/main@{#42165} --- api/video_codecs/BUILD.gn | 1 - .../video_encoder_software_fallback_wrapper.cc | 10 ---------- .../video_encoder_software_fallback_wrapper.h | 7 ------- 3 files changed, 18 deletions(-) diff --git a/api/video_codecs/BUILD.gn b/api/video_codecs/BUILD.gn index 444a8fcaeb..05de6a3662 100644 --- a/api/video_codecs/BUILD.gn +++ b/api/video_codecs/BUILD.gn @@ -312,7 +312,6 @@ rtc_library("rtc_software_fallback_wrappers") { "..:fec_controller_api", "../../api:field_trials_view", "../../api/environment", - "../../api/transport:field_trial_based_config", "../../api/video:video_frame", "../../media:video_common", "../../modules/video_coding:video_codec_interface", diff --git a/api/video_codecs/video_encoder_software_fallback_wrapper.cc b/api/video_codecs/video_encoder_software_fallback_wrapper.cc index 00d7053ded..a2c875f39c 100644 --- a/api/video_codecs/video_encoder_software_fallback_wrapper.cc +++ b/api/video_codecs/video_encoder_software_fallback_wrapper.cc @@ -22,7 +22,6 @@ #include "api/environment/environment.h" #include "api/fec_controller_override.h" #include "api/field_trials_view.h" -#include "api/transport/field_trial_based_config.h" #include "api/video/i420_buffer.h" #include "api/video/video_bitrate_allocation.h" #include "api/video/video_frame.h" @@ -551,13 +550,4 @@ std::unique_ptr CreateVideoEncoderSoftwareFallbackWrapper( prefer_temporal_support); } -std::unique_ptr CreateVideoEncoderSoftwareFallbackWrapper( - std::unique_ptr sw_fallback_encoder, - std::unique_ptr hw_encoder, - bool prefer_temporal_support) { - return std::make_unique( - FieldTrialBasedConfig(), std::move(sw_fallback_encoder), - std::move(hw_encoder), prefer_temporal_support); -} - } // namespace webrtc diff --git a/api/video_codecs/video_encoder_software_fallback_wrapper.h b/api/video_codecs/video_encoder_software_fallback_wrapper.h index 45118e2a15..8ce462f508 100644 --- a/api/video_codecs/video_encoder_software_fallback_wrapper.h +++ b/api/video_codecs/video_encoder_software_fallback_wrapper.h @@ -26,13 +26,6 @@ namespace webrtc { // |bool prefer_temporal_support| indicates that if the software fallback // encoder supports temporal layers but the hardware encoder does not, a // fallback should be forced even if the encoder otherwise works. -// TODO: bugs.webrtc.org/15860 - Delete after 2024-04-22. -[[deprecated]] RTC_EXPORT std::unique_ptr -CreateVideoEncoderSoftwareFallbackWrapper( - std::unique_ptr sw_fallback_encoder, - std::unique_ptr hw_encoder, - bool prefer_temporal_support); - RTC_EXPORT std::unique_ptr CreateVideoEncoderSoftwareFallbackWrapper( const Environment& env,