From c6b224abc0ac16c293410db4cd522fe45e47cba7 Mon Sep 17 00:00:00 2001 From: Stefan Holmer Date: Tue, 6 Feb 2018 13:52:44 +0100 Subject: [PATCH] Pass the external fec_controller_ to VideoSendStream when available. Bug: None Change-Id: I179c81de2cb7da2a2742c3ebc333a1e0ea15bcc8 Reviewed-on: https://webrtc-review.googlesource.com/48522 Commit-Queue: Stefan Holmer Reviewed-by: Ying Wang Cr-Commit-Position: refs/heads/master@{#21913} --- video/video_quality_test.cc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc index 97cdced9d4..a0e967199d 100644 --- a/video/video_quality_test.cc +++ b/video/video_quality_test.cc @@ -1797,9 +1797,20 @@ void VideoQualityTest::CreateVideoStreams() { RTC_DCHECK(video_send_streams_.empty()); RTC_DCHECK(video_receive_streams_.empty()); RTC_DCHECK_EQ(video_send_configs_.size(), num_video_streams_); + // We currently only support testing external fec controllers with a single + // VideoSendStream. + if (fec_controller_.get()) { + RTC_DCHECK_LE(video_send_configs_.size(), 1); + } for (size_t i = 0; i < video_send_configs_.size(); ++i) { - video_send_streams_.push_back(sender_call_->CreateVideoSendStream( - video_send_configs_[i].Copy(), video_encoder_configs_[i].Copy())); + if (fec_controller_.get()) { + video_send_streams_.push_back(sender_call_->CreateVideoSendStream( + video_send_configs_[i].Copy(), video_encoder_configs_[i].Copy(), + std::move(fec_controller_))); + } else { + video_send_streams_.push_back(sender_call_->CreateVideoSendStream( + video_send_configs_[i].Copy(), video_encoder_configs_[i].Copy())); + } } for (size_t i = 0; i < video_receive_configs_.size(); ++i) { video_receive_streams_.push_back(receiver_call_->CreateVideoReceiveStream(