| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2016 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 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 return frame; | 221 return frame; |
| 222 } | 222 } |
| 223 }; | 223 }; |
| 224 | 224 |
| 225 // Disabled because it's flaky. | 225 // Disabled because it's flaky. |
| 226 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 | 226 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 |
| 227 TEST_F(ScreenCapturerIntegrationTest, DISABLED_CaptureUpdatedRegion) { | 227 TEST_F(ScreenCapturerIntegrationTest, DISABLED_CaptureUpdatedRegion) { |
| 228 TestCaptureUpdatedRegion(); | 228 TestCaptureUpdatedRegion(); |
| 229 } | 229 } |
| 230 | 230 |
| 231 TEST_F(ScreenCapturerIntegrationTest, TwoCapturers) { | 231 // Disabled because it's flaky. |
| 232 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 |
| 233 TEST_F(ScreenCapturerIntegrationTest, DISABLED_TwoCapturers) { |
| 232 std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_); | 234 std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_); |
| 233 SetUp(); | 235 SetUp(); |
| 234 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); | 236 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); |
| 235 } | 237 } |
| 236 | 238 |
| 237 #if defined(WEBRTC_WIN) | 239 #if defined(WEBRTC_WIN) |
| 238 | 240 |
| 239 TEST_F(ScreenCapturerIntegrationTest, CaptureUpdatedRegionWithDirectxCapturer) { | 241 // Disabled because it's flaky. |
| 242 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 |
| 243 TEST_F(ScreenCapturerIntegrationTest, |
| 244 DISABLED_CaptureUpdatedRegionWithDirectxCapturer) { |
| 240 if (!CreateDirectxCapturer()) { | 245 if (!CreateDirectxCapturer()) { |
| 241 return; | 246 return; |
| 242 } | 247 } |
| 243 | 248 |
| 244 TestCaptureUpdatedRegion(); | 249 TestCaptureUpdatedRegion(); |
| 245 } | 250 } |
| 246 | 251 |
| 247 TEST_F(ScreenCapturerIntegrationTest, TwoDirectxCapturers) { | 252 // Disabled because it's flaky. |
| 253 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 |
| 254 TEST_F(ScreenCapturerIntegrationTest, DISABLED_TwoDirectxCapturers) { |
| 248 if (!CreateDirectxCapturer()) { | 255 if (!CreateDirectxCapturer()) { |
| 249 return; | 256 return; |
| 250 } | 257 } |
| 251 | 258 |
| 252 std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_); | 259 std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_); |
| 253 RTC_CHECK(CreateDirectxCapturer()); | 260 RTC_CHECK(CreateDirectxCapturer()); |
| 254 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); | 261 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); |
| 255 } | 262 } |
| 256 | 263 |
| 264 // Disabled because it's flaky. |
| 265 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 |
| 257 TEST_F(ScreenCapturerIntegrationTest, | 266 TEST_F(ScreenCapturerIntegrationTest, |
| 258 CaptureUpdatedRegionWithMagnifierCapturer) { | 267 DISABLED_CaptureUpdatedRegionWithMagnifierCapturer) { |
| 259 CreateMagnifierCapturer(); | 268 CreateMagnifierCapturer(); |
| 260 TestCaptureUpdatedRegion(); | 269 TestCaptureUpdatedRegion(); |
| 261 } | 270 } |
| 262 | 271 |
| 263 TEST_F(ScreenCapturerIntegrationTest, TwoMagnifierCapturers) { | 272 // Disabled because it's flaky. |
| 273 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 |
| 274 TEST_F(ScreenCapturerIntegrationTest, DISABLED_TwoMagnifierCapturers) { |
| 264 CreateMagnifierCapturer(); | 275 CreateMagnifierCapturer(); |
| 265 std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_); | 276 std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_); |
| 266 CreateMagnifierCapturer(); | 277 CreateMagnifierCapturer(); |
| 267 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); | 278 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); |
| 268 } | 279 } |
| 269 | 280 |
| 281 // Disabled because it's flaky. |
| 282 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 |
| 270 TEST_F(ScreenCapturerIntegrationTest, | 283 TEST_F(ScreenCapturerIntegrationTest, |
| 271 MaybeCaptureUpdatedRegionWithDirectxCapturer) { | 284 DISABLED_MaybeCaptureUpdatedRegionWithDirectxCapturer) { |
| 272 // Even DirectX capturer is not supported in current system, we should be able | 285 // Even DirectX capturer is not supported in current system, we should be able |
| 273 // to select a usable capturer. | 286 // to select a usable capturer. |
| 274 MaybeCreateDirectxCapturer(); | 287 MaybeCreateDirectxCapturer(); |
| 275 TestCaptureUpdatedRegion(); | 288 TestCaptureUpdatedRegion(); |
| 276 } | 289 } |
| 277 | 290 |
| 278 #endif // defined(WEBRTC_WIN) | 291 #endif // defined(WEBRTC_WIN) |
| 279 | 292 |
| 280 } // namespace webrtc | 293 } // namespace webrtc |
| OLD | NEW |