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

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

Issue 2542113003: Simplify an always true condition. (Closed)
Patch Set: Created 4 years 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/modules/congestion_controller/include/congestion_controller.h ('k') | 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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_send_stream.h" 10 #include "webrtc/video/video_send_stream.h"
(...skipping 1076 matching lines...) Expand 10 before | Expand all | Expand 10 after
1087 if (!IsRedEnabled()) { 1087 if (!IsRedEnabled()) {
1088 LOG(LS_WARNING) 1088 LOG(LS_WARNING)
1089 << "ULPFEC is enabled but RED is disabled. Disabling ULPFEC."; 1089 << "ULPFEC is enabled but RED is disabled. Disabling ULPFEC.";
1090 DisableUlpfec(); 1090 DisableUlpfec();
1091 } 1091 }
1092 } 1092 }
1093 1093
1094 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) { 1094 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
1095 // Set NACK. 1095 // Set NACK.
1096 rtp_rtcp->SetStorePacketsStatus( 1096 rtp_rtcp->SetStorePacketsStatus(
1097 nack_enabled || congestion_controller_->pacer(), 1097 true,
1098 kMinSendSidePacketHistorySize); 1098 kMinSendSidePacketHistorySize);
1099 // Set RED/ULPFEC information. 1099 // Set RED/ULPFEC information.
1100 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) { 1100 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
1101 rtp_rtcp->SetUlpfecConfig(red_payload_type, ulpfec_payload_type); 1101 rtp_rtcp->SetUlpfecConfig(red_payload_type, ulpfec_payload_type);
1102 } 1102 }
1103 } 1103 }
1104 1104
1105 // Currently, both ULPFEC and FlexFEC use the same FEC rate calculation logic, 1105 // Currently, both ULPFEC and FlexFEC use the same FEC rate calculation logic,
1106 // so enable that logic if either of those FEC schemes are enabled. 1106 // so enable that logic if either of those FEC schemes are enabled.
1107 protection_bitrate_calculator_.SetProtectionMethod( 1107 protection_bitrate_calculator_.SetProtectionMethod(
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
1270 const uint16_t mtu = static_cast<uint16_t>( 1270 const uint16_t mtu = static_cast<uint16_t>(
1271 config_->rtp.max_packet_size + transport_overhead_bytes_per_packet); 1271 config_->rtp.max_packet_size + transport_overhead_bytes_per_packet);
1272 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) { 1272 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
1273 rtp_rtcp->SetTransportOverhead(transport_overhead_bytes_per_packet); 1273 rtp_rtcp->SetTransportOverhead(transport_overhead_bytes_per_packet);
1274 rtp_rtcp->SetMaxTransferUnit(mtu); 1274 rtp_rtcp->SetMaxTransferUnit(mtu);
1275 } 1275 }
1276 } 1276 }
1277 1277
1278 } // namespace internal 1278 } // namespace internal
1279 } // namespace webrtc 1279 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/congestion_controller/include/congestion_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698