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

Side by Side Diff: webrtc/modules/video_coding/media_opt_util.h

Issue 1942683003: Jitter delay now depend on protection mode (FEC/NACK). (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase and pretty much reimplemeted the 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
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 27 matching lines...) Expand all
38 kNoFilter, // No filtering on received loss. 38 kNoFilter, // No filtering on received loss.
39 kAvgFilter, // Recursive average filter. 39 kAvgFilter, // Recursive average filter.
40 kMaxFilter // Max-window filter, over the time interval of: 40 kMaxFilter // Max-window filter, over the time interval of:
41 // (kLossPrHistorySize * kLossPrShortFilterWinMs) ms. 41 // (kLossPrHistorySize * kLossPrShortFilterWinMs) ms.
42 }; 42 };
43 43
44 // Thresholds for hybrid NACK/FEC 44 // Thresholds for hybrid NACK/FEC
45 // common to media optimization and the jitter buffer. 45 // common to media optimization and the jitter buffer.
46 const int64_t kLowRttNackMs = 20; 46 const int64_t kLowRttNackMs = 20;
47 47
48 // If the RTT is higher than this, then it wont be added to
stefan-webrtc 2016/05/06 14:11:46 If the RTT is higher than this an extra RTT wont b
philipel 2016/05/06 15:12:11 Done.
49 // the jitter buffer delay.
50 const int kMaxRttDelayThreshold = 500;
51
48 struct VCMProtectionParameters { 52 struct VCMProtectionParameters {
49 VCMProtectionParameters() 53 VCMProtectionParameters()
50 : rtt(0), 54 : rtt(0),
51 lossPr(0.0f), 55 lossPr(0.0f),
52 bitRate(0.0f), 56 bitRate(0.0f),
53 packetsPerFrame(0.0f), 57 packetsPerFrame(0.0f),
54 packetsPerFrameKey(0.0f), 58 packetsPerFrameKey(0.0f),
55 frameRate(0.0f), 59 frameRate(0.0f),
56 keyFrameSize(0.0f), 60 keyFrameSize(0.0f),
57 fecRateDelta(0), 61 fecRateDelta(0),
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 rtc::ExpFilter _packetsPerFrameKey; 353 rtc::ExpFilter _packetsPerFrameKey;
350 uint16_t _codecWidth; 354 uint16_t _codecWidth;
351 uint16_t _codecHeight; 355 uint16_t _codecHeight;
352 int _numLayers; 356 int _numLayers;
353 }; 357 };
354 358
355 } // namespace media_optimization 359 } // namespace media_optimization
356 } // namespace webrtc 360 } // namespace webrtc
357 361
358 #endif // WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPT_UTIL_H_ 362 #endif // WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPT_UTIL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698