From a270250426373b36cac4e03c4a9e97e83cdfa692 Mon Sep 17 00:00:00 2001 From: Ilya Nikolaevskiy Date: Mon, 11 May 2020 13:35:52 +0200 Subject: [PATCH] [Adaptation] Disable inital frame drop for simuclast/svc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: chromium:1080789 Change-Id: I72bbee4ac21302d15b6c54abea48d665e8ef6922 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174808 Reviewed-by: Henrik Boström Reviewed-by: Evan Shrubsole Commit-Queue: Ilya Nikolaevskiy Cr-Commit-Position: refs/heads/master@{#31212} --- video/video_stream_encoder.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc index fbd60b8659..c69cf1e731 100644 --- a/video/video_stream_encoder.cc +++ b/video/video_stream_encoder.cc @@ -1652,7 +1652,12 @@ void VideoStreamEncoder::OnBitrateUpdated(DataRate target_bitrate, } 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; }