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

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

Issue 2621573002: Remove FlexfecConfig and replace with specific struct in VideoSendStream. (Closed)
Patch Set: Rebase. Created 3 years, 11 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/send_statistics_proxy_unittest.cc ('k') | webrtc/video/video_send_stream.cc » ('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 1099 matching lines...) Expand 10 before | Expand all | Expand 10 after
1110 if (params_.video.flexfec) { 1110 if (params_.video.flexfec) {
1111 // Override send config constructed by CreateSendConfig. 1111 // Override send config constructed by CreateSendConfig.
1112 video_send_config_.rtp.flexfec.protected_media_ssrcs = { 1112 video_send_config_.rtp.flexfec.protected_media_ssrcs = {
1113 kVideoSendSsrcs[params_.ss.selected_stream]}; 1113 kVideoSendSsrcs[params_.ss.selected_stream]};
1114 1114
1115 // The matching receive config is _not_ created by 1115 // The matching receive config is _not_ created by
1116 // CreateMatchingReceiveConfigs, since VideoQualityTest is not a BaseTest. 1116 // CreateMatchingReceiveConfigs, since VideoQualityTest is not a BaseTest.
1117 // Set up the receive config manually instead. 1117 // Set up the receive config manually instead.
1118 FlexfecReceiveStream::Config flexfec_receive_config(recv_transport); 1118 FlexfecReceiveStream::Config flexfec_receive_config(recv_transport);
1119 flexfec_receive_config.payload_type = 1119 flexfec_receive_config.payload_type =
1120 video_send_config_.rtp.flexfec.flexfec_payload_type; 1120 video_send_config_.rtp.flexfec.payload_type;
1121 flexfec_receive_config.remote_ssrc = 1121 flexfec_receive_config.remote_ssrc = video_send_config_.rtp.flexfec.ssrc;
1122 video_send_config_.rtp.flexfec.flexfec_ssrc;
1123 flexfec_receive_config.protected_media_ssrcs = 1122 flexfec_receive_config.protected_media_ssrcs =
1124 video_send_config_.rtp.flexfec.protected_media_ssrcs; 1123 video_send_config_.rtp.flexfec.protected_media_ssrcs;
1125 flexfec_receive_config.transport_cc = params_.call.send_side_bwe; 1124 flexfec_receive_config.transport_cc = params_.call.send_side_bwe;
1126 if (params_.call.send_side_bwe) { 1125 if (params_.call.send_side_bwe) {
1127 flexfec_receive_config.rtp_header_extensions.push_back( 1126 flexfec_receive_config.rtp_header_extensions.push_back(
1128 RtpExtension(RtpExtension::kTransportSequenceNumberUri, 1127 RtpExtension(RtpExtension::kTransportSequenceNumberUri,
1129 test::kTransportSequenceNumberExtensionId)); 1128 test::kTransportSequenceNumberExtensionId));
1130 } else { 1129 } else {
1131 flexfec_receive_config.rtp_header_extensions.push_back(RtpExtension( 1130 flexfec_receive_config.rtp_header_extensions.push_back(RtpExtension(
1132 RtpExtension::kAbsSendTimeUri, test::kAbsSendTimeExtensionId)); 1131 RtpExtension::kAbsSendTimeUri, test::kAbsSendTimeExtensionId));
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
1537 std::ostringstream str; 1536 std::ostringstream str;
1538 str << receive_logs_++; 1537 str << receive_logs_++;
1539 std::string path = 1538 std::string path =
1540 params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; 1539 params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf";
1541 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path), 1540 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path),
1542 10000000); 1541 10000000);
1543 } 1542 }
1544 } 1543 }
1545 1544
1546 } // namespace webrtc 1545 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/send_statistics_proxy_unittest.cc ('k') | webrtc/video/video_send_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698