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

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

Issue 2684113003: Fix bug in recv-bwe tests introduced when switching to send-side bwe by default in tests. (Closed)
Patch Set: Created 3 years, 10 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 | « no previous file | no next file » | 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 1127 matching lines...) Expand 10 before | Expand all | Expand 10 after
1138 video_encoder_config_.spatial_layers = params_.ss.spatial_layers; 1138 video_encoder_config_.spatial_layers = params_.ss.spatial_layers;
1139 1139
1140 CreateMatchingReceiveConfigs(recv_transport); 1140 CreateMatchingReceiveConfigs(recv_transport);
1141 1141
1142 for (size_t i = 0; i < num_video_streams; ++i) { 1142 for (size_t i = 0; i < num_video_streams; ++i) {
1143 video_receive_configs_[i].rtp.nack.rtp_history_ms = kNackRtpHistoryMs; 1143 video_receive_configs_[i].rtp.nack.rtp_history_ms = kNackRtpHistoryMs;
1144 video_receive_configs_[i].rtp.rtx_ssrc = kSendRtxSsrcs[i]; 1144 video_receive_configs_[i].rtp.rtx_ssrc = kSendRtxSsrcs[i];
1145 video_receive_configs_[i].rtp.rtx_payload_types[payload_type] = 1145 video_receive_configs_[i].rtp.rtx_payload_types[payload_type] =
1146 kSendRtxPayloadType; 1146 kSendRtxPayloadType;
1147 video_receive_configs_[i].rtp.transport_cc = params_.call.send_side_bwe; 1147 video_receive_configs_[i].rtp.transport_cc = params_.call.send_side_bwe;
1148 video_receive_configs_[i].rtp.remb = !params_.call.send_side_bwe;
1148 } 1149 }
1149 1150
1150 if (params_.video.flexfec) { 1151 if (params_.video.flexfec) {
1151 // Override send config constructed by CreateSendConfig. 1152 // Override send config constructed by CreateSendConfig.
1152 video_send_config_.rtp.flexfec.protected_media_ssrcs = { 1153 video_send_config_.rtp.flexfec.protected_media_ssrcs = {
1153 kVideoSendSsrcs[params_.ss.selected_stream]}; 1154 kVideoSendSsrcs[params_.ss.selected_stream]};
1154 1155
1155 // The matching receive config is _not_ created by 1156 // The matching receive config is _not_ created by
1156 // CreateMatchingReceiveConfigs, since VideoQualityTest is not a BaseTest. 1157 // CreateMatchingReceiveConfigs, since VideoQualityTest is not a BaseTest.
1157 // Set up the receive config manually instead. 1158 // Set up the receive config manually instead.
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
1589 std::ostringstream str; 1590 std::ostringstream str;
1590 str << receive_logs_++; 1591 str << receive_logs_++;
1591 std::string path = 1592 std::string path =
1592 params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; 1593 params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf";
1593 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path), 1594 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path),
1594 10000000); 1595 10000000);
1595 } 1596 }
1596 } 1597 }
1597 1598
1598 } // namespace webrtc 1599 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698