Revert of Issue 2434073003: Extract bitrate allocation ...

webrtc/modules/video_coding/utility/simulcast_rate_allocator.h

Index: webrtc/modules/video_coding/utility/simulcast_rate_allocator.h
diff --git a/webrtc/modules/video_coding/utility/simulcast_rate_allocator.h b/webrtc/modules/video_coding/utility/simulcast_rate_allocator.h
index 149e86658813a95bba43344f01bdc152244b41d6..e7ee772b3c49613eabad795cf2addb1bb2fe9b31 100644
--- a/webrtc/modules/video_coding/utility/simulcast_rate_allocator.h
+++ b/webrtc/modules/video_coding/utility/simulcast_rate_allocator.h
@@ -11,36 +11,24 @@
 #ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_SIMULCAST_RATE_ALLOCATOR_H_
 #define WEBRTC_MODULES_VIDEO_CODING_UTILITY_SIMULCAST_RATE_ALLOCATOR_H_
 
-#include <map>
-#include <memory>
+#include <vector>
 
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/common_video/include/video_bitrate_allocator.h"
-#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
 #include "webrtc/video_encoder.h"
 
 namespace webrtc {
 
-class SimulcastRateAllocator : public VideoBitrateAllocator,
-                               public TemporalLayersListener {
+class SimulcastRateAllocator {
  public:
-  explicit SimulcastRateAllocator(
-      const VideoCodec& codec,
-      std::unique_ptr<TemporalLayersFactory> tl_factory);
+  explicit SimulcastRateAllocator(const VideoCodec& codec);
 
-  void OnTemporalLayersCreated(int simulcast_id,
-                               TemporalLayers* layers) override;
-
-  BitrateAllocation GetAllocation(uint32_t total_bitrate_bps,
-                                  uint32_t framerate) override;
-  uint32_t GetPreferredBitrateBps(uint32_t framerate) override;
+  std::vector<uint32_t> GetAllocation(uint32_t bitrate_kbps) const;
+  uint32_t GetPreferedBitrate() const;
   const VideoCodec& GetCodec() const;
 
  private:
   const VideoCodec codec_;
-  std::map<uint32_t, TemporalLayers*> temporal_layers_;
-  std::unique_ptr<TemporalLayersFactory> tl_factory_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(SimulcastRateAllocator);
 };