admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure screenshare_layers produce non-sync TL1 frames after keyframes

Browse Source 
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}
This commit is contained in:
Erik Språng 2019-04-01 16:22:57 +02:00 committed by Commit Bot
parent ca07360d27
commit db6335efce
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/video_coding/codecs/vp8/screenshare_layers.cc
View File

@ -329,6 +329,9 @@ void ScreenshareLayers::OnEncodeDone(size_t stream_index,
active_layer_ = 1; active_layer_ = 1;
info->template_structure = info->template_structure =
GetTemplateStructure(number_of_temporal_layers_); 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; vp8_info.useExplicitDependencies = true;

20
modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
View File

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