diff options
Diffstat (limited to '')
| -rw-r--r-- | third_party/libwebrtc/pc/test/integration_test_helpers.cc | 1 | ||||
| -rw-r--r-- | third_party/libwebrtc/pc/test/integration_test_helpers.h | 11 | ||||
| -rw-r--r-- | third_party/libwebrtc/pc/test/svc_e2e_tests.cc | 9 |
3 files changed, 9 insertions, 12 deletions
diff --git a/third_party/libwebrtc/pc/test/integration_test_helpers.cc b/third_party/libwebrtc/pc/test/integration_test_helpers.cc index 64d8debc09..1f603ad561 100644 --- a/third_party/libwebrtc/pc/test/integration_test_helpers.cc +++ b/third_party/libwebrtc/pc/test/integration_test_helpers.cc @@ -22,7 +22,6 @@ void RemoveSsrcsAndMsids(cricket::SessionDescription* desc) { for (ContentInfo& content : desc->contents()) { content.media_description()->mutable_streams().clear(); } - desc->set_msid_supported(false); desc->set_msid_signaling(0); } diff --git a/third_party/libwebrtc/pc/test/integration_test_helpers.h b/third_party/libwebrtc/pc/test/integration_test_helpers.h index fb719e7ddd..7b3f11905d 100644 --- a/third_party/libwebrtc/pc/test/integration_test_helpers.h +++ b/third_party/libwebrtc/pc/test/integration_test_helpers.h @@ -649,8 +649,8 @@ class PeerConnectionIntegrationWrapper : public PeerConnectionObserver, auto received_stats = NewGetStats(); auto rtp_stats = received_stats->GetStatsOfType<RTCInboundRtpStreamStats>()[0]; - ASSERT_TRUE(rtp_stats->relative_packet_arrival_delay.is_defined()); - ASSERT_TRUE(rtp_stats->packets_received.is_defined()); + ASSERT_TRUE(rtp_stats->relative_packet_arrival_delay.has_value()); + ASSERT_TRUE(rtp_stats->packets_received.has_value()); rtp_stats_id_ = rtp_stats->id(); audio_packets_stat_ = *rtp_stats->packets_received; audio_delay_stat_ = *rtp_stats->relative_packet_arrival_delay; @@ -773,7 +773,7 @@ class PeerConnectionIntegrationWrapper : public PeerConnectionObserver, pc_factory_dependencies.task_queue_factory = CreateDefaultTaskQueueFactory(); pc_factory_dependencies.trials = std::make_unique<FieldTrialBasedConfig>(); - pc_factory_dependencies.metronome = + pc_factory_dependencies.decode_metronome = std::make_unique<TaskQueueMetronome>(TimeDelta::Millis(8)); pc_factory_dependencies.adm = fake_audio_capture_module_; @@ -800,8 +800,7 @@ class PeerConnectionIntegrationWrapper : public PeerConnectionObserver, pc_factory_dependencies.event_log_factory = std::move(event_log_factory); } else { pc_factory_dependencies.event_log_factory = - std::make_unique<RtcEventLogFactory>( - pc_factory_dependencies.task_queue_factory.get()); + std::make_unique<RtcEventLogFactory>(); } peer_connection_factory_ = CreateModularPeerConnectionFactory(std::move(pc_factory_dependencies)); @@ -1116,7 +1115,7 @@ class PeerConnectionIntegrationWrapper : public PeerConnectionObserver, if (remote_async_dns_resolver_) { const auto& local_candidate = candidate->candidate(); if (local_candidate.address().IsUnresolvedIP()) { - RTC_DCHECK(local_candidate.type() == cricket::LOCAL_PORT_TYPE); + RTC_DCHECK(local_candidate.is_local()); const auto resolved_ip = mdns_responder_->GetMappedAddressForName( local_candidate.address().hostname()); RTC_DCHECK(!resolved_ip.IsNil()); 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<RTCOutboundRtpStreamStats>(); 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)); |