zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix receiving FlexFEC in video_loopback.

Browse Source 
BUG=webrtc:5654

Review-Url: https://codereview.webrtc.org/2965503006
Cr-Commit-Position: refs/heads/master@{#18847}
This commit is contained in:
brandtr
2017-06-30 02:34:20 -07:00
committed by Commit Bot
parent 5f8b04d53a
commit cb8f045d9f
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
webrtc/video/video_quality_test.cc
View File

@ -1879,7 +1879,6 @@ void VideoQualityTest::RunWithRenderers(const Params& params) {
send_transport.SetReceiver(receiver_call_->Receiver());
recv_transport.SetReceiver(sender_call_->Receiver());
FlexfecReceiveStream* flexfec_receive_stream = nullptr;
std::unique_ptr<test::VideoRenderer> local_preview;
std::vector<std::unique_ptr<test::VideoRenderer>> loopback_renderers_;
if (params_.video.enabled) {
@ -1944,8 +1943,10 @@ void VideoQualityTest::RunWithRenderers(const Params& params) {
// Start sending and receiving video.
if (params_.video.enabled) {
if (flexfec_receive_stream)
for (FlexfecReceiveStream* flexfec_receive_stream :
flexfec_receive_streams_) {
flexfec_receive_stream->Start();
}
for (VideoReceiveStream* receive_stream : video_receive_streams_)
receive_stream->Start();
video_send_stream_->Start();
@ -1980,14 +1981,15 @@ void VideoQualityTest::RunWithRenderers(const Params& params) {
if (params_.video.enabled) {
video_capturer_->Stop();
video_send_stream_->Stop();
for (VideoReceiveStream* receive_stream : video_receive_streams_)
receive_stream->Stop();
if (flexfec_receive_stream) {
for (FlexfecReceiveStream* flexfec_receive_stream :
flexfec_receive_streams_) {
flexfec_receive_stream->Stop();
receiver_call_->DestroyFlexfecReceiveStream(flexfec_receive_stream);
}
for (VideoReceiveStream* receive_stream : video_receive_streams_)
for (VideoReceiveStream* receive_stream : video_receive_streams_) {
receive_stream->Stop();
receiver_call_->DestroyVideoReceiveStream(receive_stream);
}
sender_call_->DestroyVideoSendStream(video_send_stream_);
}