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

Side by Side Diff: webrtc/modules/video_coding/video_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/media_opt_util.h ('k') | webrtc/video/rtp_stream_receiver.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) 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 10
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 switch (videoProtection) { 161 switch (videoProtection) {
162 case kProtectionNack: { 162 case kProtectionNack: {
163 RTC_DCHECK(enable); 163 RTC_DCHECK(enable);
164 _receiver.SetNackMode(kNack, -1, -1); 164 _receiver.SetNackMode(kNack, -1, -1);
165 break; 165 break;
166 } 166 }
167 167
168 case kProtectionNackFEC: { 168 case kProtectionNackFEC: {
169 rtc::CritScope cs(&receive_crit_); 169 rtc::CritScope cs(&receive_crit_);
170 RTC_DCHECK(enable); 170 RTC_DCHECK(enable);
171 _receiver.SetNackMode(kNack, media_optimization::kLowRttNackMs, -1); 171 _receiver.SetNackMode(kNack,
172 media_optimization::kLowRttNackMs,
173 media_optimization::kMaxRttDelayThreshold);
172 _receiver.SetDecodeErrorMode(kNoErrors); 174 _receiver.SetDecodeErrorMode(kNoErrors);
173 break; 175 break;
174 } 176 }
175 case kProtectionFEC: 177 case kProtectionFEC:
176 case kProtectionNone: 178 case kProtectionNone:
177 // No receiver-side protection. 179 // No receiver-side protection.
178 RTC_DCHECK(enable); 180 RTC_DCHECK(enable);
179 _receiver.SetNackMode(kNoNack, -1, -1); 181 _receiver.SetNackMode(kNoNack, -1, -1);
180 _receiver.SetDecodeErrorMode(kWithErrors); 182 _receiver.SetDecodeErrorMode(kWithErrors);
181 break; 183 break;
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 _receiver.SetNackSettings(max_nack_list_size, max_packet_age_to_nack, 504 _receiver.SetNackSettings(max_nack_list_size, max_packet_age_to_nack,
503 max_incomplete_time_ms); 505 max_incomplete_time_ms);
504 } 506 }
505 507
506 int VideoReceiver::SetMinReceiverDelay(int desired_delay_ms) { 508 int VideoReceiver::SetMinReceiverDelay(int desired_delay_ms) {
507 return _receiver.SetMinReceiverDelay(desired_delay_ms); 509 return _receiver.SetMinReceiverDelay(desired_delay_ms);
508 } 510 }
509 511
510 } // namespace vcm 512 } // namespace vcm
511 } // namespace webrtc 513 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/media_opt_util.h ('k') | webrtc/video/rtp_stream_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698