From 9b540cb5534f1c51ce5925d87e1171b52e9fbbb5 Mon Sep 17 00:00:00 2001 From: Ilya Nikolaevskiy Date: Tue, 17 Dec 2019 10:16:53 +0100 Subject: [PATCH] Correctly process disabled streams in FrameEncodeMetadataWriter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the first simulcast stream is disabled, but the second one is enabled, FrameEncodeMetadataWriter would fail to store frame metadata for all streams and later fail to restore it for encoded frames. Bug: none Change-Id: Ib0d257abb863716ea94e56730f7caabef6ebeb64 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/162480 Reviewed-by: Erik Språng Commit-Queue: Ilya Nikolaevskiy Cr-Commit-Position: refs/heads/master@{#30106} --- video/frame_encode_metadata_writer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/video/frame_encode_metadata_writer.cc b/video/frame_encode_metadata_writer.cc index 8b2c2e67aa..e5f55575ec 100644 --- a/video/frame_encode_metadata_writer.cc +++ b/video/frame_encode_metadata_writer.cc @@ -105,7 +105,7 @@ void FrameEncodeMetadataWriter::OnEncodeStarted(const VideoFrame& frame) { // If stream is disabled due to low bandwidth OnEncodeStarted still will be // called and have to be ignored. if (timing_frames_info_[si].target_bitrate_bytes_per_sec == 0) - return; + continue; if (timing_frames_info_[si].frames.size() == kMaxEncodeStartTimeListSize) { ++stalled_encoder_logged_messages_; if (stalled_encoder_logged_messages_ <= kMessagesThrottlingThreshold ||