From e67c6bcd06a9164bd89c320f00dc70c94cefb152 Mon Sep 17 00:00:00 2001 From: Evan Shrubsole Date: Tue, 11 Feb 2020 10:28:51 +0100 Subject: [PATCH] Remove unused fields and includes from VideoStreamEncoder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:11222 Change-Id: Iec496d0955c1a30c61da147f0407fd76534129b7 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168184 Commit-Queue: Evan Shrubsole Reviewed-by: Henrik Boström Reviewed-by: Erik Språng Cr-Commit-Position: refs/heads/master@{#30496} --- video/video_stream_encoder.cc | 2 -- video/video_stream_encoder.h | 4 ---- 2 files changed, 6 deletions(-) diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc index f42423dd0d..3910df90a0 100644 --- a/video/video_stream_encoder.cc +++ b/video/video_stream_encoder.cc @@ -31,7 +31,6 @@ #include "rtc_base/arraysize.h" #include "rtc_base/checks.h" #include "rtc_base/experiments/alr_experiment.h" -#include "rtc_base/experiments/quality_scaling_experiment.h" #include "rtc_base/experiments/rate_control_settings.h" #include "rtc_base/location.h" #include "rtc_base/logging.h" @@ -253,7 +252,6 @@ VideoStreamEncoder::VideoStreamEncoder( sink_(nullptr), settings_(settings), rate_control_settings_(RateControlSettings::ParseFromFieldTrials()), - quality_scaler_settings_(QualityScalerSettings::ParseFromFieldTrials()), encoder_selector_(settings.encoder_factory->GetEncoderSelector()), encoder_stats_observer_(encoder_stats_observer), encoder_initialized_(false), diff --git a/video/video_stream_encoder.h b/video/video_stream_encoder.h index f8902dfb73..3f1a7fd4f7 100644 --- a/video/video_stream_encoder.h +++ b/video/video_stream_encoder.h @@ -29,11 +29,8 @@ #include "call/adaptation/resource_adaptation_module_interface.h" #include "call/adaptation/video_source_restrictions.h" #include "modules/video_coding/utility/frame_dropper.h" -#include "modules/video_coding/utility/quality_scaler.h" #include "rtc_base/critical_section.h" #include "rtc_base/event.h" -#include "rtc_base/experiments/quality_rampup_experiment.h" -#include "rtc_base/experiments/quality_scaler_settings.h" #include "rtc_base/experiments/rate_control_settings.h" #include "rtc_base/numerics/exp_filter.h" #include "rtc_base/race_checker.h" @@ -221,7 +218,6 @@ class VideoStreamEncoder : public VideoStreamEncoderInterface, EncoderSink* sink_; const VideoStreamEncoderSettings settings_; const RateControlSettings rate_control_settings_; - const QualityScalerSettings quality_scaler_settings_; std::unique_ptr const encoder_selector_;