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/test/scenario/audio_stream.cc | 2 +- third_party/libwebrtc/test/scenario/video_stream.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'third_party/libwebrtc/test/scenario') diff --git a/third_party/libwebrtc/test/scenario/audio_stream.cc b/third_party/libwebrtc/test/scenario/audio_stream.cc index 5f7db7acdf..232f7382bd 100644 --- a/third_party/libwebrtc/test/scenario/audio_stream.cc +++ b/third_party/libwebrtc/test/scenario/audio_stream.cc @@ -89,7 +89,7 @@ SendAudioStream::SendAudioStream( AudioSendStream::Config send_config(send_transport); ssrc_ = sender->GetNextAudioSsrc(); send_config.rtp.ssrc = ssrc_; - SdpAudioFormat::Parameters sdp_params; + CodecParameterMap sdp_params; if (config.source.channels == 2) sdp_params["stereo"] = "1"; if (config.encoder.initial_frame_length != TimeDelta::Millis(20)) diff --git a/third_party/libwebrtc/test/scenario/video_stream.cc b/third_party/libwebrtc/test/scenario/video_stream.cc index eb20f8dbc7..654aed7c6c 100644 --- a/third_party/libwebrtc/test/scenario/video_stream.cc +++ b/third_party/libwebrtc/test/scenario/video_stream.cc @@ -430,7 +430,8 @@ SendVideoStream::SendVideoStream(CallClient* sender, if (config.stream.fec_controller_factory) { send_stream_ = sender_->call_->CreateVideoSendStream( std::move(send_config), std::move(encoder_config), - config.stream.fec_controller_factory->CreateFecController()); + config.stream.fec_controller_factory->CreateFecController( + sender_->env_)); } else { send_stream_ = sender_->call_->CreateVideoSendStream( std::move(send_config), std::move(encoder_config)); -- cgit v1.2.3