Remove redudant encoder rate calls.

webrtc/modules/video_coding/main/source/video_sender.cc

 /*
  *  Copyright (c) 2013 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 22 matching lines @@
       _encoder(nullptr),
       _encodedFrameCallback(post_encode_callback),
       _nextFrameTypes(1, kVideoFrameDelta),
       _mediaOpt(clock_),
       _sendStatsCallback(nullptr),
       _codecDataBase(encoder_rate_observer),
       frame_dropper_enabled_(true),
       _sendStatsTimer(1000, clock_),
       current_codec_(),
       qm_settings_callback_(qm_settings_callback),
-      protection_callback_(nullptr) {
-  encoder_params_ = {0, 0, 0, 0, false};
+      protection_callback_(nullptr),
+      encoder_params_({0, 0, 0, 0}) {
   // Allow VideoSender to be created on one thread but used on another, post
   // construction. This is currently how this class is being used by at least
   // one external project (diffractor).
   _mediaOpt.EnableQM(qm_settings_callback_ != nullptr);
   _mediaOpt.Reset();
   main_thread_.DetachFromThread();
 }
 
 VideoSender::~VideoSender() {}
 
 int32_t VideoSender::Process() {
   int32_t returnValue = VCM_OK;
 
   if (_sendStatsTimer.TimeUntilProcess() == 0) {
     _sendStatsTimer.Processed();
     CriticalSectionScoped cs(process_crit_sect_.get());
     if (_sendStatsCallback != nullptr) {
       uint32_t bitRate = _mediaOpt.SentBitRate();
       uint32_t frameRate = _mediaOpt.SentFrameRate();
       _sendStatsCallback->SendStatistics(bitRate, frameRate);
     }
   }
 
   {
     rtc::CritScope cs(&params_lock_);
     // Force an encoder parameters update, so that incoming frame rate is
     // updated even if bandwidth hasn't changed.
     encoder_params_.input_frame_rate = _mediaOpt.InputFrameRate();
-    encoder_params_.updated = true;
   }
 
   return returnValue;
 }
 
 int64_t VideoSender::TimeUntilNextProcess() {
   return _sendStatsTimer.TimeUntilProcess();
 }
 
 // Register the send codec to be used.
@@ skipping 89 matching lines @@
       // Make sure the VCM doesn't use the de-registered codec
       _encoder = nullptr;
     }
     return ret ? 0 : -1;
   }
   _codecDataBase.RegisterExternalEncoder(
       externalEncoder, payloadType, internalSource);
   return 0;
 }
 
-// Get codec config parameters
-int32_t VideoSender::CodecConfigParameters(uint8_t* buffer,
-                                           int32_t size) const {
-  rtc::CritScope lock(&send_crit_);
-  if (_encoder != nullptr) {
-    return _encoder->CodecConfigParameters(buffer, size);
-  }
-  return VCM_UNINITIALIZED;
-}
-
 // Get encode bitrate
 int VideoSender::Bitrate(unsigned int* bitrate) const {
   RTC_DCHECK(main_thread_.CalledOnValidThread());
   // Since we're running on the thread that's the only thread known to modify
   // the value of _encoder, we don't need to grab the lock here.
 
-  // return the bit rate which the encoder is set to
-  if (!_encoder) {
+  if (!_encoder)
     return VCM_UNINITIALIZED;
-  }
-  *bitrate = _encoder->BitRate();
+  *bitrate = _encoder->GetEncoderParameters().target_bitrate;
   return 0;
 }
 
 // Get encode frame rate
 int VideoSender::FrameRate(unsigned int* framerate) const {
   RTC_DCHECK(main_thread_.CalledOnValidThread());
   // Since we're running on the thread that's the only thread known to modify
   // the value of _encoder, we don't need to grab the lock here.
 
-  // input frame rate, not compensated
-  if (!_encoder) {
+  if (!_encoder)
     return VCM_UNINITIALIZED;
-  }
-  *framerate = _encoder->FrameRate();
+
+  *framerate = _encoder->GetEncoderParameters().input_frame_rate;
   return 0;
 }
 
 int32_t VideoSender::SetChannelParameters(uint32_t target_bitrate,
                                           uint8_t lossRate,
                                           int64_t rtt) {
   uint32_t target_rate =
       _mediaOpt.SetTargetRates(target_bitrate, lossRate, rtt,
                                protection_callback_, qm_settings_callback_);
 
   uint32_t input_frame_rate = _mediaOpt.InputFrameRate();
 
   rtc::CritScope cs(&params_lock_);
-  encoder_params_ =
-      EncoderParameters{target_rate, lossRate, rtt, input_frame_rate, true};
+  encoder_params_ = {target_rate, lossRate, rtt, input_frame_rate};
 
   return VCM_OK;
 }
 
 void VideoSender::SetEncoderParameters(EncoderParameters params) {
-  if (!params.updated || params.target_bitrate == 0)
+  if (params.target_bitrate == 0)
     return;
 
   if (params.input_frame_rate == 0) {
     // No frame rate estimate available, use default.
     params.input_frame_rate = current_codec_.maxFramerate;
   }
-  if (_encoder != nullptr) {
-    _encoder->SetChannelParameters(params.loss_rate, params.rtt);
-    _encoder->SetRates(params.target_bitrate, params.input_frame_rate);
-  }
-  return;
+  if (_encoder != nullptr)
+    _encoder->SetEncoderParameters(params);
 }
 
 int32_t VideoSender::RegisterTransportCallback(
     VCMPacketizationCallback* transport) {
   rtc::CritScope lock(&send_crit_);
   _encodedFrameCallback.SetMediaOpt(&_mediaOpt);
   _encodedFrameCallback.SetTransportCallback(transport);
   return VCM_OK;
 }
 
@@ skipping 37 matching lines @@
   }
 }
 // Add one raw video frame to the encoder, blocking.
 int32_t VideoSender::AddVideoFrame(const VideoFrame& videoFrame,
                                    const VideoContentMetrics* contentMetrics,
                                    const CodecSpecificInfo* codecSpecificInfo) {
   EncoderParameters encoder_params;
   {
     rtc::CritScope lock(&params_lock_);
     encoder_params = encoder_params_;
-    encoder_params_.updated = false;
   }
   rtc::CritScope lock(&send_crit_);
+  if (_encoder == nullptr)
+    return VCM_UNINITIALIZED;
   SetEncoderParameters(encoder_params);
-  if (_encoder == nullptr) {
-    return VCM_UNINITIALIZED;
-  }
   // TODO(holmer): Add support for dropping frames per stream. Currently we
   // only have one frame dropper for all streams.
   if (_nextFrameTypes[0] == kEmptyFrame) {
     return VCM_OK;
   }
   if (_mediaOpt.DropFrame()) {
     _encoder->OnDroppedFrame();
     return VCM_OK;
   }
   _mediaOpt.UpdateContentData(contentMetrics);
@@ skipping 63 matching lines @@
   int window_bps = std::max(threshold_bps / 10, 10000);
   _mediaOpt.SuspendBelowMinBitrate(threshold_bps, window_bps);
 }
 
 bool VideoSender::VideoSuspended() const {
   rtc::CritScope lock(&send_crit_);
   return _mediaOpt.IsVideoSuspended();
 }
 }  // namespace vcm
 }  // namespace webrtc