From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- third_party/libwebrtc/pc/test/svc_e2e_tests.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'third_party/libwebrtc/pc/test/svc_e2e_tests.cc') diff --git a/third_party/libwebrtc/pc/test/svc_e2e_tests.cc b/third_party/libwebrtc/pc/test/svc_e2e_tests.cc index 3fde5a44e0..b2382d700f 100644 --- a/third_party/libwebrtc/pc/test/svc_e2e_tests.cc +++ b/third_party/libwebrtc/pc/test/svc_e2e_tests.cc @@ -210,7 +210,7 @@ class SvcVideoQualityAnalyzer : public DefaultVideoQualityAnalyzer { // Extract the scalability mode reported in the stats. auto outbound_stats = report->GetStatsOfType(); for (const auto& stat : outbound_stats) { - if (stat->scalability_mode.is_defined()) { + if (stat->scalability_mode.has_value()) { reported_scalability_mode_ = *stat->scalability_mode; } } @@ -336,10 +336,9 @@ TEST_P(SvcTest, ScalabilityModeSupported) { RtpEncodingParameters parameters; parameters.scalability_mode = SvcTestParameters().scalability_mode; video.encoding_params.push_back(parameters); - alice->AddVideoConfig( - std::move(video), - CreateScreenShareFrameGenerator( - video, ScreenShareConfig(TimeDelta::Seconds(5)))); + auto generator = CreateScreenShareFrameGenerator( + video, ScreenShareConfig(TimeDelta::Seconds(5))); + alice->AddVideoConfig(std::move(video), std::move(generator)); alice->SetVideoCodecs({video_codec_config}); }, [](PeerConfigurer* bob) {}, std::move(analyzer)); -- cgit v1.2.3