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

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

Issue 1946183002: Removing some old code which looked like it had to do with NACK handling but in reality did nothing. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 7 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/modules/video_coding/test/rtp_player.cc ('k') | webrtc/voice_engine/channel.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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 10
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 rtp_rtcp_->SetREMBStatus(true); 125 rtp_rtcp_->SetREMBStatus(true);
126 remb_->AddReceiveChannel(rtp_rtcp_.get()); 126 remb_->AddReceiveChannel(rtp_rtcp_.get());
127 } 127 }
128 128
129 for (size_t i = 0; i < config.rtp.extensions.size(); ++i) { 129 for (size_t i = 0; i < config.rtp.extensions.size(); ++i) {
130 EnableReceiveRtpHeaderExtension(config.rtp.extensions[i].name, 130 EnableReceiveRtpHeaderExtension(config.rtp.extensions[i].name,
131 config.rtp.extensions[i].id); 131 config.rtp.extensions[i].id);
132 } 132 }
133 133
134 static const int kMaxPacketAgeToNack = 450; 134 static const int kMaxPacketAgeToNack = 450;
135 NACKMethod nack_method = 135 const int max_reordering_threshold = (config.rtp.nack.rtp_history_ms > 0)
136 config.rtp.nack.rtp_history_ms > 0 ? kNackRtcp : kNackOff;
137 const int max_reordering_threshold = (nack_method == kNackRtcp)
138 ? kMaxPacketAgeToNack : kDefaultMaxReorderingThreshold; 136 ? kMaxPacketAgeToNack : kDefaultMaxReorderingThreshold;
139 rtp_receiver_->SetNACKStatus(nack_method);
140 rtp_receive_statistics_->SetMaxReorderingThreshold(max_reordering_threshold); 137 rtp_receive_statistics_->SetMaxReorderingThreshold(max_reordering_threshold);
141 138
142 // TODO(pbos): Support multiple RTX, per video payload. 139 // TODO(pbos): Support multiple RTX, per video payload.
143 for (const auto& kv : config_.rtp.rtx) { 140 for (const auto& kv : config_.rtp.rtx) {
144 RTC_DCHECK(kv.second.ssrc != 0); 141 RTC_DCHECK(kv.second.ssrc != 0);
145 RTC_DCHECK(kv.second.payload_type != 0); 142 RTC_DCHECK(kv.second.payload_type != 0);
146 143
147 rtp_payload_registry_.SetRtxSsrc(kv.second.ssrc); 144 rtp_payload_registry_.SetRtxSsrc(kv.second.ssrc);
148 rtp_payload_registry_.SetRtxPayloadType(kv.second.payload_type, 145 rtp_payload_registry_.SetRtxPayloadType(kv.second.payload_type,
149 kv.first); 146 kv.first);
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 const std::string& extension, int id) { 533 const std::string& extension, int id) {
537 // One-byte-extension local identifiers are in the range 1-14 inclusive. 534 // One-byte-extension local identifiers are in the range 1-14 inclusive.
538 RTC_DCHECK_GE(id, 1); 535 RTC_DCHECK_GE(id, 1);
539 RTC_DCHECK_LE(id, 14); 536 RTC_DCHECK_LE(id, 14);
540 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension)); 537 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension));
541 RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension( 538 RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension(
542 StringToRtpExtensionType(extension), id)); 539 StringToRtpExtensionType(extension), id));
543 } 540 }
544 541
545 } // namespace webrtc 542 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/test/rtp_player.cc ('k') | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698