diff --git a/rtc_base/async_udp_socket.cc b/rtc_base/async_udp_socket.cc index 7e4b9378f6..7276a230b9 100644 --- a/rtc_base/async_udp_socket.cc +++ b/rtc_base/async_udp_socket.cc @@ -23,10 +23,10 @@ namespace rtc { -// Returns true if the the client is in the experiment to get timestamps -// from the socket implementation. -static bool IsScmTimeStampExperimentEnabled() { - return webrtc::field_trial::IsEnabled("WebRTC-SCM-Timestamp"); +// Returns true if the experiement "WebRTC-SCM-Timestamp" is explicitly +// disabled. +static bool IsScmTimeStampExperimentDisabled() { + return webrtc::field_trial::IsDisabled("WebRTC-SCM-Timestamp"); } AsyncUDPSocket* AsyncUDPSocket::Create(Socket* socket, @@ -133,7 +133,7 @@ void AsyncUDPSocket::OnReadEvent(Socket* socket) { } else { if (!socket_time_offset_) { socket_time_offset_ = - IsScmTimeStampExperimentEnabled() ? TimeMicros() - timestamp : 0; + !IsScmTimeStampExperimentDisabled() ? TimeMicros() - timestamp : 0; } timestamp += *socket_time_offset_; } diff --git a/rtc_base/physical_socket_server.cc b/rtc_base/physical_socket_server.cc index be7d9680e4..d42168249a 100644 --- a/rtc_base/physical_socket_server.cc +++ b/rtc_base/physical_socket_server.cc @@ -122,10 +122,10 @@ class ScopedSetTrue { bool* value_; }; -// Returns true if the the client is in the experiment to get timestamps -// from the socket implementation. -bool IsScmTimeStampExperimentEnabled() { - return webrtc::field_trial::IsEnabled("WebRTC-SCM-Timestamp"); +// Returns true if the experiement "WebRTC-SCM-Timestamp" is explicitly +// disabled. +bool IsScmTimeStampExperimentDisabled() { + return webrtc::field_trial::IsDisabled("WebRTC-SCM-Timestamp"); } } // namespace @@ -137,7 +137,7 @@ PhysicalSocket::PhysicalSocket(PhysicalSocketServer* ss, SOCKET s) error_(0), state_((s == INVALID_SOCKET) ? CS_CLOSED : CS_CONNECTED), resolver_(nullptr), - read_scm_timestamp_experiment_(IsScmTimeStampExperimentEnabled()) { + read_scm_timestamp_experiment_(!IsScmTimeStampExperimentDisabled()) { if (s_ != INVALID_SOCKET) { SetEnabledEvents(DE_READ | DE_WRITE); @@ -720,7 +720,7 @@ bool SocketDispatcher::Initialize() { ioctlsocket(s_, FIONBIO, &argp); #elif defined(WEBRTC_POSIX) fcntl(s_, F_SETFL, fcntl(s_, F_GETFL, 0) | O_NONBLOCK); - if (IsScmTimeStampExperimentEnabled()) { + if (!IsScmTimeStampExperimentDisabled()) { int value = 1; // Attempt to get receive packet timestamp from the socket. if (::setsockopt(s_, SOL_SOCKET, SO_TIMESTAMP, &value, sizeof(value)) != diff --git a/rtc_base/physical_socket_server_unittest.cc b/rtc_base/physical_socket_server_unittest.cc index ba8ac85e6c..f24c7e46ce 100644 --- a/rtc_base/physical_socket_server_unittest.cc +++ b/rtc_base/physical_socket_server_unittest.cc @@ -461,9 +461,6 @@ TEST_F(PhysicalSocketTest, TestGetSetOptionsIPv6) { #if defined(WEBRTC_POSIX) -#if !defined(WEBRTC_MAC) -// We don't get recv timestamps on Mac without the experiment -// WebRTC-SCM-Timestamp TEST_F(PhysicalSocketTest, TestSocketRecvTimestampIPv4) { MAYBE_SKIP_IPV4; SocketTest::TestSocketRecvTimestampIPv4(); @@ -472,18 +469,19 @@ TEST_F(PhysicalSocketTest, TestSocketRecvTimestampIPv4) { TEST_F(PhysicalSocketTest, TestSocketRecvTimestampIPv6) { SocketTest::TestSocketRecvTimestampIPv6(); } -#endif -TEST_F(PhysicalSocketTest, TestSocketRecvTimestampIPv4ScmExperiment) { +#if !defined(WEBRTC_MAC) +TEST_F(PhysicalSocketTest, TestSocketRecvTimestampIPv4ScmExperimentDisabled) { MAYBE_SKIP_IPV4; - webrtc::test::ScopedFieldTrials trial("WebRTC-SCM-Timestamp/Enabled/"); + webrtc::test::ScopedFieldTrials trial("WebRTC-SCM-Timestamp/Disabled/"); SocketTest::TestSocketRecvTimestampIPv4(); } -TEST_F(PhysicalSocketTest, TestSocketRecvTimestampIPv6ScmExperiment) { - webrtc::test::ScopedFieldTrials trial("WebRTC-SCM-Timestamp/Enabled/"); +TEST_F(PhysicalSocketTest, TestSocketRecvTimestampIPv6ScmExperimentDisabled) { + webrtc::test::ScopedFieldTrials trial("WebRTC-SCM-Timestamp/Disabled/"); SocketTest::TestSocketRecvTimestampIPv6(); } +#endif // Verify that if the socket was unable to be bound to a real network interface // (not loopback), Bind will return an error. @@ -524,14 +522,12 @@ TEST_F(PhysicalSocketTest, #endif -TEST_F(PhysicalSocketTest, UdpSocketRecvTimestampUseRtcEpochIPv4ScmExperiment) { +TEST_F(PhysicalSocketTest, UdpSocketRecvTimestampUseRtcEpochIPv4) { MAYBE_SKIP_IPV4; - webrtc::test::ScopedFieldTrials trial("WebRTC-SCM-Timestamp/Enabled/"); SocketTest::TestUdpSocketRecvTimestampUseRtcEpochIPv4(); } -TEST_F(PhysicalSocketTest, UdpSocketRecvTimestampUseRtcEpochIPv6ScmExperiment) { - webrtc::test::ScopedFieldTrials trial("WebRTC-SCM-Timestamp/Enabled/"); +TEST_F(PhysicalSocketTest, UdpSocketRecvTimestampUseRtcEpochIPv6) { SocketTest::TestUdpSocketRecvTimestampUseRtcEpochIPv6(); }