Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(237)

Side by Side Diff: webrtc/video/video_quality_test.cc

Issue 2974453002: Protected streams report RTP messages directly to the FlexFec streams (Closed)
Patch Set: Appease lint. Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/video/rtp_video_stream_receiver_unittest.cc ('k') | webrtc/video/video_receive_stream.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 #include "webrtc/video/video_quality_test.h" 10 #include "webrtc/video/video_quality_test.h"
(...skipping 2070 matching lines...) Expand 10 before | Expand all | Expand 10 after
2081 sender_call_->DestroyAudioSendStream(audio_send_stream_); 2081 sender_call_->DestroyAudioSendStream(audio_send_stream_);
2082 receiver_call_->DestroyAudioReceiveStream(audio_receive_stream); 2082 receiver_call_->DestroyAudioReceiveStream(audio_receive_stream);
2083 } 2083 }
2084 2084
2085 // Stop receiving and sending video. 2085 // Stop receiving and sending video.
2086 if (params_.video.enabled) { 2086 if (params_.video.enabled) {
2087 video_capturer_->Stop(); 2087 video_capturer_->Stop();
2088 video_send_stream_->Stop(); 2088 video_send_stream_->Stop();
2089 for (FlexfecReceiveStream* flexfec_receive_stream : 2089 for (FlexfecReceiveStream* flexfec_receive_stream :
2090 flexfec_receive_streams_) { 2090 flexfec_receive_streams_) {
2091 for (VideoReceiveStream* video_receive_stream : video_receive_streams_) {
2092 video_receive_stream->RemoveSecondarySink(flexfec_receive_stream);
2093 }
2091 flexfec_receive_stream->Stop(); 2094 flexfec_receive_stream->Stop();
2092 receiver_call_->DestroyFlexfecReceiveStream(flexfec_receive_stream); 2095 receiver_call_->DestroyFlexfecReceiveStream(flexfec_receive_stream);
2093 } 2096 }
2094 for (VideoReceiveStream* receive_stream : video_receive_streams_) { 2097 for (VideoReceiveStream* receive_stream : video_receive_streams_) {
2095 receive_stream->Stop(); 2098 receive_stream->Stop();
2096 receiver_call_->DestroyVideoReceiveStream(receive_stream); 2099 receiver_call_->DestroyVideoReceiveStream(receive_stream);
2097 } 2100 }
2098 sender_call_->DestroyVideoSendStream(video_send_stream_); 2101 sender_call_->DestroyVideoSendStream(video_send_stream_);
2099 } 2102 }
2100 2103
(...skipping 23 matching lines...) Expand all
2124 if (!params_.logging.encoded_frame_base_path.empty()) { 2127 if (!params_.logging.encoded_frame_base_path.empty()) {
2125 std::ostringstream str; 2128 std::ostringstream str;
2126 str << receive_logs_++; 2129 str << receive_logs_++;
2127 std::string path = 2130 std::string path =
2128 params_.logging.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; 2131 params_.logging.encoded_frame_base_path + "." + str.str() + ".recv.ivf";
2129 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path), 2132 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path),
2130 100000000); 2133 100000000);
2131 } 2134 }
2132 } 2135 }
2133 } // namespace webrtc 2136 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/rtp_video_stream_receiver_unittest.cc ('k') | webrtc/video/video_receive_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698