admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark test::DriftingClock constants as constexpr

Browse Source 
Bug: None
Change-Id: Ie9e2772c00a57c6020e8d60b0f125b6c442f205b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/152380
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29132}
This commit is contained in:
Danil Chapovalov 2019-09-10 13:28:58 +02:00 committed by Commit Bot
parent 2486aeb194
commit 01b7e929e2
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/drifting_clock.cc
View File

@ -14,9 +14,7 @@
namespace webrtc { namespace webrtc {
namespace test { namespace test {
const float DriftingClock::kDoubleSpeed = 2.0f; constexpr float DriftingClock::kNoDrift;
const float DriftingClock::kNoDrift = 1.0f;
const float DriftingClock::kHalfSpeed = 0.5f;
DriftingClock::DriftingClock(Clock* clock, float speed) DriftingClock::DriftingClock(Clock* clock, float speed)
: clock_(clock), drift_(speed - 1.0f), start_time_(clock_->CurrentTime()) { : clock_(clock), drift_(speed - 1.0f), start_time_(clock_->CurrentTime()) {

14
test/drifting_clock.h
View File

@ -19,16 +19,16 @@ namespace webrtc {
namespace test { namespace test {
class DriftingClock : public Clock { class DriftingClock : public Clock {
public: public:
// TODO(danilchap): Make this constants constexpr when it would be supported. static constexpr float kNoDrift = 1.0f;
static const float kDoubleSpeed; // 2.0f;
static const float kNoDrift; // 1.0f;
static const float kHalfSpeed; // 0.5f;
DriftingClock(Clock* clock, float speed); DriftingClock(Clock* clock, float speed);
// TODO(danilchap): Make this functions constexpr when it would be supported. static constexpr float PercentsFaster(float percent) {
static float PercentsFaster(float percent) { return 1.0f + percent / 100.0f; } return 1.0f + percent / 100.0f;
static float PercentsSlower(float percent) { return 1.0f - percent / 100.0f; } }
static constexpr float PercentsSlower(float percent) {
return 1.0f - percent / 100.0f;
}
Timestamp CurrentTime() override; Timestamp CurrentTime() override;
NtpTime CurrentNtpTime() override; NtpTime CurrentNtpTime() override;