Revert of Extract bitrate allocation of spatial/temporal layers out of codec impl.

webrtc/video/video_encoder.cc

 /*
  *  Copyright (c) 2015 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 49 matching lines @@
     case kVideoCodecVP9:
       return VideoEncoder::kVp9;
     default:
       return VideoEncoder::kUnsupportedCodec;
   }
 }
 
 VideoEncoderSoftwareFallbackWrapper::VideoEncoderSoftwareFallbackWrapper(
     VideoCodecType codec_type,
     webrtc::VideoEncoder* encoder)
-    : number_of_cores_(0),
-      max_payload_size_(0),
-      rates_set_(false),
-      framerate_(0),
+    : rates_set_(false),
       channel_parameters_set_(false),
-      packet_loss_(0),
-      rtt_(0),
       encoder_type_(CodecToEncoderType(codec_type)),
       encoder_(encoder),
       callback_(nullptr) {}
 
 bool VideoEncoderSoftwareFallbackWrapper::InitFallbackEncoder() {
   if (!VideoEncoder::IsSupportedSoftware(encoder_type_)) {
     LOG(LS_WARNING)
         << "Encoder requesting fallback to codec not supported in software.";
     return false;
   }
   fallback_encoder_.reset(VideoEncoder::Create(encoder_type_));
   if (fallback_encoder_->InitEncode(&codec_settings_, number_of_cores_,
                                     max_payload_size_) !=
       WEBRTC_VIDEO_CODEC_OK) {
     LOG(LS_ERROR) << "Failed to initialize software-encoder fallback.";
     fallback_encoder_->Release();
     fallback_encoder_.reset();
     return false;
   }
   // Replay callback, rates, and channel parameters.
   if (callback_)
     fallback_encoder_->RegisterEncodeCompleteCallback(callback_);
   if (rates_set_)
-    fallback_encoder_->SetRateAllocation(bitrate_allocation_, framerate_);
+    fallback_encoder_->SetRates(bitrate_, framerate_);
   if (channel_parameters_set_)
     fallback_encoder_->SetChannelParameters(packet_loss_, rtt_);
 
   fallback_implementation_name_ =
       std::string(fallback_encoder_->ImplementationName()) +
       " (fallback from: " + encoder_->ImplementationName() + ")";
   // Since we're switching to the fallback encoder, Release the real encoder. It
   // may be re-initialized via InitEncode later, and it will continue to get
   // Set calls for rates and channel parameters in the meantime.
   encoder_->Release();
@@ skipping 76 matching lines @@
     int64_t rtt) {
   channel_parameters_set_ = true;
   packet_loss_ = packet_loss;
   rtt_ = rtt;
   int32_t ret = encoder_->SetChannelParameters(packet_loss, rtt);
   if (fallback_encoder_)
     return fallback_encoder_->SetChannelParameters(packet_loss, rtt);
   return ret;
 }
 
-int32_t VideoEncoderSoftwareFallbackWrapper::SetRateAllocation(
-    const BitrateAllocation& bitrate_allocation,
-    uint32_t framerate) {
+int32_t VideoEncoderSoftwareFallbackWrapper::SetRates(uint32_t bitrate,
+                                                      uint32_t framerate) {
   rates_set_ = true;
-  bitrate_allocation_ = bitrate_allocation;
+  bitrate_ = bitrate;
   framerate_ = framerate;
-  int32_t ret = encoder_->SetRateAllocation(bitrate_allocation_, framerate);
+  int32_t ret = encoder_->SetRates(bitrate, framerate);
   if (fallback_encoder_)
-    return fallback_encoder_->SetRateAllocation(bitrate_allocation_, framerate);
+    return fallback_encoder_->SetRates(bitrate, framerate);
   return ret;
 }
 
 void VideoEncoderSoftwareFallbackWrapper::OnDroppedFrame() {
   if (fallback_encoder_)
     return fallback_encoder_->OnDroppedFrame();
   return encoder_->OnDroppedFrame();
 }
 
 bool VideoEncoderSoftwareFallbackWrapper::SupportsNativeHandle() const {
   if (fallback_encoder_)
     return fallback_encoder_->SupportsNativeHandle();
   return encoder_->SupportsNativeHandle();
 }
 
 }  // namespace webrtc