| Index: webrtc/video/end_to_end_tests.cc
|
| diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
|
| index 93b98cadefbbb9390e9c2c0bbe1cd0b13b2c857a..528338defe0adee2c5242abad5f09e1c6a59ef0c 100644
|
| --- a/webrtc/video/end_to_end_tests.cc
|
| +++ b/webrtc/video/end_to_end_tests.cc
|
| @@ -1281,8 +1281,8 @@
|
|
|
| UpdateSendConfig(i, &send_config, &encoder_config, &frame_generators[i]);
|
|
|
| - send_streams[i] = sender_call->CreateVideoSendStream(
|
| - send_config.Copy(), encoder_config.Copy());
|
| + send_streams[i] =
|
| + sender_call->CreateVideoSendStream(send_config, encoder_config);
|
| send_streams[i]->Start();
|
|
|
| VideoReceiveStream::Config receive_config(receiver_transport.get());
|
| @@ -2486,7 +2486,7 @@
|
| }
|
| }
|
|
|
| - video_encoder_config_all_streams_ = encoder_config->Copy();
|
| + video_encoder_config_all_streams_ = *encoder_config;
|
| if (send_single_ssrc_first_)
|
| encoder_config->streams.resize(1);
|
| }
|
| @@ -2505,7 +2505,7 @@
|
| if (send_single_ssrc_first_) {
|
| // Set full simulcast and continue with the rest of the SSRCs.
|
| send_stream_->ReconfigureVideoEncoder(
|
| - std::move(video_encoder_config_all_streams_));
|
| + video_encoder_config_all_streams_);
|
| EXPECT_TRUE(Wait()) << "Timed out while waiting on additional SSRCs.";
|
| }
|
| }
|
| @@ -3200,7 +3200,7 @@
|
|
|
| // Use the same total bitrates when sending a single stream to avoid lowering
|
| // the bitrate estimate and requiring a subsequent rampup.
|
| - VideoEncoderConfig one_stream = video_encoder_config_.Copy();
|
| + VideoEncoderConfig one_stream = video_encoder_config_;
|
| one_stream.streams.resize(1);
|
| for (size_t i = 1; i < video_encoder_config_.streams.size(); ++i) {
|
| one_stream.streams.front().min_bitrate_bps +=
|
| @@ -3227,8 +3227,8 @@
|
| sender_call_->DestroyVideoSendStream(video_send_stream_);
|
|
|
| // Re-create VideoSendStream with only one stream.
|
| - video_send_stream_ = sender_call_->CreateVideoSendStream(
|
| - video_send_config_.Copy(), one_stream.Copy());
|
| + video_send_stream_ =
|
| + sender_call_->CreateVideoSendStream(video_send_config_, one_stream);
|
| video_send_stream_->Start();
|
| if (provoke_rtcpsr_before_rtp) {
|
| // Rapid Resync Request forces sending RTCP Sender Report back.
|
| @@ -3246,18 +3246,18 @@
|
| EXPECT_TRUE(observer.Wait()) << "Timed out waiting for single RTP packet.";
|
|
|
| // Reconfigure back to use all streams.
|
| - video_send_stream_->ReconfigureVideoEncoder(video_encoder_config_.Copy());
|
| + video_send_stream_->ReconfigureVideoEncoder(video_encoder_config_);
|
| observer.ResetExpectedSsrcs(kNumSsrcs);
|
| EXPECT_TRUE(observer.Wait())
|
| << "Timed out waiting for all SSRCs to send packets.";
|
|
|
| // Reconfigure down to one stream.
|
| - video_send_stream_->ReconfigureVideoEncoder(one_stream.Copy());
|
| + video_send_stream_->ReconfigureVideoEncoder(one_stream);
|
| observer.ResetExpectedSsrcs(1);
|
| EXPECT_TRUE(observer.Wait()) << "Timed out waiting for single RTP packet.";
|
|
|
| // Reconfigure back to use all streams.
|
| - video_send_stream_->ReconfigureVideoEncoder(video_encoder_config_.Copy());
|
| + video_send_stream_->ReconfigureVideoEncoder(video_encoder_config_);
|
| observer.ResetExpectedSsrcs(kNumSsrcs);
|
| EXPECT_TRUE(observer.Wait())
|
| << "Timed out waiting for all SSRCs to send packets.";
|
|
|