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/rtp_stream_receiver.cc

Issue 1942683003: Jitter delay now depend on protection mode (FEC/NACK). (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Comment fix 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/video_receiver.cc ('k') | webrtc/video/video_stream_decoder.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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 VideoCodec red_codec = {}; 169 VideoCodec red_codec = {};
170 red_codec.codecType = kVideoCodecRED; 170 red_codec.codecType = kVideoCodecRED;
171 strncpy(red_codec.plName, "red", sizeof(red_codec.plName)); 171 strncpy(red_codec.plName, "red", sizeof(red_codec.plName));
172 red_codec.plType = config_.rtp.fec.red_payload_type; 172 red_codec.plType = config_.rtp.fec.red_payload_type;
173 RTC_CHECK(SetReceiveCodec(red_codec)); 173 RTC_CHECK(SetReceiveCodec(red_codec));
174 if (config_.rtp.fec.red_rtx_payload_type != -1) { 174 if (config_.rtp.fec.red_rtx_payload_type != -1) {
175 rtp_payload_registry_.SetRtxPayloadType( 175 rtp_payload_registry_.SetRtxPayloadType(
176 config_.rtp.fec.red_rtx_payload_type, 176 config_.rtp.fec.red_rtx_payload_type,
177 config_.rtp.fec.red_payload_type); 177 config_.rtp.fec.red_payload_type);
178 } 178 }
179
180 rtp_rtcp_->SetGenericFECStatus(true,
181 config_.rtp.fec.red_payload_type,
182 config_.rtp.fec.ulpfec_payload_type);
179 } 183 }
180 184
181 if (config.rtp.rtcp_xr.receiver_reference_time_report) 185 if (config.rtp.rtcp_xr.receiver_reference_time_report)
182 rtp_rtcp_->SetRtcpXrRrtrStatus(true); 186 rtp_rtcp_->SetRtcpXrRrtrStatus(true);
183 187
184 // Stats callback for CNAME changes. 188 // Stats callback for CNAME changes.
185 rtp_rtcp_->RegisterRtcpStatisticsCallback(receive_stats_proxy); 189 rtp_rtcp_->RegisterRtcpStatisticsCallback(receive_stats_proxy);
186 190
187 process_thread_->RegisterModule(rtp_receive_statistics_.get()); 191 process_thread_->RegisterModule(rtp_receive_statistics_.get());
188 process_thread_->RegisterModule(rtp_rtcp_.get()); 192 process_thread_->RegisterModule(rtp_rtcp_.get());
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 const std::string& extension, int id) { 537 const std::string& extension, int id) {
534 // One-byte-extension local identifiers are in the range 1-14 inclusive. 538 // One-byte-extension local identifiers are in the range 1-14 inclusive.
535 RTC_DCHECK_GE(id, 1); 539 RTC_DCHECK_GE(id, 1);
536 RTC_DCHECK_LE(id, 14); 540 RTC_DCHECK_LE(id, 14);
537 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension)); 541 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension));
538 RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension( 542 RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension(
539 StringToRtpExtensionType(extension), id)); 543 StringToRtpExtensionType(extension), id));
540 } 544 }
541 545
542 } // namespace webrtc 546 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/video_receiver.cc ('k') | webrtc/video/video_stream_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698