Index: webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h |
diff --git a/webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h b/webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h |
index 844fde5b717a5970983e970aa48cb86cdbf4e40e..c682e2ae2453c44bc3f437777197805ba2c120fd 100644 |
--- a/webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h |
+++ b/webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h |
@@ -8,53 +8,49 @@ |
* be found in the AUTHORS file in the root of the source tree. |
*/ |
-#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_BWE_DEFINES_H_ |
-#define WEBRTC_MODULES_RTP_RTCP_SOURCE_BWE_DEFINES_H_ |
+#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_ |
+#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_ |
#include "webrtc/typedefs.h" |
-#define BWE_MAX(a,b) ((a)>(b)?(a):(b)) |
-#define BWE_MIN(a,b) ((a)<(b)?(a):(b)) |
+#define BWE_MAX(a, b) ((a) > (b) ? (a) : (b)) |
+#define BWE_MIN(a, b) ((a) < (b) ? (a) : (b)) |
namespace webrtc { |
static const int64_t kBitrateWindowMs = 1000; |
-enum BandwidthUsage |
-{ |
+enum BandwidthUsage { |
kBwNormal = 0, |
kBwUnderusing = 1, |
kBwOverusing = 2, |
}; |
-enum RateControlState |
-{ |
+enum RateControlState { |
kRcHold, |
kRcIncrease, |
kRcDecrease |
}; |
-enum RateControlRegion |
-{ |
+enum RateControlRegion { |
kRcNearMax, |
kRcAboveMax, |
kRcMaxUnknown |
}; |
-class RateControlInput |
-{ |
-public: |
- RateControlInput(BandwidthUsage bwState, |
- uint32_t incomingBitRate, |
- double noiseVar) |
- : _bwState(bwState), |
- _incomingBitRate(incomingBitRate), |
- _noiseVar(noiseVar) {} |
- |
- BandwidthUsage _bwState; |
- uint32_t _incomingBitRate; |
- double _noiseVar; |
+class RateControlInput { |
+ public: |
+ RateControlInput(BandwidthUsage bwState, |
+ uint32_t incomingBitRate, |
+ double noiseVar) |
+ : _bwState(bwState), |
+ _incomingBitRate(incomingBitRate), |
+ _noiseVar(noiseVar) {} |
+ |
+ BandwidthUsage _bwState; |
+ uint32_t _incomingBitRate; |
+ double _noiseVar; |
stefan-webrtc
2015/12/11 11:08:50
Could you fix these too so that they match bw_stat
terelius
2015/12/11 13:06:09
Done.
|
}; |
} // namespace webrtc |
-#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_BWE_DEFINES_H_ |
+#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_ |