mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 13:50:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Delete deprecated variant of the VideoDecoderSoftwareFallbackWrapper without Environment

Browse source 
Bug: webrtc:15791
Change-Id: I8efa1eb7a8393f322f5adaa7c62d8f6bb7d090a0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/340061
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41779}
This commit is contained in:
Danil Chapovalov 2024-02-20 12:18:16 +01:00 committed by WebRTC LUCI CQ
parent dc6a001b6b
commit fa01e3fdc0
2 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
api/video_codecs/video_decoder_software_fallback_wrapper.cc
View file

@ -23,7 +23,6 @@
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
#include "rtc_base/logging.h" #include "rtc_base/logging.h"
#include "rtc_base/trace_event.h" #include "rtc_base/trace_event.h"
#include "system_wrappers/include/field_trial.h"
#include "system_wrappers/include/metrics.h" #include "system_wrappers/include/metrics.h"
namespace webrtc { namespace webrtc {
@ -35,9 +34,9 @@ constexpr size_t kMaxConsequtiveHwErrors = 4;
class VideoDecoderSoftwareFallbackWrapper final : public VideoDecoder { class VideoDecoderSoftwareFallbackWrapper final : public VideoDecoder {
public: public:
VideoDecoderSoftwareFallbackWrapper( VideoDecoderSoftwareFallbackWrapper(
const Environment& env,
std::unique_ptr<VideoDecoder> sw_fallback_decoder, std::unique_ptr<VideoDecoder> sw_fallback_decoder,
std::unique_ptr<VideoDecoder> hw_decoder, std::unique_ptr<VideoDecoder> hw_decoder);
bool force_sw_decoder_fallback);
~VideoDecoderSoftwareFallbackWrapper() override; ~VideoDecoderSoftwareFallbackWrapper() override;
bool Configure(const Settings& settings) override; bool Configure(const Settings& settings) override;
@ -79,12 +78,13 @@ class VideoDecoderSoftwareFallbackWrapper final : public VideoDecoder {
}; };
VideoDecoderSoftwareFallbackWrapper::VideoDecoderSoftwareFallbackWrapper( VideoDecoderSoftwareFallbackWrapper::VideoDecoderSoftwareFallbackWrapper(
const Environment& env,
std::unique_ptr<VideoDecoder> sw_fallback_decoder, std::unique_ptr<VideoDecoder> sw_fallback_decoder,
std::unique_ptr<VideoDecoder> hw_decoder, std::unique_ptr<VideoDecoder> hw_decoder)
bool force_sw_decoder_fallback)
: decoder_type_(DecoderType::kNone), : decoder_type_(DecoderType::kNone),
hw_decoder_(std::move(hw_decoder)), hw_decoder_(std::move(hw_decoder)),
force_sw_decoder_fallback_(force_sw_decoder_fallback), force_sw_decoder_fallback_(
env.field_trials().IsEnabled("WebRTC-Video-ForcedSwDecoderFallback")),
fallback_decoder_(std::move(sw_fallback_decoder)), fallback_decoder_(std::move(sw_fallback_decoder)),
fallback_implementation_name_( fallback_implementation_name_(
fallback_decoder_->GetDecoderInfo().implementation_name + fallback_decoder_->GetDecoderInfo().implementation_name +
@ -285,16 +285,7 @@ std::unique_ptr<VideoDecoder> CreateVideoDecoderSoftwareFallbackWrapper(
std::unique_ptr<VideoDecoder> sw_fallback_decoder, std::unique_ptr<VideoDecoder> sw_fallback_decoder,
std::unique_ptr<VideoDecoder> hw_decoder) { std::unique_ptr<VideoDecoder> hw_decoder) {
return std::make_unique<VideoDecoderSoftwareFallbackWrapper>( return std::make_unique<VideoDecoderSoftwareFallbackWrapper>(
std::move(sw_fallback_decoder), std::move(hw_decoder), env, std::move(sw_fallback_decoder), std::move(hw_decoder));
env.field_trials().IsEnabled("WebRTC-Video-ForcedSwDecoderFallback"));
}
std::unique_ptr<VideoDecoder> CreateVideoDecoderSoftwareFallbackWrapper(
std::unique_ptr<VideoDecoder> sw_fallback_decoder,
std::unique_ptr<VideoDecoder> hw_decoder) {
return std::make_unique<VideoDecoderSoftwareFallbackWrapper>(
std::move(sw_fallback_decoder), std::move(hw_decoder),
webrtc::field_trial::IsEnabled("WebRTC-Video-ForcedSwDecoderFallback"));
} }
} // namespace webrtc } // namespace webrtc

6
api/video_codecs/video_decoder_software_fallback_wrapper.h
View file

@ -28,12 +28,6 @@ CreateVideoDecoderSoftwareFallbackWrapper(
std::unique_ptr<VideoDecoder> sw_fallback_decoder, std::unique_ptr<VideoDecoder> sw_fallback_decoder,
std::unique_ptr<VideoDecoder> hw_decoder); std::unique_ptr<VideoDecoder> hw_decoder);
// TODO: bugs.webrtc.org/15791 - Deprecated, remove when not used by chromium.
RTC_EXPORT std::unique_ptr<VideoDecoder>
CreateVideoDecoderSoftwareFallbackWrapper(
std::unique_ptr<VideoDecoder> sw_fallback_decoder,
std::unique_ptr<VideoDecoder> hw_decoder);
} // namespace webrtc } // namespace webrtc
#endif // API_VIDEO_CODECS_VIDEO_DECODER_SOFTWARE_FALLBACK_WRAPPER_H_ #endif // API_VIDEO_CODECS_VIDEO_DECODER_SOFTWARE_FALLBACK_WRAPPER_H_