diff options
| author | kjellander <kjellander@chromium.org> | 2015-12-17 01:53:14 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-17 09:53:56 +0000 |
| commit | 320988844613f7e79b423e76ad2d4acfe2c45437 (patch) | |
| tree | 0c88a0972996c56ea50cf9673d656d039877a50a /media/capture | |
| parent | bc3e1557791eb247d7bb820e1f8e96a55475119e (diff) | |
| download | chromium_src-320988844613f7e79b423e76ad2d4acfe2c45437.zip chromium_src-320988844613f7e79b423e76ad2d4acfe2c45437.tar.gz chromium_src-320988844613f7e79b423e76ad2d4acfe2c45437.tar.bz2 | |
Disable VideoCaptureDeviceTest.CaptureMjpeg on Win10.
When a webcam is available (at least with Logitech C920) it
fails like this:
[ RUN ] VideoCaptureDeviceTest.CaptureMjpeg
e:\b\build\slave\win_builder\build\src\media\capture\video\video_capture_device_unittest.cc(457): error: Value of: PIXEL_FORMAT_MJPEG
Actual: 14
Expected: last_format().pixel_format
Which is: 1
e:\b\build\slave\win_builder\build\src\media\capture\video\video_capture_device_unittest.cc(459): error: Expected: (static_cast<size_t>(1280 * 720)) >= (last_format().ImageAllocationSize()), actual: 921600 vs 1382400
[ FAILED ] VideoCaptureDeviceTest.CaptureMjpeg (707 ms)
BUG=570604
Review URL: https://codereview.chromium.org/1536593003
Cr-Commit-Position: refs/heads/master@{#365793}
Diffstat (limited to 'media/capture')
| -rw-r--r-- | media/capture/video/video_capture_device_unittest.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/media/capture/video/video_capture_device_unittest.cc b/media/capture/video/video_capture_device_unittest.cc index f3186e7..150a280 100644 --- a/media/capture/video/video_capture_device_unittest.cc +++ b/media/capture/video/video_capture_device_unittest.cc @@ -19,6 +19,7 @@ #if defined(OS_WIN) #include "base/win/scoped_com_initializer.h" +#include "base/win/windows_version.h" // For fine-grained suppression. #include "media/capture/video/win/video_capture_device_factory_win.h" #endif @@ -439,6 +440,12 @@ TEST_F(VideoCaptureDeviceTest, MAYBE_CaptureMjpeg) { VLOG(1) << "No camera supports MJPEG format. Exiting test."; return; } +#if defined(OS_WIN) + if (base::win::GetVersion() == base::win::VERSION_WIN10) { + VLOG(1) << "Skipped on Win10: http://crbug.com/570604."; + return; + } +#endif scoped_ptr<VideoCaptureDevice> device( video_capture_device_factory_->Create(*name)); ASSERT_TRUE(device); |