| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 #include <functional> | 10 #include <functional> |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 EXPECT_TRUE(receiver_log_.Wait()); | 295 EXPECT_TRUE(receiver_log_.Wait()); |
| 296 | 296 |
| 297 video_send_config_.rtp.extensions[0] = | 297 video_send_config_.rtp.extensions[0] = |
| 298 RtpExtension(RtpExtension::kAbsSendTime, kASTExtensionId); | 298 RtpExtension(RtpExtension::kAbsSendTime, kASTExtensionId); |
| 299 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog); | 299 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog); |
| 300 receiver_log_.PushExpectedLogLine("Switching to absolute send time RBE."); | 300 receiver_log_.PushExpectedLogLine("Switching to absolute send time RBE."); |
| 301 streams_.push_back(new Stream(this, false)); | 301 streams_.push_back(new Stream(this, false)); |
| 302 EXPECT_TRUE(receiver_log_.Wait()); | 302 EXPECT_TRUE(receiver_log_.Wait()); |
| 303 } | 303 } |
| 304 | 304 |
| 305 // Fails when run with ASan. See webrtc:5790. | 305 // Fails when run with ASan/MSan. See webrtc:5790. |
| 306 #if defined(ADDRESS_SANITIZER) | 306 #if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) |
| 307 #define MAYBE_SwitchesToASTThenBackToTOFForVideo \ | 307 #define MAYBE_SwitchesToASTThenBackToTOFForVideo \ |
| 308 DISABLED_SwitchesToASTThenBackToTOFForVideo | 308 DISABLED_SwitchesToASTThenBackToTOFForVideo |
| 309 #else | 309 #else |
| 310 #define MAYBE_SwitchesToASTThenBackToTOFForVideo \ | 310 #define MAYBE_SwitchesToASTThenBackToTOFForVideo \ |
| 311 SwitchesToASTThenBackToTOFForVideo | 311 SwitchesToASTThenBackToTOFForVideo |
| 312 #endif | 312 #endif |
| 313 TEST_F(BitrateEstimatorTest, MAYBE_SwitchesToASTThenBackToTOFForVideo) { | 313 TEST_F(BitrateEstimatorTest, MAYBE_SwitchesToASTThenBackToTOFForVideo) { |
| 314 video_send_config_.rtp.extensions.push_back( | 314 video_send_config_.rtp.extensions.push_back( |
| 315 RtpExtension(RtpExtension::kTOffset, kTOFExtensionId)); | 315 RtpExtension(RtpExtension::kTOffset, kTOFExtensionId)); |
| 316 receiver_log_.PushExpectedLogLine(kSingleStreamLog); | 316 receiver_log_.PushExpectedLogLine(kSingleStreamLog); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 330 RtpExtension(RtpExtension::kTOffset, kTOFExtensionId); | 330 RtpExtension(RtpExtension::kTOffset, kTOFExtensionId); |
| 331 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog); | 331 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog); |
| 332 receiver_log_.PushExpectedLogLine( | 332 receiver_log_.PushExpectedLogLine( |
| 333 "WrappingBitrateEstimator: Switching to transmission time offset RBE."); | 333 "WrappingBitrateEstimator: Switching to transmission time offset RBE."); |
| 334 streams_.push_back(new Stream(this, false)); | 334 streams_.push_back(new Stream(this, false)); |
| 335 streams_[0]->StopSending(); | 335 streams_[0]->StopSending(); |
| 336 streams_[1]->StopSending(); | 336 streams_[1]->StopSending(); |
| 337 EXPECT_TRUE(receiver_log_.Wait()); | 337 EXPECT_TRUE(receiver_log_.Wait()); |
| 338 } | 338 } |
| 339 } // namespace webrtc | 339 } // namespace webrtc |
| OLD | NEW |