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

webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc

Index: webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
diff --git a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
index e6316d6af91084f9cf92fb26dde7289fd37e1eb5..639305b41dba9594068be84f6b6baca8239b4806 100644
--- a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
+++ b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
@@ -61,8 +61,9 @@ class ScreenshareLayerTest : public ::testing::Test {
     memset(&vpx_cfg, 0, sizeof(vpx_codec_enc_cfg_t));
     vpx_cfg.rc_min_quantizer = min_qp_;
     vpx_cfg.rc_max_quantizer = max_qp_;
-    EXPECT_TRUE(layers_->ConfigureBitrates(
-        kDefaultTl0BitrateKbps, kDefaultTl1BitrateKbps, kFrameRate, &vpx_cfg));
+    layers_->OnRatesUpdated(kDefaultTl0BitrateKbps, kDefaultTl1BitrateKbps,

[stefan-webrtc, 2016/11/02 10:26:35]

Should you expect something on the allocation returned?

[sprang_webrtc, 2016/11/02 13:28:32]

Done.

+                            kFrameRate);
+    layers_->UpdateConfiguration(&vpx_cfg);

[stefan-webrtc, 2016/11/02 10:26:35]

EXPECT_TRUE?

[sprang_webrtc, 2016/11/02 13:28:32]

Done.

     frame_size_ = ((vpx_cfg.rc_target_bitrate * 1000) / 8) / kFrameRate;
   }
 
@@ -373,7 +374,8 @@ TEST_F(ScreenshareLayerTest, TooHighBitrate) {
 
 TEST_F(ScreenshareLayerTest, TargetBitrateCappedByTL0) {
   vpx_codec_enc_cfg_t cfg = GetConfig();
-  layers_->ConfigureBitrates(100, 1000, 5, &cfg);
+  layers_->OnRatesUpdated(100, 1000, 5);

[stefan-webrtc, 2016/11/02 10:26:35]

Same for these

[sprang_webrtc, 2016/11/02 13:28:33]

Done.

+  layers_->UpdateConfiguration(&cfg);
 
   EXPECT_EQ(static_cast<unsigned int>(
                 ScreenshareLayers::kMaxTL0FpsReduction * 100 + 0.5),
@@ -382,7 +384,8 @@ TEST_F(ScreenshareLayerTest, TargetBitrateCappedByTL0) {
 
 TEST_F(ScreenshareLayerTest, TargetBitrateCappedByTL1) {
   vpx_codec_enc_cfg_t cfg = GetConfig();
-  layers_->ConfigureBitrates(100, 450, 5, &cfg);
+  layers_->OnRatesUpdated(100, 450, 5);
+  layers_->UpdateConfiguration(&cfg);
 
   EXPECT_EQ(static_cast<unsigned int>(
                 450 / ScreenshareLayers::kAcceptableTargetOvershoot),
@@ -391,7 +394,8 @@ TEST_F(ScreenshareLayerTest, TargetBitrateCappedByTL1) {
 
 TEST_F(ScreenshareLayerTest, TargetBitrateBelowTL0) {
   vpx_codec_enc_cfg_t cfg = GetConfig();
-  layers_->ConfigureBitrates(100, 100, 5, &cfg);
+  layers_->OnRatesUpdated(100, 100, 5);
+  layers_->UpdateConfiguration(&cfg);
 
   EXPECT_EQ(100U, cfg.rc_target_bitrate);
 }
@@ -453,7 +457,8 @@ TEST_F(ScreenshareLayerTest, RespectsMaxIntervalBetweenFrames) {
   const uint32_t kStartTimestamp = 1234;
 
   vpx_codec_enc_cfg_t cfg = GetConfig();
-  layers_->ConfigureBitrates(kLowBitrateKbps, kLowBitrateKbps, 5, &cfg);
+  layers_->OnRatesUpdated(kLowBitrateKbps, kLowBitrateKbps, 5);
+  layers_->UpdateConfiguration(&cfg);
 
   EXPECT_EQ(ScreenshareLayers::kTl0Flags,
             layers_->EncodeFlags(kStartTimestamp));