In screenshare mode, suppress VP8 bitrate overshoot and increase quality

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

 /*
  *  Copyright (c) 2013 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 21 matching lines @@
     VP8_EFLAG_NO_UPD_LAST;
 const int kFlagsTL1Sync = VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_REF_GF |
     VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_UPD_LAST;
 
 class ScreenshareLayersFT : public ScreenshareLayers {
  public:
   ScreenshareLayersFT(int num_temporal_layers,
                       uint8_t initial_tl0_pic_idx,
                       FrameDropper* tl0_frame_dropper,
                       FrameDropper* tl1_frame_dropper)
-      : ScreenshareLayers(num_temporal_layers,
-                          initial_tl0_pic_idx,
-                          tl0_frame_dropper,
-                          tl1_frame_dropper) {}
+      : ScreenshareLayers(num_temporal_layers, initial_tl0_pic_idx) {}
   virtual ~ScreenshareLayersFT() {}
 };
 
 class ScreenshareLayerTest : public ::testing::Test {
  protected:
   void SetEncodeExpectations(bool drop_tl0, bool drop_tl1, int framerate) {
     EXPECT_CALL(tl0_frame_dropper_, DropFrame())
         .Times(1)
         .WillRepeatedly(Return(drop_tl0));
     if (drop_tl0) {
@@ skipping 22 matching lines @@
           .Times(1);
     }
   }
 
   void EncodeFrame(uint32_t timestamp,
                    bool base_sync,
                    CodecSpecificInfoVP8* vp8_info,
                    int* flags) {
     *flags = layers_->EncodeFlags(timestamp);
     layers_->PopulateCodecSpecific(base_sync, vp8_info, timestamp);
-    layers_->FrameEncoded(kFrameSize, timestamp);
+    layers_->FrameEncoded(kFrameSize, timestamp, -1);
   }
 
   NiceMock<MockFrameDropper> tl0_frame_dropper_;
   NiceMock<MockFrameDropper> tl1_frame_dropper_;
   rtc::scoped_ptr<ScreenshareLayersFT> layers_;
 };
 
 TEST_F(ScreenshareLayerTest, 1Layer) {
   layers_.reset(
       new ScreenshareLayersFT(1, 0, &tl0_frame_dropper_, &tl1_frame_dropper_));
   EXPECT_TRUE(layers_->ConfigureBitrates(100, 1000, 5, NULL));
   int flags = 0;
   uint32_t timestamp = 0;
   CodecSpecificInfoVP8 vp8_info;
   // One layer screenshare should not use the frame dropper as all frames will
   // belong to the base layer.
   EXPECT_CALL(tl0_frame_dropper_, DropFrame())
       .Times(0);
   EXPECT_CALL(tl1_frame_dropper_, DropFrame())
       .Times(0);
   flags = layers_->EncodeFlags(timestamp);
   EXPECT_EQ(0, flags);
   layers_->PopulateCodecSpecific(false, &vp8_info, timestamp);
   EXPECT_EQ(static_cast<uint8_t>(kNoTemporalIdx), vp8_info.temporalIdx);
   EXPECT_FALSE(vp8_info.layerSync);
   EXPECT_EQ(kNoTl0PicIdx, vp8_info.tl0PicIdx);
-  layers_->FrameEncoded(kFrameSize, timestamp);
+  layers_->FrameEncoded(kFrameSize, timestamp, -1);
 
   EXPECT_CALL(tl0_frame_dropper_, DropFrame())
       .Times(0);
   EXPECT_CALL(tl1_frame_dropper_, DropFrame())
       .Times(0);
   flags = layers_->EncodeFlags(timestamp);
   EXPECT_EQ(0, flags);
   timestamp += kTimestampDelta5Fps;
   layers_->PopulateCodecSpecific(false, &vp8_info, timestamp);
   EXPECT_EQ(static_cast<uint8_t>(kNoTemporalIdx), vp8_info.temporalIdx);
   EXPECT_FALSE(vp8_info.layerSync);
   EXPECT_EQ(kNoTl0PicIdx, vp8_info.tl0PicIdx);
-  layers_->FrameEncoded(kFrameSize, timestamp);
+  layers_->FrameEncoded(kFrameSize, timestamp, -1);
 }
 
 TEST_F(ScreenshareLayerTest, 2Layer) {
   layers_.reset(
       new ScreenshareLayersFT(2, 0, &tl0_frame_dropper_, &tl1_frame_dropper_));
   EXPECT_TRUE(layers_->ConfigureBitrates(100, 1000, 5, NULL));
   int flags = 0;
   uint32_t timestamp = 0;
   uint8_t expected_tl0_idx = 0;
   CodecSpecificInfoVP8 vp8_info;
@@ skipping 142 matching lines @@
 TEST_F(ScreenshareLayerTest, TargetBitrateBelowTL0) {
   layers_.reset(
       new ScreenshareLayersFT(2, 0, &tl0_frame_dropper_, &tl1_frame_dropper_));
   vpx_codec_enc_cfg_t cfg;
   layers_->ConfigureBitrates(100, 100, 5, &cfg);
 
   EXPECT_EQ(100U, cfg.rc_target_bitrate);
 }
 
 }  // namespace webrtc