commit db6335efcea1ca9ff9e632f977a3724483741c8e
author Erik Språng <sprang@webrtc.org> Mon Apr 01 14:22:57 2019
committer Commit Bot <commit-bot@chromium.org> Tue Apr 02 09:16:30 2019
tree 4fd0bd490f8e920583acfb251f0c131ff9be3b43
parent ca07360d2798003c52ec7a5706176d50981f589f

Make sure screenshare_layers produce non-sync TL1 frames after keyframes

This fixes a regression introduces way back in August 2018:
https://webrtc-review.googlesource.com/c/src/+/91863/
For bonus points, also fixing an auxiliary test issue.

Bug: webrtc:10479, webrtc:10260
Change-Id: I4e99fe6e070446d10357d9d1a9d1ffc9dedcf419
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129926
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27409}

modules/video_coding/codecs/vp8/screenshare_layers.cc

diff --git a/modules/video_coding/codecs/vp8/screenshare_layers.cc b/modules/video_coding/codecs/vp8/screenshare_layers.cc
index 11a1cbd..3f05341 100644
--- a/modules/video_coding/codecs/vp8/screenshare_layers.cc
+++ b/modules/video_coding/codecs/vp8/screenshare_layers.cc
@@ -329,6 +329,9 @@
       active_layer_ = 1;
       info->template_structure =
           GetTemplateStructure(number_of_temporal_layers_);
+    } else if (active_layer_ >= 0 && layers_[active_layer_].state ==
+                                         TemporalLayer::State::kKeyFrame) {
+      layers_[active_layer_].state = TemporalLayer::State::kNormal;
     }
 
     vp8_info.useExplicitDependencies = true;

modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc

diff --git a/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc b/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
index b8aa435..b5ff190 100644
--- a/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
+++ b/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
@@ -126,20 +126,23 @@
   }
 
   // Runs a few initial frames and makes sure we have seen frames on both
-  // temporal layers.
+  // temporal layers, including sync and non-sync frames.
   bool RunGracePeriod() {
     bool got_tl0 = false;
     bool got_tl1 = false;
+    bool got_tl1_sync = false;
     for (int i = 0; i < 10; ++i) {
       CodecSpecificInfo info;
       EXPECT_NE(-1, EncodeFrame(false, &info));
       timestamp_ += kTimestampDelta5Fps;
       if (info.codecSpecific.VP8.temporalIdx == 0) {
         got_tl0 = true;
+      } else if (info.codecSpecific.VP8.layerSync) {
+        got_tl1_sync = true;
       } else {
         got_tl1 = true;
       }
-      if (got_tl0 && got_tl1)
+      if (got_tl0 && got_tl1 && got_tl1_sync)
         return true;
     }
     return false;
@@ -161,9 +164,13 @@
       flags = ConfigureFrame(false);
       if (tl_config_.packetizer_temporal_idx != layer ||
           (sync && *sync != tl_config_.layer_sync)) {
-        CodecSpecificInfo info;
-        layers_->OnEncodeDone(0, timestamp_, frame_size_, false, kDefaultQp,
-                              &info);
+        if (flags != -1) {
+          // If flags do not request a frame drop, report some default values
+          // for frame size etc.
+          CodecSpecificInfo info;
+          layers_->OnEncodeDone(0, timestamp_, frame_size_, false, kDefaultQp,
+                                &info);
+        }
         timestamp_ += kTimestampDelta5Fps;
       } else {
         // Found frame from sought after layer.
@@ -714,8 +721,7 @@
   EXPECT_TRUE(layers_->UpdateConfiguration(0, &cfg_));
 }
 
-// TODO(bugs.webrtc.org/10260): Fix.
-TEST_F(ScreenshareLayerTest, DISABLED_MaxQpRestoredAfterDoubleDrop) {
+TEST_F(ScreenshareLayerTest, MaxQpRestoredAfterDoubleDrop) {
   // Run grace period so we have existing frames in both TL0 and Tl1.
   EXPECT_TRUE(RunGracePeriod());