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

webrtc/media/engine/fakewebrtcvideoengine.h

 /*
  *  Copyright (c) 2010 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 114 matching lines @@
   int num_created_decoders_;
   std::vector<VideoDecoderParams> params_;
 };
 
 // Fake class for mocking out webrtc::VideoEnoder
 class FakeWebRtcVideoEncoder : public webrtc::VideoEncoder {
  public:
   FakeWebRtcVideoEncoder()
       : init_encode_event_(false, false), num_frames_encoded_(0) {}
 
-  int32_t InitEncode(const webrtc::VideoCodec* codecSettings,
-                     int32_t numberOfCores,
-                     size_t maxPayloadSize) override {
+  virtual int32_t InitEncode(const webrtc::VideoCodec* codecSettings,
+                             int32_t numberOfCores,
+                             size_t maxPayloadSize) {
     rtc::CritScope lock(&crit_);
     codec_settings_ = *codecSettings;
     init_encode_event_.Set();
     return WEBRTC_VIDEO_CODEC_OK;
   }
 
   bool WaitForInitEncode() { return init_encode_event_.Wait(kEventTimeoutMs); }
 
   webrtc::VideoCodec GetCodecSettings() {
     rtc::CritScope lock(&crit_);
     return codec_settings_;
   }
 
-  int32_t Encode(const webrtc::VideoFrame& inputImage,
-                 const webrtc::CodecSpecificInfo* codecSpecificInfo,
-                 const std::vector<webrtc::FrameType>* frame_types) override {
+  virtual int32_t Encode(const webrtc::VideoFrame& inputImage,
+                         const webrtc::CodecSpecificInfo* codecSpecificInfo,
+                         const std::vector<webrtc::FrameType>* frame_types) {
     rtc::CritScope lock(&crit_);
     ++num_frames_encoded_;
     init_encode_event_.Set();
     return WEBRTC_VIDEO_CODEC_OK;
   }
 
-  int32_t RegisterEncodeCompleteCallback(
-      webrtc::EncodedImageCallback* callback) override {
+  virtual int32_t RegisterEncodeCompleteCallback(
+      webrtc::EncodedImageCallback* callback) {
     return WEBRTC_VIDEO_CODEC_OK;
   }
 
-  int32_t Release() override { return WEBRTC_VIDEO_CODEC_OK; }
+  virtual int32_t Release() { return WEBRTC_VIDEO_CODEC_OK; }
 
-  int32_t SetChannelParameters(uint32_t packetLoss, int64_t rtt) override {
+  virtual int32_t SetChannelParameters(uint32_t packetLoss, int64_t rtt) {
     return WEBRTC_VIDEO_CODEC_OK;
   }
 
-  int32_t SetRateAllocation(const webrtc::BitrateAllocation& allocation,
-                            uint32_t framerate) override {
+  virtual int32_t SetRates(uint32_t newBitRate, uint32_t frameRate) {
     return WEBRTC_VIDEO_CODEC_OK;
   }
 
   int GetNumEncodedFrames() {
     rtc::CritScope lock(&crit_);
     return num_frames_encoded_;
   }
 
  private:
   rtc::CriticalSection crit_;
@@ skipping 74 matching lines @@
   rtc::Event created_video_encoder_event_;
   std::vector<cricket::VideoCodec> codecs_;
   std::vector<FakeWebRtcVideoEncoder*> encoders_ GUARDED_BY(crit_);
   int num_created_encoders_ GUARDED_BY(crit_);
   bool encoders_have_internal_sources_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_