Chromium Code Reviews| 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 TEST_F(BitrateEstimatorTest, SwitchesToASTThenBackToTOFForVideo) { | 305 // Crashes when run with ASan. See webrtc:5790. |
|
pbos-webrtc
2016/04/15 08:19:58
Not true, it fails, not crashes
| |
| 306 #if defined(ADDRESS_SANITIZER) && defined(WEBRTC_LINUX) | |
|
pbos-webrtc
2016/04/15 08:19:59
I don't think you need WEBRTC_LINUX here, we can d
| |
| 307 #define MAYBE_SwitchesToASTThenBackToTOFForVideo \ | |
| 308 DISABLED_SwitchesToASTThenBackToTOFForVideo | |
| 309 #else | |
| 310 #define MAYBE_SwitchesToASTThenBackToTOFForVideo \ | |
| 311 SwitchesToASTThenBackToTOFForVideo | |
| 312 #endif | |
| 313 TEST_F(BitrateEstimatorTest, MAYBE_SwitchesToASTThenBackToTOFForVideo) { | |
| 306 video_send_config_.rtp.extensions.push_back( | 314 video_send_config_.rtp.extensions.push_back( |
| 307 RtpExtension(RtpExtension::kTOffset, kTOFExtensionId)); | 315 RtpExtension(RtpExtension::kTOffset, kTOFExtensionId)); |
| 308 receiver_log_.PushExpectedLogLine(kSingleStreamLog); | 316 receiver_log_.PushExpectedLogLine(kSingleStreamLog); |
| 309 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog); | 317 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog); |
| 310 receiver_log_.PushExpectedLogLine(kSingleStreamLog); | 318 receiver_log_.PushExpectedLogLine(kSingleStreamLog); |
| 311 streams_.push_back(new Stream(this, false)); | 319 streams_.push_back(new Stream(this, false)); |
| 312 EXPECT_TRUE(receiver_log_.Wait()); | 320 EXPECT_TRUE(receiver_log_.Wait()); |
| 313 | 321 |
| 314 video_send_config_.rtp.extensions[0] = | 322 video_send_config_.rtp.extensions[0] = |
| 315 RtpExtension(RtpExtension::kAbsSendTime, kASTExtensionId); | 323 RtpExtension(RtpExtension::kAbsSendTime, kASTExtensionId); |
| 316 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog); | 324 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog); |
| 317 receiver_log_.PushExpectedLogLine("Switching to absolute send time RBE."); | 325 receiver_log_.PushExpectedLogLine("Switching to absolute send time RBE."); |
| 318 streams_.push_back(new Stream(this, false)); | 326 streams_.push_back(new Stream(this, false)); |
| 319 EXPECT_TRUE(receiver_log_.Wait()); | 327 EXPECT_TRUE(receiver_log_.Wait()); |
| 320 | 328 |
| 321 video_send_config_.rtp.extensions[0] = | 329 video_send_config_.rtp.extensions[0] = |
| 322 RtpExtension(RtpExtension::kTOffset, kTOFExtensionId); | 330 RtpExtension(RtpExtension::kTOffset, kTOFExtensionId); |
| 323 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog); | 331 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog); |
| 324 receiver_log_.PushExpectedLogLine( | 332 receiver_log_.PushExpectedLogLine( |
| 325 "WrappingBitrateEstimator: Switching to transmission time offset RBE."); | 333 "WrappingBitrateEstimator: Switching to transmission time offset RBE."); |
| 326 streams_.push_back(new Stream(this, false)); | 334 streams_.push_back(new Stream(this, false)); |
| 327 streams_[0]->StopSending(); | 335 streams_[0]->StopSending(); |
| 328 streams_[1]->StopSending(); | 336 streams_[1]->StopSending(); |
| 329 EXPECT_TRUE(receiver_log_.Wait()); | 337 EXPECT_TRUE(receiver_log_.Wait()); |
| 330 } | 338 } |
| 331 } // namespace webrtc | 339 } // namespace webrtc |
| OLD | NEW |