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

webrtc/modules/video_coding/generic_encoder.cc

Index: webrtc/modules/video_coding/generic_encoder.cc
diff --git a/webrtc/modules/video_coding/generic_encoder.cc b/webrtc/modules/video_coding/generic_encoder.cc
index acef556b2425d4429b22eb73d5b77dd25f211eab..80e48d19117594dc5b3447ebc6c096d5797faa5d 100644
--- a/webrtc/modules/video_coding/generic_encoder.cc
+++ b/webrtc/modules/video_coding/generic_encoder.cc
@@ -28,7 +28,7 @@ VCMGenericEncoder::VCMGenericEncoder(
     : 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() {}
@@ -90,11 +90,23 @@ void VCMGenericEncoder::SetEncoderParameters(const EncoderParameters& params) {
         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;
+    }
   }
 }