commit 9ef5e056f9d9318f7bdfda78d6acff13fa522ed4
author Ilya Nikolaevskiy <ilnik@webrtc.org> Tue Mar 05 10:08:35 2019 +0100
committer Commit Bot <commit-bot@chromium.org> Tue Mar 05 11:53:09 2019 +0000
tree 7a770915d97314b54ff79ab8f13248ee805dd29d
parent 977b3351b9aa9cdcef9113f018d87f2981cbf475

Fix target bitrate handling for a single layer VP9 screenshare

For a single layer vp9, the target bitrate was not set correctly. This
may cause a problem for screenshare case, since target bitrate is
respected in that case. If it were less than a min bitrate, the only
spatial layer was permanently disabled.

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

modules/video_coding/codecs/vp9/svc_rate_allocator.cc

diff --git a/modules/video_coding/codecs/vp9/svc_rate_allocator.cc b/modules/video_coding/codecs/vp9/svc_rate_allocator.cc
index daa59b1..551e655 100644
--- a/modules/video_coding/codecs/vp9/svc_rate_allocator.cc
+++ b/modules/video_coding/codecs/vp9/svc_rate_allocator.cc
@@ -203,6 +203,7 @@
         codec_.spatialLayers[sl_idx].minBitrate * 1000;
     const size_t target_bitrate_bps =
         codec_.spatialLayers[sl_idx].targetBitrate * 1000;
+    RTC_DCHECK_LE(min_bitrate_bps, target_bitrate_bps);
 
     const size_t bitrate_bps = std::min(left_bitrate_bps, target_bitrate_bps);
     if (bitrate_bps >= min_bitrate_bps) {

modules/video_coding/video_codec_initializer.cc

diff --git a/modules/video_coding/video_codec_initializer.cc b/modules/video_coding/video_codec_initializer.cc
index a2bc27a..3316ce1 100644
--- a/modules/video_coding/video_codec_initializer.cc
+++ b/modules/video_coding/video_codec_initializer.cc
@@ -190,6 +190,7 @@
         if (no_spatial_layering) {
           // Use codec's bitrate limits.
           spatial_layers.back().minBitrate = video_codec.minBitrate;
+          spatial_layers.back().targetBitrate = video_codec.maxBitrate;
           spatial_layers.back().maxBitrate = video_codec.maxBitrate;
         }
 

modules/video_coding/video_codec_initializer_unittest.cc

diff --git a/modules/video_coding/video_codec_initializer_unittest.cc b/modules/video_coding/video_codec_initializer_unittest.cc
index 6734b7e..0f2d9f1 100644
--- a/modules/video_coding/video_codec_initializer_unittest.cc
+++ b/modules/video_coding/video_codec_initializer_unittest.cc
@@ -297,6 +297,18 @@
 }
 
 TEST_F(VideoCodecInitializerTest,
+       Vp9SingleSpatialLayerTargetBitrateIsEqualToCodecMaxBitrate) {
+  SetUpFor(VideoCodecType::kVideoCodecVP9, 1, 1, true);
+  VideoStream stream = DefaultStream();
+  stream.num_temporal_layers = 1;
+  streams_.push_back(stream);
+
+  EXPECT_TRUE(InitializeCodec());
+  EXPECT_EQ(codec_out_.spatialLayers[0].targetBitrate,
+            kDefaultMaxBitrateBps / 1000);
+}
+
+TEST_F(VideoCodecInitializerTest,
        Vp9KeepBitrateLimitsIfNumberOfSpatialLayersIsReducedToOne) {
   // Request 3 spatial layers for 320x180 input. Actual number of layers will be
   // reduced to 1 due to low input resolution but SVC bitrate limits should be