Reland #2 of Issue 2434073003: Extract bitrate allocation ...

webrtc/modules/video_coding/generic_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 10 matching lines @@
 
 namespace webrtc {
 
 VCMGenericEncoder::VCMGenericEncoder(
     VideoEncoder* encoder,
     VCMEncodedFrameCallback* encoded_frame_callback,
     bool internal_source)
     : encoder_(encoder),
       vcm_encoded_frame_callback_(encoded_frame_callback),
       internal_source_(internal_source),
-      encoder_params_({0, 0, 0, 0}),
+      encoder_params_({BitrateAllocation(), 0, 0, 0}),
       is_screenshare_(false) {}
 
 VCMGenericEncoder::~VCMGenericEncoder() {}
 
 int32_t VCMGenericEncoder::Release() {
   RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
   TRACE_EVENT0("webrtc", "VCMGenericEncoder::Release");
   return encoder_->Release();
 }
 
@@ skipping 41 matching lines @@
   {
     rtc::CritScope lock(&params_lock_);
     channel_parameters_have_changed =
         params.loss_rate != encoder_params_.loss_rate ||
         params.rtt != encoder_params_.rtt;
     rates_have_changed =
         params.target_bitrate != encoder_params_.target_bitrate ||
         params.input_frame_rate != encoder_params_.input_frame_rate;
     encoder_params_ = params;
   }
-  if (channel_parameters_have_changed)
-    encoder_->SetChannelParameters(params.loss_rate, params.rtt);
+  if (channel_parameters_have_changed) {
+    int res = encoder_->SetChannelParameters(params.loss_rate, params.rtt);
+    if (res != 0) {
+      LOG(LS_WARNING) << "Error set encoder parameters (loss = "
+                      << params.loss_rate << ", rtt = " << params.rtt
+                      << "): " << res;
+    }
+  }
   if (rates_have_changed) {
-    uint32_t target_bitrate_kbps = (params.target_bitrate + 500) / 1000;
-    encoder_->SetRates(target_bitrate_kbps, params.input_frame_rate);
+    int res = encoder_->SetRateAllocation(params.target_bitrate,
+                                          params.input_frame_rate);
+    if (res != 0) {
+      LOG(LS_WARNING) << "Error set encoder rate (total bitrate bps = "
+                      << params.target_bitrate.get_sum_bps()
+                      << ", framerate = " << params.input_frame_rate
+                      << "): " << res;
+    }
   }
 }
 
 EncoderParameters VCMGenericEncoder::GetEncoderParameters() const {
   rtc::CritScope lock(&params_lock_);
   return encoder_params_;
 }
 
 int32_t VCMGenericEncoder::SetPeriodicKeyFrames(bool enable) {
   RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
@@ skipping 45 matching lines @@
     media_opt_->UpdateWithEncodedData(encoded_image);
     if (internal_source_) {
       // Signal to encoder to drop next frame.
       result.drop_next_frame = media_opt_->DropFrame();
     }
   }
   return result;
 }
 
 }  // namespace webrtc