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

Cleanup SimulcastEncoderAdapter - require webrtc::Environment at construction time

Browse source 
Bug: webrtc:15860
Change-Id: I1a786fb4b04112197e49c883884fc4b30f8d13f4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/343182
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41937}
This commit is contained in:
Danil Chapovalov 2024-03-20 17:06:09 +01:00 committed by WebRTC LUCI CQ
parent 007a62d83d
commit c03827db1b
5 changed files with 7 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
api/video_codecs/BUILD.gn
View file

@ -151,7 +151,6 @@ rtc_library("builtin_video_encoder_factory") {
"../../media:rtc_simulcast_encoder_adapter",
"../../rtc_base/system:rtc_export",
"../environment",
"../transport:field_trial_based_config",
]
absl_deps = [
"//third_party/abseil-cpp/absl/strings",

17
api/video_codecs/builtin_video_encoder_factory.cc
View file

@ -16,7 +16,6 @@
#include "absl/types/optional.h"
#include "api/environment/environment.h"
#include "api/transport/field_trial_based_config.h"
#include "api/video_codecs/sdp_video_format.h"
#include "api/video_codecs/video_encoder.h"
#include "api/video_codecs/video_encoder_factory.h"
@ -33,22 +32,6 @@ class BuiltinVideoEncoderFactory : public VideoEncoderFactory {
BuiltinVideoEncoderFactory()
: internal_encoder_factory_(new InternalEncoderFactory()) {}
std::unique_ptr<VideoEncoder> CreateVideoEncoder(
const SdpVideoFormat& format) override {
// Try creating an InternalEncoderFactory-backed SimulcastEncoderAdapter.
// The adapter has a passthrough mode for the case that simulcast is not
// used, so all responsibility can be delegated to it.
std::unique_ptr<VideoEncoder> encoder;
if (format.IsCodecInList(
internal_encoder_factory_->GetSupportedFormats())) {
encoder = std::make_unique<SimulcastEncoderAdapter>(
/*primary_factory=*/internal_encoder_factory_.get(),
/*fallback_factory=*/nullptr, format, FieldTrialBasedConfig());
}
return encoder;
}
std::unique_ptr<VideoEncoder> Create(const Environment& env,
const SdpVideoFormat& format) override {
// Try creating an InternalEncoderFactory-backed SimulcastEncoderAdapter.

1
media/BUILD.gn
View file

@ -465,7 +465,6 @@ rtc_library("rtc_simulcast_encoder_adapter") {
"../api:scoped_refptr",
"../api:sequence_checker",
"../api/environment",
"../api/transport:field_trial_based_config",
"../api/video:video_codec_constants",
"../api/video:video_frame",
"../api/video:video_rtp_headers",

49
media/engine/simulcast_encoder_adapter.cc
View file

@ -22,7 +22,6 @@
#include "absl/types/optional.h"
#include "api/field_trials_view.h"
#include "api/scoped_refptr.h"
#include "api/transport/field_trial_based_config.h"
#include "api/video/i420_buffer.h"
#include "api/video/video_codec_constants.h"
#include "api/video/video_frame_buffer.h"
@ -251,38 +250,7 @@ SimulcastEncoderAdapter::SimulcastEncoderAdapter(
absl::Nonnull<VideoEncoderFactory*> primary_factory,
absl::Nullable<VideoEncoderFactory*> fallback_factory,
const SdpVideoFormat& format)
: SimulcastEncoderAdapter(&env,
primary_factory,
fallback_factory,
format,
env.field_trials()) {}
SimulcastEncoderAdapter::SimulcastEncoderAdapter(VideoEncoderFactory* factory,
const SdpVideoFormat& format)
: SimulcastEncoderAdapter(/*env=*/nullptr,
/*primary_factory=*/factory,
/*fallback_factory=*/nullptr,
format,
FieldTrialBasedConfig()) {}
SimulcastEncoderAdapter::SimulcastEncoderAdapter(
VideoEncoderFactory* primary_factory,
VideoEncoderFactory* fallback_factory,
const SdpVideoFormat& format,
const FieldTrialsView& field_trials)
: SimulcastEncoderAdapter(/*env=*/nullptr,
primary_factory,
fallback_factory,
format,
field_trials) {}
SimulcastEncoderAdapter::SimulcastEncoderAdapter(
absl::Nullable<const Environment*> env,
absl::Nonnull<VideoEncoderFactory*> primary_factory,
absl::Nullable<VideoEncoderFactory*> fallback_factory,
const SdpVideoFormat& format,
const FieldTrialsView& field_trials)
: env_(env != nullptr ? absl::make_optional(*env) : absl::nullopt),
: env_(env),
inited_(0),
primary_encoder_factory_(primary_factory),
fallback_encoder_factory_(fallback_factory),
@ -291,11 +259,11 @@ SimulcastEncoderAdapter::SimulcastEncoderAdapter(
bypass_mode_(false),
encoded_complete_callback_(nullptr),
experimental_boosted_screenshare_qp_(
GetScreenshareBoostedQpValue(field_trials)),
GetScreenshareBoostedQpValue(env_.field_trials())),
boost_base_layer_quality_(
RateControlSettings::ParseFromKeyValueConfig(&field_trials)
RateControlSettings::ParseFromKeyValueConfig(&env_.field_trials())
.Vp8BoostBaseLayerQuality()),
prefer_temporal_support_on_base_layer_(field_trials.IsEnabled(
prefer_temporal_support_on_base_layer_(env_.field_trials().IsEnabled(
"WebRTC-Video-PreferTemporalSupportOnBaseLayer")),
per_layer_pli_(SupportsPerLayerPictureLossIndication(format.parameters)) {
RTC_DCHECK(primary_factory);
@ -769,16 +737,11 @@ SimulcastEncoderAdapter::FetchOrCreateEncoderContext(
cached_encoder_contexts_.erase(encoder_context_iter);
} else {
std::unique_ptr<VideoEncoder> primary_encoder =
env_.has_value()
? primary_encoder_factory_->Create(*env_, video_format_)
: primary_encoder_factory_->CreateVideoEncoder(video_format_);
primary_encoder_factory_->Create(env_, video_format_);
std::unique_ptr<VideoEncoder> fallback_encoder;
if (fallback_encoder_factory_ != nullptr) {
fallback_encoder =
env_.has_value()
? fallback_encoder_factory_->Create(*env_, video_format_)
: fallback_encoder_factory_->CreateVideoEncoder(video_format_);
fallback_encoder = fallback_encoder_factory_->Create(env_, video_format_);
}
std::unique_ptr<VideoEncoder> encoder;

19
media/engine/simulcast_encoder_adapter.h
View file

@ -51,15 +51,6 @@ class RTC_EXPORT SimulcastEncoderAdapter : public VideoEncoder {
absl::Nullable<VideoEncoderFactory*> fallback_factory,
const SdpVideoFormat& format);
[[deprecated("bugs.webrtc.org/15860")]] SimulcastEncoderAdapter(
VideoEncoderFactory* primarty_factory,
const SdpVideoFormat& format);
// TODO: bugs.webrtc.org/15860 - Deprecate or delete when not used by chromium
SimulcastEncoderAdapter(VideoEncoderFactory* primary_factory,
VideoEncoderFactory* fallback_factory,
const SdpVideoFormat& format,
const FieldTrialsView& field_trials);
~SimulcastEncoderAdapter() override;
// Implements VideoEncoder.
@ -153,12 +144,6 @@ class RTC_EXPORT SimulcastEncoderAdapter : public VideoEncoder {
bool is_paused_;
};
SimulcastEncoderAdapter(absl::Nullable<const Environment*> env,
absl::Nonnull<VideoEncoderFactory*> primary_factory,
absl::Nullable<VideoEncoderFactory*> fallback_factory,
const SdpVideoFormat& format,
const FieldTrialsView& field_trials);
bool Initialized() const;
void DestroyStoredEncoders();
@ -184,9 +169,7 @@ class RTC_EXPORT SimulcastEncoderAdapter : public VideoEncoder {
void OverrideFromFieldTrial(VideoEncoder::EncoderInfo* info) const;
// TODO: bugs.webrtc.org/15860 - Make env_ non optional when deprecated
// constructors are deleted.
const absl::optional<Environment> env_;
const Environment env_;
std::atomic<int> inited_;
VideoEncoderFactory* const primary_encoder_factory_;
VideoEncoderFactory* const fallback_encoder_factory_;