Derive current layer from TL frame config.

webrtc/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc

 /*
  *  Copyright (c) 2016 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 11 matching lines @@
 namespace {
 using ::testing::_;
 
 constexpr uint32_t kMinBitrateKbps = 50;
 constexpr uint32_t kTargetBitrateKbps = 100;
 constexpr uint32_t kMaxBitrateKbps = 1000;
 constexpr uint32_t kFramerateFps = 5;
 
 class MockTemporalLayers : public TemporalLayers {
  public:
-  MOCK_METHOD1(UpdateLayerConfig, TemporalReferences(uint32_t));
+  MOCK_METHOD1(UpdateLayerConfig, TemporalLayers::FrameConfig(uint32_t));
   MOCK_METHOD3(OnRatesUpdated, std::vector<uint32_t>(int, int, int));
   MOCK_METHOD1(UpdateConfiguration, bool(vpx_codec_enc_cfg_t*));
-  MOCK_METHOD3(PopulateCodecSpecific,
-               void(bool, CodecSpecificInfoVP8*, uint32_t));
+  MOCK_METHOD4(PopulateCodecSpecific,
+               void(bool,
+                    const TemporalLayers::FrameConfig&,
+                    CodecSpecificInfoVP8*,
+                    uint32_t));
   MOCK_METHOD2(FrameEncoded, void(unsigned int, int));
-  MOCK_CONST_METHOD0(CurrentLayerId, int());
   MOCK_CONST_METHOD0(Tl0PicIdx, uint8_t());
+  MOCK_CONST_METHOD1(GetTemporalLayerId,
+                     int(const TemporalLayers::FrameConfig&));
 };
 }  // namespace
 
 class SimulcastRateAllocatorTest : public ::testing::TestWithParam<bool> {
  public:
   SimulcastRateAllocatorTest() {
     memset(&codec_, 0, sizeof(VideoCodec));
     codec_.minBitrate = kMinBitrateKbps;
     codec_.targetBitrate = kTargetBitrateKbps;
     codec_.maxBitrate = kMaxBitrateKbps;
@@ skipping 313 matching lines @@
       allocator_->GetAllocation(kMaxBitrateKbps * 2000, kFramerateFps);
 
   // Fill both TL0 and TL1, but no more.
   EXPECT_EQ(kMaxBitrateKbps, allocation.get_sum_kbps());
   EXPECT_EQ(kTargetBitrateKbps, allocation.GetBitrate(0, 0) / 1000);
   EXPECT_EQ(kMaxBitrateKbps - kTargetBitrateKbps,
             allocation.GetBitrate(0, 1) / 1000);
 }
 
 }  // namespace webrtc