From aec663ed0d7ddfdde0960fea248acc194fb7f7bc Mon Sep 17 00:00:00 2001 From: Ilya Nikolaevskiy Date: Wed, 27 Feb 2019 12:52:11 +0100 Subject: [PATCH] Fix video_loopback tool with different TL numbers in simulcast streams MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: None Change-Id: I7dd521dc66b41f5e68e33378ab4c0e8507679cf9 Reviewed-on: https://webrtc-review.googlesource.com/c/124660 Commit-Queue: Ilya Nikolaevskiy Reviewed-by: Erik Språng Cr-Commit-Position: refs/heads/master@{#26874} --- video/full_stack_tests.cc | 9 ++++----- video/video_quality_test.cc | 7 +++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/video/full_stack_tests.cc b/video/full_stack_tests.cc index 87f82cc3c8..8651d124ae 100644 --- a/video/full_stack_tests.cc +++ b/video/full_stack_tests.cc @@ -732,7 +732,7 @@ TEST(FullStackTest, ScreenshareSlidesVP8_2TL_Simulcast) { screenshare.call.send_side_bwe = true; screenshare.screenshare[0] = {true, false, 10}; screenshare.video[0] = {true, 1850, 1110, 30, 800000, 2500000, - 2500000, false, "VP8", 3, 2, 400000, + 2500000, false, "VP8", 2, 1, 400000, false, false, false, ""}; screenshare.analyzer = {"screenshare_slides_simulcast", 0.0, 0.0, kFullStackTestDurationSecs}; @@ -1258,10 +1258,9 @@ TEST_P(DualStreamsTest, // Screenshare Settings. dual_streams.screenshare[first_stream] = {true, false, 10}; - dual_streams.video[first_stream] = {true, 1850, 1110, 5, 800000, - 2500000, 2500000, false, "VP8", 3, - 2, 400000, false, false, false, - ""}; + dual_streams.video[first_stream] = {true, 1850, 1110, 5, 800000, 2500000, + 2500000, false, "VP8", 2, 1, 400000, + false, false, false, ""}; ParamsWithLogging screenshare_params_high; screenshare_params_high.video[0] = { diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc index 3627918b94..d40bab7e17 100644 --- a/video/video_quality_test.cc +++ b/video/video_quality_test.cc @@ -477,8 +477,11 @@ void VideoQualityTest::CheckParamsAndInjectionComponents() { params_.video[video_idx].target_bitrate_bps); RTC_CHECK_GE(params_.video[video_idx].target_bitrate_bps, params_.video[video_idx].min_bitrate_bps); - RTC_CHECK_LT(params_.video[video_idx].selected_tl, - params_.video[video_idx].num_temporal_layers); + int selected_stream = params_.ss[video_idx].selected_stream; + int stream_tl = params_.ss[video_idx] + .streams[selected_stream] + .num_temporal_layers.value_or(1); + RTC_CHECK_LT(params_.video[video_idx].selected_tl, stream_tl); RTC_CHECK_LE(params_.ss[video_idx].selected_stream, params_.ss[video_idx].streams.size()); for (const VideoStream& stream : params_.ss[video_idx].streams) {