| 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 <algorithm> | 10 #include <algorithm> |
| (...skipping 2243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2254 } while (!observation_complete_.Wait(20)); | 2254 } while (!observation_complete_.Wait(20)); |
| 2255 } | 2255 } |
| 2256 | 2256 |
| 2257 private: | 2257 private: |
| 2258 const int kTimeoutMs = 1000; | 2258 const int kTimeoutMs = 1000; |
| 2259 } test; | 2259 } test; |
| 2260 | 2260 |
| 2261 RunBaseTest(&test); | 2261 RunBaseTest(&test); |
| 2262 } | 2262 } |
| 2263 | 2263 |
| 2264 // Fails on Linux MSan: bugs.webrtc.org/7428 |
| 2265 #if defined(MEMORY_SANITIZER) |
| 2266 TEST_F(EndToEndTest, DISABLED_TriggerMidCallProbing) { |
| 2267 #else |
| 2264 TEST_F(EndToEndTest, TriggerMidCallProbing) { | 2268 TEST_F(EndToEndTest, TriggerMidCallProbing) { |
| 2269 #endif |
| 2270 |
| 2265 class TriggerMidCallProbingTest : public ProbingTest { | 2271 class TriggerMidCallProbingTest : public ProbingTest { |
| 2266 public: | 2272 public: |
| 2267 TriggerMidCallProbingTest() : ProbingTest(300000) {} | 2273 TriggerMidCallProbingTest() : ProbingTest(300000) {} |
| 2268 | 2274 |
| 2269 void PerformTest() override { | 2275 void PerformTest() override { |
| 2270 int64_t start_time_ms = clock_->TimeInMilliseconds(); | 2276 int64_t start_time_ms = clock_->TimeInMilliseconds(); |
| 2271 do { | 2277 do { |
| 2272 if (clock_->TimeInMilliseconds() - start_time_ms > kTimeoutMs) { | 2278 if (clock_->TimeInMilliseconds() - start_time_ms > kTimeoutMs) { |
| 2273 ADD_FAILURE() << "Timed out while waiting for mid-call probing."; | 2279 ADD_FAILURE() << "Timed out while waiting for mid-call probing."; |
| 2274 break; | 2280 break; |
| (...skipping 2020 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4295 std::unique_ptr<VideoEncoder> encoder_; | 4301 std::unique_ptr<VideoEncoder> encoder_; |
| 4296 std::unique_ptr<VideoDecoder> decoder_; | 4302 std::unique_ptr<VideoDecoder> decoder_; |
| 4297 rtc::CriticalSection crit_; | 4303 rtc::CriticalSection crit_; |
| 4298 int recorded_frames_ GUARDED_BY(crit_); | 4304 int recorded_frames_ GUARDED_BY(crit_); |
| 4299 } test(this); | 4305 } test(this); |
| 4300 | 4306 |
| 4301 RunBaseTest(&test); | 4307 RunBaseTest(&test); |
| 4302 } | 4308 } |
| 4303 | 4309 |
| 4304 } // namespace webrtc | 4310 } // namespace webrtc |
| OLD | NEW |