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 | 10 |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 264 | 264 |
| 265 // Verify that the region contains whole screen. | 265 // Verify that the region contains whole screen. |
| 266 EXPECT_FALSE(frame->updated_region().is_empty()); | 266 EXPECT_FALSE(frame->updated_region().is_empty()); |
| 267 DesktopRegion::Iterator it(frame->updated_region()); | 267 DesktopRegion::Iterator it(frame->updated_region()); |
| 268 ASSERT_TRUE(!it.IsAtEnd()); | 268 ASSERT_TRUE(!it.IsAtEnd()); |
| 269 EXPECT_TRUE(it.rect().equals(DesktopRect::MakeSize(frame->size()))); | 269 EXPECT_TRUE(it.rect().equals(DesktopRect::MakeSize(frame->size()))); |
| 270 it.Advance(); | 270 it.Advance(); |
| 271 EXPECT_TRUE(it.IsAtEnd()); | 271 EXPECT_TRUE(it.IsAtEnd()); |
| 272 } | 272 } |
| 273 | 273 |
| 274 TEST_F(ScreenCapturerTest, CaptureUpdatedRegion) { | 274 TEST_F(ScreenCapturerTest, DISABLED_CaptureUpdatedRegion) { |
|
kjellander_webrtc
2016/09/15 09:59:37
Please add a reference to the bug in a comment abo
| |
| 275 TestCaptureUpdatedRegion(); | 275 TestCaptureUpdatedRegion(); |
| 276 } | 276 } |
| 277 | 277 |
| 278 // TODO(zijiehe): Find out the reason of failure of this test on trybot. | 278 // TODO(zijiehe): Find out the reason of failure of this test on trybot. |
| 279 TEST_F(ScreenCapturerTest, DISABLED_TwoCapturers) { | 279 TEST_F(ScreenCapturerTest, DISABLED_TwoCapturers) { |
| 280 std::unique_ptr<ScreenCapturer> capturer2 = std::move(capturer_); | 280 std::unique_ptr<ScreenCapturer> capturer2 = std::move(capturer_); |
| 281 SetUp(); | 281 SetUp(); |
| 282 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); | 282 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); |
| 283 } | 283 } |
| 284 | 284 |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 340 | 340 |
| 341 capturer_->Start(&callback_); | 341 capturer_->Start(&callback_); |
| 342 capturer_->SetSharedMemoryFactory( | 342 capturer_->SetSharedMemoryFactory( |
| 343 std::unique_ptr<SharedMemoryFactory>(new FakeSharedMemoryFactory())); | 343 std::unique_ptr<SharedMemoryFactory>(new FakeSharedMemoryFactory())); |
| 344 capturer_->Capture(DesktopRegion()); | 344 capturer_->Capture(DesktopRegion()); |
| 345 ASSERT_TRUE(frame); | 345 ASSERT_TRUE(frame); |
| 346 ASSERT_TRUE(frame->shared_memory()); | 346 ASSERT_TRUE(frame->shared_memory()); |
| 347 EXPECT_EQ(frame->shared_memory()->id(), kTestSharedMemoryId); | 347 EXPECT_EQ(frame->shared_memory()->id(), kTestSharedMemoryId); |
| 348 } | 348 } |
| 349 | 349 |
| 350 TEST_F(ScreenCapturerTest, CaptureUpdatedRegionWithDirectxCapturer) { | 350 TEST_F(ScreenCapturerTest, DISABLED_CaptureUpdatedRegionWithDirectxCapturer) { |
| 351 if (!CreateDirectxCapturer()) { | 351 if (!CreateDirectxCapturer()) { |
| 352 return; | 352 return; |
| 353 } | 353 } |
| 354 | 354 |
| 355 TestCaptureUpdatedRegion(); | 355 TestCaptureUpdatedRegion(); |
| 356 } | 356 } |
| 357 | 357 |
| 358 TEST_F(ScreenCapturerTest, TwoDirectxCapturers) { | 358 TEST_F(ScreenCapturerTest, DISABLED_TwoDirectxCapturers) { |
| 359 if (!CreateDirectxCapturer()) { | 359 if (!CreateDirectxCapturer()) { |
| 360 return; | 360 return; |
| 361 } | 361 } |
| 362 | 362 |
| 363 std::unique_ptr<ScreenCapturer> capturer2 = std::move(capturer_); | 363 std::unique_ptr<ScreenCapturer> capturer2 = std::move(capturer_); |
| 364 RTC_CHECK(CreateDirectxCapturer()); | 364 RTC_CHECK(CreateDirectxCapturer()); |
| 365 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); | 365 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); |
| 366 } | 366 } |
| 367 | 367 |
| 368 TEST_F(ScreenCapturerTest, TwoMagnifierCapturers) { | 368 TEST_F(ScreenCapturerTest, DISABLED_TwoMagnifierCapturers) { |
| 369 CreateMagnifierCapturer(); | 369 CreateMagnifierCapturer(); |
| 370 std::unique_ptr<ScreenCapturer> capturer2 = std::move(capturer_); | 370 std::unique_ptr<ScreenCapturer> capturer2 = std::move(capturer_); |
| 371 CreateMagnifierCapturer(); | 371 CreateMagnifierCapturer(); |
| 372 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); | 372 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); |
| 373 } | 373 } |
| 374 | 374 |
| 375 #endif // defined(WEBRTC_WIN) | 375 #endif // defined(WEBRTC_WIN) |
| 376 | 376 |
| 377 } // namespace webrtc | 377 } // namespace webrtc |
| OLD | NEW |