Move usage of QualityScaler to ViEEncoder.

webrtc/video/vie_encoder.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 345 matching lines @@
                        const VideoSendStream::Config::EncoderSettings& settings,
                        rtc::VideoSinkInterface<VideoFrame>* pre_encode_callback,
                        EncodedFrameObserver* encoder_timing)
     : shutdown_event_(true /* manual_reset */, false),
       number_of_cores_(number_of_cores),
       source_proxy_(new VideoSourceProxy(this)),
       sink_(nullptr),
       settings_(settings),
       codec_type_(PayloadNameToCodecType(settings.payload_name)),
       video_sender_(Clock::GetRealTimeClock(), this, this),
-      disable_resolution_scaling_(false),
+      disable_cpu_adaptation_(false),
+      disable_quality_scaling_(true),
       overuse_detector_(Clock::GetRealTimeClock(),
                         GetCpuOveruseOptions(settings.full_overuse_time),
                         this,
                         encoder_timing,
                         stats_proxy),
       stats_proxy_(stats_proxy),
       pre_encode_callback_(pre_encode_callback),
       module_process_thread_(nullptr),
       pending_encoder_reconfiguration_(false),
       encoder_start_bitrate_bps_(0),
@@ skipping 30 matching lines @@
 }
 
 void ViEEncoder::Stop() {
   RTC_DCHECK_RUN_ON(&thread_checker_);
   source_proxy_->SetSource(nullptr, false);
   encoder_queue_.PostTask([this] {
     RTC_DCHECK_RUN_ON(&encoder_queue_);
     video_sender_.RegisterExternalEncoder(nullptr, settings_.payload_type,
                                           false);
     overuse_detector_.StopCheckForOveruse();
+    if (!disable_quality_scaling_)
+      quality_scaler_.Stop();
     shutdown_event_.Set();
   });
 
   shutdown_event_.Wait(rtc::Event::kForever);
 }
 
 void ViEEncoder::RegisterProcessThread(ProcessThread* module_process_thread) {
   RTC_DCHECK_RUN_ON(&thread_checker_);
   RTC_DCHECK(!module_process_thread_);
   module_process_thread_ = module_process_thread;
   module_process_thread_->RegisterModule(&video_sender_);
   module_process_thread_checker_.DetachFromThread();
 }
 
 void ViEEncoder::DeRegisterProcessThread() {
   RTC_DCHECK_RUN_ON(&thread_checker_);
   module_process_thread_->DeRegisterModule(&video_sender_);
 }
 
 void ViEEncoder::SetSource(rtc::VideoSourceInterface<VideoFrame>* source,
                            bool disable_resolution_scaling) {
   RTC_DCHECK_RUN_ON(&thread_checker_);
   source_proxy_->SetSource(source, disable_resolution_scaling);
   encoder_queue_.PostTask([this, disable_resolution_scaling] {
     RTC_DCHECK_RUN_ON(&encoder_queue_);
-    if (disable_resolution_scaling_ != disable_resolution_scaling) {
+    if (disable_cpu_adaptation_ != disable_resolution_scaling) {
       stats_proxy_->SetCpuRestrictedResolution(!disable_resolution_scaling &&
                                                cpu_restricted_counter_ != 0);
     }
-    disable_resolution_scaling_ = disable_resolution_scaling;
+    disable_cpu_adaptation_ = disable_resolution_scaling;
   });
 }
 
 void ViEEncoder::SetSink(EncoderSink* sink, bool rotation_applied) {
   source_proxy_->SetWantsRotationApplied(rotation_applied);
   encoder_queue_.PostTask([this, sink, rotation_applied] {
     RTC_DCHECK_RUN_ON(&encoder_queue_);
     sink_ = sink;
   });
 }
@@ skipping 65 matching lines @@
                                         rate_allocator_->GetPreferedBitrate());
   }
 
   pending_encoder_reconfiguration_ = false;
   if (stats_proxy_) {
     stats_proxy_->OnEncoderReconfigured(encoder_config_,
                                         rate_allocator_->GetPreferedBitrate());
   }
   sink_->OnEncoderConfigurationChanged(
       std::move(streams), encoder_config_.min_transmit_bitrate_bps);
+
+  const auto scaling_settings = settings_.encoder->GetQPThresholds();
+  LOG(LS_INFO) << settings_.encoder->ImplementationName();
+  disable_quality_scaling_ = !scaling_settings.enabled;
+  if (!disable_quality_scaling_) {
+    LOG(LS_INFO) << "Initializing quality scaler.";
+    if (scaling_settings.thresholds) {
+      const auto thresholds = *scaling_settings.thresholds;
+      quality_scaler_.Init(this, thresholds.first, thresholds.second);
+    } else {
+      quality_scaler_.Init(this, codec_type_);
+    }
+  }
 }
 
 void ViEEncoder::OnFrame(const VideoFrame& video_frame) {
   RTC_DCHECK_RUNS_SERIALIZED(&incoming_frame_race_checker_);
   VideoFrame incoming_frame = video_frame;
 
   // Local time in webrtc time base.
   int64_t current_time = clock_->TimeInMilliseconds();
   incoming_frame.set_render_time_ms(current_time);
 
@@ skipping 139 matching lines @@
   // running in parallel on different threads.
   if (stats_proxy_) {
     stats_proxy_->OnSendEncodedImage(encoded_image, codec_specific_info);
   }
 
   EncodedImageCallback::Result result =
       sink_->OnEncodedImage(encoded_image, codec_specific_info, fragmentation);
 
   int64_t time_sent = clock_->TimeInMilliseconds();
   uint32_t timestamp = encoded_image._timeStamp;
-  encoder_queue_.PostTask([this, timestamp, time_sent] {
+  encoder_queue_.PostTask([this, timestamp, time_sent, encoded_image] {
     RTC_DCHECK_RUN_ON(&encoder_queue_);
     overuse_detector_.FrameSent(timestamp, time_sent);
+    if (!disable_quality_scaling_)
+      quality_scaler_.ReportQP(encoded_image.qp_);
   });
   return result;
 }
 
 void ViEEncoder::SendStatistics(uint32_t bit_rate, uint32_t frame_rate) {
   RTC_DCHECK(module_process_thread_checker_.CalledOnValidThread());
   if (stats_proxy_)
     stats_proxy_->OnEncoderStatsUpdate(frame_rate, bit_rate);
 }
 
@@ skipping 56 matching lines @@
       video_is_suspended != (last_observed_bitrate_bps_ == 0);
   last_observed_bitrate_bps_ = bitrate_bps;
 
   if (stats_proxy_ && video_suspension_changed) {
     LOG(LS_INFO) << "Video suspend state changed to: "
                  << (video_is_suspended ? "suspended" : "not suspended");
     stats_proxy_->OnSuspendChange(video_is_suspended);
   }
 }
 
-void ViEEncoder::OveruseDetected() {
+void ViEEncoder::ScaleDown() {
   RTC_DCHECK_RUN_ON(&encoder_queue_);
 
-  if (disable_resolution_scaling_)
+  if (disable_cpu_adaptation_)
     return;
 
   if (cpu_restricted_counter_ >= kMaxCpuDowngrades) {
     return;
   }
   // Request lower resolution if the current resolution is lower than last time
   // we asked for the resolution to be lowered.
   // Update stats accordingly.
   int current_pixel_count = last_frame_height_ * last_frame_width_;
   if (current_pixel_count <
       max_pixel_count_.value_or(current_pixel_count + 1)) {
     max_pixel_count_ = rtc::Optional<int>(current_pixel_count);
     max_pixel_count_step_up_ = rtc::Optional<int>();
     stats_proxy_->OnCpuRestrictedResolutionChanged(true);
     ++cpu_restricted_counter_;
     source_proxy_->RequestResolutionLowerThan(current_pixel_count);
   }
 }
 
-void ViEEncoder::NormalUsage() {
+void ViEEncoder::ScaleUp() {
   RTC_DCHECK_RUN_ON(&encoder_queue_);
-  if (disable_resolution_scaling_)
+  if (disable_cpu_adaptation_)
     return;
 
   int current_pixel_count = last_frame_height_ * last_frame_width_;
   // Request higher resolution if we are cpu restricted and the the current
   // resolution is higher than last time we requested higher resolution.
   // Update stats accordingly.
   if (cpu_restricted_counter_ > 0 &&
       current_pixel_count > max_pixel_count_step_up_.value_or(0)) {
     max_pixel_count_ = rtc::Optional<int>();
     max_pixel_count_step_up_ = rtc::Optional<int>(current_pixel_count);
     --cpu_restricted_counter_;
     stats_proxy_->OnCpuRestrictedResolutionChanged(cpu_restricted_counter_ > 0);
     source_proxy_->RequestHigherResolutionThan(current_pixel_count);
   }
 }
 
 }  // namespace webrtc