Move reencode logic for screenshare bitrate overshoot from generic

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 339e1b516f7618531ae2970ddb90710abf75bed4..142c885901768489c47277315e832c21cabe45c1 100644
--- a/webrtc/modules/video_coding/generic_encoder.cc
+++ b/webrtc/modules/video_coding/generic_encoder.cc
@@ -33,7 +33,6 @@ VCMGenericEncoder::VCMGenericEncoder(
       vcm_encoded_frame_callback_(encoded_frame_callback),
       internal_source_(internal_source),
       encoder_params_({BitrateAllocation(), 0, 0, 0}),
-      is_screenshare_(false),
       streams_or_svc_num_(0) {}
 
 VCMGenericEncoder::~VCMGenericEncoder() {}
@@ -49,7 +48,6 @@ int32_t VCMGenericEncoder::InitEncode(const VideoCodec* settings,
                                       size_t max_payload_size) {
   RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
   TRACE_EVENT0("webrtc", "VCMGenericEncoder::InitEncode");
-  is_screenshare_ = settings->mode == VideoCodecMode::kScreensharing;
   streams_or_svc_num_ = settings->numberOfSimulcastStreams;
   if (settings->codecType == kVideoCodecVP9) {
     streams_or_svc_num_ = settings->VP9().numberOfSpatialLayers;
@@ -83,15 +81,8 @@ int32_t VCMGenericEncoder::Encode(const VideoFrame& frame,
 
   for (size_t i = 0; i < streams_or_svc_num_; ++i)
     vcm_encoded_frame_callback_->OnEncodeStarted(frame.render_time_ms(), i);
-  int32_t result = encoder_->Encode(frame, codec_specific, &frame_types);
 
-  if (is_screenshare_ &&
-      result == WEBRTC_VIDEO_CODEC_TARGET_BITRATE_OVERSHOOT) {
-    // Target bitrate exceeded, encoder state has been reset - try again.
-    return encoder_->Encode(frame, codec_specific, &frame_types);
-  }
-
-  return result;
+  return encoder_->Encode(frame, codec_specific, &frame_types);
 }
 
 void VCMGenericEncoder::SetEncoderParameters(const EncoderParameters& params) {