| Index: webrtc/system_wrappers/source/rtp_to_ntp_unittest.cc
|
| diff --git a/webrtc/system_wrappers/source/rtp_to_ntp_unittest.cc b/webrtc/system_wrappers/source/rtp_to_ntp_unittest.cc
|
| index 4c166774a430dc2d63b9a60305bb4ca3cf8cc3bf..d2929f5cbc00763470821ee7282b5965d3a82c8c 100644
|
| --- a/webrtc/system_wrappers/source/rtp_to_ntp_unittest.cc
|
| +++ b/webrtc/system_wrappers/source/rtp_to_ntp_unittest.cc
|
| @@ -12,6 +12,10 @@
|
| #include "webrtc/system_wrappers/include/rtp_to_ntp.h"
|
|
|
| namespace webrtc {
|
| +namespace {
|
| +const uint32_t kOneMsInNtpFrac = 4294967;
|
| +const uint32_t kTimestampTicksPerMs = 90;
|
| +} // namespace
|
|
|
| TEST(WrapAroundTests, NoWrap) {
|
| EXPECT_EQ(0, CheckForWrapArounds(0xFFFFFFFF, 0xFFFFFFFE));
|
| @@ -38,8 +42,6 @@ TEST(WrapAroundTests, OldRtcpWrapped) {
|
| uint32_t ntp_sec = 0;
|
| uint32_t ntp_frac = 0;
|
| uint32_t timestamp = 0;
|
| - const uint32_t kOneMsInNtpFrac = 4294967;
|
| - const uint32_t kTimestampTicksPerMs = 90;
|
| rtcp.push_front(RtcpMeasurement(ntp_sec, ntp_frac, timestamp));
|
| ntp_frac += kOneMsInNtpFrac;
|
| timestamp -= kTimestampTicksPerMs;
|
| @@ -57,8 +59,6 @@ TEST(WrapAroundTests, NewRtcpWrapped) {
|
| uint32_t ntp_sec = 0;
|
| uint32_t ntp_frac = 0;
|
| uint32_t timestamp = 0xFFFFFFFF;
|
| - const uint32_t kOneMsInNtpFrac = 4294967;
|
| - const uint32_t kTimestampTicksPerMs = 90;
|
| rtcp.push_front(RtcpMeasurement(ntp_sec, ntp_frac, timestamp));
|
| ntp_frac += kOneMsInNtpFrac;
|
| timestamp += kTimestampTicksPerMs;
|
| @@ -71,8 +71,6 @@ TEST(WrapAroundTests, NewRtcpWrapped) {
|
| }
|
|
|
| TEST(WrapAroundTests, RtpWrapped) {
|
| - const uint32_t kOneMsInNtpFrac = 4294967;
|
| - const uint32_t kTimestampTicksPerMs = 90;
|
| RtcpList rtcp;
|
| uint32_t ntp_sec = 0;
|
| uint32_t ntp_frac = 0;
|
| @@ -91,8 +89,6 @@ TEST(WrapAroundTests, RtpWrapped) {
|
| }
|
|
|
| TEST(WrapAroundTests, OldRtp_RtcpsWrapped) {
|
| - const uint32_t kOneMsInNtpFrac = 4294967;
|
| - const uint32_t kTimestampTicksPerMs = 90;
|
| RtcpList rtcp;
|
| uint32_t ntp_sec = 0;
|
| uint32_t ntp_frac = 0;
|
| @@ -108,8 +104,6 @@ TEST(WrapAroundTests, OldRtp_RtcpsWrapped) {
|
| }
|
|
|
| TEST(WrapAroundTests, OldRtp_NewRtcpWrapped) {
|
| - const uint32_t kOneMsInNtpFrac = 4294967;
|
| - const uint32_t kTimestampTicksPerMs = 90;
|
| RtcpList rtcp;
|
| uint32_t ntp_sec = 0;
|
| uint32_t ntp_frac = 0;
|
| @@ -128,8 +122,6 @@ TEST(WrapAroundTests, OldRtp_NewRtcpWrapped) {
|
| }
|
|
|
| TEST(WrapAroundTests, OldRtp_OldRtcpWrapped) {
|
| - const uint32_t kOneMsInNtpFrac = 4294967;
|
| - const uint32_t kTimestampTicksPerMs = 90;
|
| RtcpList rtcp;
|
| uint32_t ntp_sec = 0;
|
| uint32_t ntp_frac = 0;
|
|
|