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

Side by Side Diff: webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h

Issue 1520513003: Fixed lint warnings in webrtc/modules/remote_bitrate_estimator (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Comments from Stefan Created 5 years 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
11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_BWE_DEFINES_H_ 11 #ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_BWE_DEFINES_H_ 12 #define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_
13 13
14 #include "webrtc/typedefs.h" 14 #include "webrtc/typedefs.h"
15 15
16 #define BWE_MAX(a,b) ((a)>(b)?(a):(b)) 16 #define BWE_MAX(a, b) ((a) > (b) ? (a) : (b))
17 #define BWE_MIN(a,b) ((a)<(b)?(a):(b)) 17 #define BWE_MIN(a, b) ((a) < (b) ? (a) : (b))
18 18
19 namespace webrtc { 19 namespace webrtc {
20 20
21 static const int64_t kBitrateWindowMs = 1000; 21 static const int64_t kBitrateWindowMs = 1000;
22 22
23 enum BandwidthUsage 23 enum BandwidthUsage {
24 { 24 kBwNormal = 0,
25 kBwNormal = 0, 25 kBwUnderusing = 1,
26 kBwUnderusing = 1, 26 kBwOverusing = 2,
27 kBwOverusing = 2,
28 }; 27 };
29 28
30 enum RateControlState 29 enum RateControlState { kRcHold, kRcIncrease, kRcDecrease };
31 {
32 kRcHold,
33 kRcIncrease,
34 kRcDecrease
35 };
36 30
37 enum RateControlRegion 31 enum RateControlRegion { kRcNearMax, kRcAboveMax, kRcMaxUnknown };
38 {
39 kRcNearMax,
40 kRcAboveMax,
41 kRcMaxUnknown
42 };
43 32
44 class RateControlInput 33 class RateControlInput {
45 { 34 public:
46 public: 35 RateControlInput(BandwidthUsage bw_state,
47 RateControlInput(BandwidthUsage bwState, 36 uint32_t incoming_bitrate,
48 uint32_t incomingBitRate, 37 double noise_var)
49 double noiseVar) 38 : bw_state_(bw_state),
50 : _bwState(bwState), 39 incoming_bitrate_(incoming_bitrate),
51 _incomingBitRate(incomingBitRate), 40 noise_var_(noise_var) {}
52 _noiseVar(noiseVar) {}
53 41
54 BandwidthUsage _bwState; 42 BandwidthUsage bw_state_;
55 uint32_t _incomingBitRate; 43 uint32_t incoming_bitrate_;
56 double _noiseVar; 44 double noise_var_;
stefan-webrtc 2015/12/11 13:07:55 I'd actually prefer to switch to noise_var etc and
57 }; 45 };
58 } // namespace webrtc 46 } // namespace webrtc
59 47
60 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_BWE_DEFINES_H_ 48 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698