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

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

Issue 2649323010: Revert of Make RTX pt/apt reconfigurable by calling WebRtcVideoChannel2::SetRecvParameters. (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 | « webrtc/video/rtp_stream_receiver.cc ('k') | webrtc/video/video_receive_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 1106 matching lines...) Expand 10 before | Expand all | Expand 10 after
1117 } 1117 }
1118 video_encoder_config_.video_stream_factory = 1118 video_encoder_config_.video_stream_factory =
1119 new rtc::RefCountedObject<VideoStreamFactory>(params_.ss.streams); 1119 new rtc::RefCountedObject<VideoStreamFactory>(params_.ss.streams);
1120 1120
1121 video_encoder_config_.spatial_layers = params_.ss.spatial_layers; 1121 video_encoder_config_.spatial_layers = params_.ss.spatial_layers;
1122 1122
1123 CreateMatchingReceiveConfigs(recv_transport); 1123 CreateMatchingReceiveConfigs(recv_transport);
1124 1124
1125 for (size_t i = 0; i < num_video_streams; ++i) { 1125 for (size_t i = 0; i < num_video_streams; ++i) {
1126 video_receive_configs_[i].rtp.nack.rtp_history_ms = kNackRtpHistoryMs; 1126 video_receive_configs_[i].rtp.nack.rtp_history_ms = kNackRtpHistoryMs;
1127 video_receive_configs_[i].rtp.rtx_ssrc = kSendRtxSsrcs[i]; 1127 video_receive_configs_[i].rtp.rtx[payload_type].ssrc = kSendRtxSsrcs[i];
1128 video_receive_configs_[i].rtp.rtx_payload_types[payload_type] = 1128 video_receive_configs_[i].rtp.rtx[payload_type].payload_type =
1129 kSendRtxPayloadType; 1129 kSendRtxPayloadType;
1130 video_receive_configs_[i].rtp.transport_cc = params_.call.send_side_bwe; 1130 video_receive_configs_[i].rtp.transport_cc = params_.call.send_side_bwe;
1131 } 1131 }
1132 1132
1133 if (params_.video.flexfec) { 1133 if (params_.video.flexfec) {
1134 // Override send config constructed by CreateSendConfig. 1134 // Override send config constructed by CreateSendConfig.
1135 video_send_config_.rtp.flexfec.protected_media_ssrcs = { 1135 video_send_config_.rtp.flexfec.protected_media_ssrcs = {
1136 kVideoSendSsrcs[params_.ss.selected_stream]}; 1136 kVideoSendSsrcs[params_.ss.selected_stream]};
1137 1137
1138 // The matching receive config is _not_ created by 1138 // The matching receive config is _not_ created by
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
1569 std::ostringstream str; 1569 std::ostringstream str;
1570 str << receive_logs_++; 1570 str << receive_logs_++;
1571 std::string path = 1571 std::string path =
1572 params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; 1572 params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf";
1573 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path), 1573 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path),
1574 10000000); 1574 10000000);
1575 } 1575 }
1576 } 1576 }
1577 1577
1578 } // namespace webrtc 1578 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/rtp_stream_receiver.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698