commit a270250426373b36cac4e03c4a9e97e83cdfa692
author Ilya Nikolaevskiy <ilnik@webrtc.org> Mon May 11 11:35:52 2020
committer Commit Bot <commit-bot@chromium.org> Mon May 11 13:38:42 2020
tree 3c226eb4e52283262194ec5a4228fd094ce40e4d
parent 6efc14b33db0173c2710101aad27b574df9601ce

[Adaptation] Disable inital frame drop for simuclast/svc

Bug: chromium:1080789
Change-Id: I72bbee4ac21302d15b6c54abea48d665e8ef6922
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174808
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Reviewed-by: Evan Shrubsole <eshr@google.com>
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31212}

video/video_stream_encoder.cc

diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc
index fbd60b8..c69cf1e 100644
--- a/video/video_stream_encoder.cc
+++ b/video/video_stream_encoder.cc
@@ -1652,7 +1652,12 @@
 }
 
 bool VideoStreamEncoder::DropDueToSize(uint32_t pixel_count) const {
-  if (!stream_resource_manager_.DropInitialFrames() ||
+  bool simulcast_or_svc =
+      (send_codec_.codecType == VideoCodecType::kVideoCodecVP9 &&
+       send_codec_.VP9().numberOfSpatialLayers > 1) ||
+      send_codec_.numberOfSimulcastStreams > 1;
+
+  if (simulcast_or_svc || !stream_resource_manager_.DropInitialFrames() ||
       !encoder_target_bitrate_bps_.has_value()) {
     return false;
   }