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

Side by Side Diff: webrtc/modules/video_coding/main/source/jitter_buffer_common.h

Issue 1266353003: Increase packet limit in jitter buffer. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 4 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 | « no previous file | 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) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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
11 #ifndef WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_COMMON_H_ 11 #ifndef WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_COMMON_H_
12 #define WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_COMMON_H_ 12 #define WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_COMMON_H_
13 13
14 #include "webrtc/typedefs.h" 14 #include "webrtc/typedefs.h"
15 15
16 namespace webrtc { 16 namespace webrtc {
17 17
18 // Used to estimate rolling average of packets per frame. 18 // Used to estimate rolling average of packets per frame.
19 static const float kFastConvergeMultiplier = 0.4f; 19 static const float kFastConvergeMultiplier = 0.4f;
20 static const float kNormalConvergeMultiplier = 0.2f; 20 static const float kNormalConvergeMultiplier = 0.2f;
21 21
22 enum { kMaxNumberOfFrames = 300 }; 22 enum { kMaxNumberOfFrames = 300 };
23 enum { kStartNumberOfFrames = 6 }; 23 enum { kStartNumberOfFrames = 6 };
24 enum { kMaxVideoDelayMs = 10000 }; 24 enum { kMaxVideoDelayMs = 10000 };
25 enum { kPacketsPerFrameMultiplier = 5 }; 25 enum { kPacketsPerFrameMultiplier = 5 };
26 enum { kFastConvergeThreshold = 5}; 26 enum { kFastConvergeThreshold = 5};
27 27
28 enum VCMJitterBufferEnum { 28 enum VCMJitterBufferEnum {
29 kMaxConsecutiveOldFrames = 60, 29 kMaxConsecutiveOldFrames = 60,
30 kMaxConsecutiveOldPackets = 300, 30 kMaxConsecutiveOldPackets = 300,
31 kMaxPacketsInSession = 800, 31 // TODO(sprang): Reduce this limit once codecs don't sometimes wildly
32 kBufferIncStepSizeBytes = 30000, // >20 packets. 32 // overshoot bitrate target.
33 kMaxJBFrameSizeBytes = 4000000 // sanity don't go above 4Mbyte. 33 kMaxPacketsInSession = 1400, // Allows ~2MB frames.
34 kBufferIncStepSizeBytes = 30000, // >20 packets.
35 kMaxJBFrameSizeBytes = 4000000 // sanity don't go above 4Mbyte.
34 }; 36 };
35 37
36 enum VCMFrameBufferEnum { 38 enum VCMFrameBufferEnum {
37 kOutOfBoundsPacket = -7, 39 kOutOfBoundsPacket = -7,
38 kNotInitialized = -6, 40 kNotInitialized = -6,
39 kOldPacket = -5, 41 kOldPacket = -5,
40 kGeneralError = -4, 42 kGeneralError = -4,
41 kFlushIndicator = -3, // Indicator that a flush has occurred. 43 kFlushIndicator = -3, // Indicator that a flush has occurred.
42 kTimeStampError = -2, 44 kTimeStampError = -2,
43 kSizeError = -1, 45 kSizeError = -1,
(...skipping 17 matching lines...) Expand all
61 enum VCMNaluCompleteness { 63 enum VCMNaluCompleteness {
62 kNaluUnset = 0, // Packet has not been filled. 64 kNaluUnset = 0, // Packet has not been filled.
63 kNaluComplete = 1, // Packet can be decoded as is. 65 kNaluComplete = 1, // Packet can be decoded as is.
64 kNaluStart, // Packet contain beginning of NALU 66 kNaluStart, // Packet contain beginning of NALU
65 kNaluIncomplete, // Packet is not beginning or end of NALU 67 kNaluIncomplete, // Packet is not beginning or end of NALU
66 kNaluEnd, // Packet is the end of a NALU 68 kNaluEnd, // Packet is the end of a NALU
67 }; 69 };
68 } // namespace webrtc 70 } // namespace webrtc
69 71
70 #endif // WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_COMMON_H_ 72 #endif // WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_COMMON_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698