| 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..3fb7e29e5b2fac5a1232c4bb78fd0cec7c4517f6 100644
|
| --- a/webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h
|
| +++ b/webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h
|
| @@ -8,53 +8,40 @@
|
| * 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
|
| -{
|
| - kBwNormal = 0,
|
| - kBwUnderusing = 1,
|
| - kBwOverusing = 2,
|
| +enum BandwidthUsage {
|
| + kBwNormal = 0,
|
| + kBwUnderusing = 1,
|
| + kBwOverusing = 2,
|
| };
|
|
|
| -enum RateControlState
|
| -{
|
| - kRcHold,
|
| - kRcIncrease,
|
| - kRcDecrease
|
| -};
|
| +enum RateControlState { kRcHold, kRcIncrease, kRcDecrease };
|
|
|
| -enum RateControlRegion
|
| -{
|
| - kRcNearMax,
|
| - kRcAboveMax,
|
| - kRcMaxUnknown
|
| -};
|
| +enum RateControlRegion { kRcNearMax, kRcAboveMax, kRcMaxUnknown };
|
| +
|
| +struct RateControlInput {
|
| + RateControlInput(BandwidthUsage bw_state,
|
| + uint32_t incoming_bitrate,
|
| + double noise_var)
|
| + : bw_state(bw_state),
|
| + incoming_bitrate(incoming_bitrate),
|
| + noise_var(noise_var) {}
|
|
|
| -class RateControlInput
|
| -{
|
| -public:
|
| - RateControlInput(BandwidthUsage bwState,
|
| - uint32_t incomingBitRate,
|
| - double noiseVar)
|
| - : _bwState(bwState),
|
| - _incomingBitRate(incomingBitRate),
|
| - _noiseVar(noiseVar) {}
|
| -
|
| - BandwidthUsage _bwState;
|
| - uint32_t _incomingBitRate;
|
| - double _noiseVar;
|
| + BandwidthUsage bw_state;
|
| + uint32_t incoming_bitrate;
|
| + double noise_var;
|
| };
|
| } // namespace webrtc
|
|
|
| -#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_BWE_DEFINES_H_
|
| +#endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_
|
|
|