delete redundant members in 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 252 matching lines @@
       max_data_payload_length_(0),
       nack_enabled_(false),
       last_observed_bitrate_bps_(0),
       encoder_paused_and_dropped_frame_(false),
       has_received_sli_(false),
       picture_id_sli_(0),
       has_received_rpsi_(false),
       picture_id_rpsi_(0),
       clock_(Clock::GetRealTimeClock()),
       scale_counter_(kScaleReasonSize, 0),
-      last_frame_width_(0),
-      last_frame_height_(0),
       last_captured_timestamp_(0),
       delta_ntp_internal_ms_(clock_->CurrentNtpInMilliseconds() -
                              clock_->TimeInMilliseconds()),
       last_frame_log_ms_(clock_->TimeInMilliseconds()),
       captured_frame_count_(0),
       dropped_frame_count_(0),
       bitrate_observer_(nullptr),
       encoder_queue_("EncoderQueue") {
   encoder_queue_.PostTask([this] {
     RTC_DCHECK_RUN_ON(&encoder_queue_);
@@ skipping 265 matching lines @@
   if (pending_encoder_reconfiguration_) {
     ReconfigureEncoder();
   }
 
   if (EncoderPaused()) {
     TraceFrameDropStart();
     return;
   }
   TraceFrameDropEnd();
 
-  last_frame_height_ = video_frame.height();
-  last_frame_width_ = video_frame.width();
-
   TRACE_EVENT_ASYNC_STEP0("webrtc", "Video", video_frame.render_time_ms(),
                           "Encode");
 
   overuse_detector_.FrameCaptured(video_frame, time_when_posted_in_ms);
 
   if (codec_type_ == webrtc::kVideoCodecVP8) {
     webrtc::CodecSpecificInfo codec_specific_info;
     codec_specific_info.codecType = webrtc::kVideoCodecVP8;
 
     codec_specific_info.codecSpecific.VP8.hasReceivedRPSI = has_received_rpsi_;
@@ skipping 123 matching lines @@
     stats_proxy_->OnSuspendChange(video_is_suspended);
   }
 }
 
 void ViEEncoder::ScaleDown(ScaleReason reason) {
   RTC_DCHECK_RUN_ON(&encoder_queue_);
   if (!scaling_enabled_)
     return;
   // Request lower resolution if the current resolution is lower than last time
   // we asked for the resolution to be lowered.
-  int current_pixel_count = last_frame_height_ * last_frame_width_;
+  int current_pixel_count =
+      last_frame_info_ ? last_frame_info_->pixel_count() : 0;
   if (max_pixel_count_ && current_pixel_count >= *max_pixel_count_)
     return;
   switch (reason) {
     case kQuality:
       stats_proxy_->OnQualityRestrictedResolutionChanged(
           scale_counter_[reason] + 1);
       break;
     case kCpu:
       if (scale_counter_[reason] >= kMaxCpuDowngrades)
         return;
       // Update stats accordingly.
       stats_proxy_->OnCpuRestrictedResolutionChanged(true);
       break;
   }
   max_pixel_count_ = rtc::Optional<int>(current_pixel_count);
   max_pixel_count_step_up_ = rtc::Optional<int>();
   ++scale_counter_[reason];
   source_proxy_->RequestResolutionLowerThan(current_pixel_count);
   LOG(LS_INFO) << "Scaling down resolution.";
   for (size_t i = 0; i < kScaleReasonSize; ++i) {
     LOG(LS_INFO) << "Scaled " << scale_counter_[i]
-                 << " times for reason: " << (i ? "quality" : "cpu");
+                 << " times for reason: " << (i ? "cpu" : "quality");
   }
 }
 
 void ViEEncoder::ScaleUp(ScaleReason reason) {
   RTC_DCHECK_RUN_ON(&encoder_queue_);
   if (scale_counter_[reason] == 0 || !scaling_enabled_)
     return;
   // Only scale if resolution is higher than last time
   // we requested higher resolution.
-  int current_pixel_count = last_frame_height_ * last_frame_width_;
+  int current_pixel_count =
+      last_frame_info_ ? last_frame_info_->pixel_count() : 0;
   if (current_pixel_count <= max_pixel_count_step_up_.value_or(0))
     return;
   switch (reason) {
     case kQuality:
       stats_proxy_->OnQualityRestrictedResolutionChanged(
           scale_counter_[reason] - 1);
       break;
     case kCpu:
       // Update stats accordingly.
       stats_proxy_->OnCpuRestrictedResolutionChanged(scale_counter_[reason] >
                                                      1);
       break;
   }
   max_pixel_count_ = rtc::Optional<int>();
   max_pixel_count_step_up_ = rtc::Optional<int>(current_pixel_count);
   --scale_counter_[reason];
   source_proxy_->RequestHigherResolutionThan(current_pixel_count);
   LOG(LS_INFO) << "Scaling up resolution.";
   for (size_t i = 0; i < kScaleReasonSize; ++i) {
     LOG(LS_INFO) << "Scaled " << scale_counter_[i]
                  << " times for reason: " << (i ? "cpu" : "quality");
   }
 }
 
 }  // namespace webrtc