Commit 71232d1a authored by Ian Vollick's avatar Ian Vollick Committed by Commit Bot

Fix capture unittests on Android

We test that mjpeg capture is supported on android, but
VideoCaptureDeviceFactoryAndroid's GetSupportedFormats will
never support it. Consequently, we should mark this test
as disabled on the platform.

Bug: 976160
Change-Id: I3a288cda32ffe8593e5272de2c0bc621e0d79d25
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1685854Reviewed-by: default avatarChristian Fremerey <chfremer@chromium.org>
Commit-Queue: Ian Vollick <vollick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#675830}
parent b4bd501c
...@@ -81,7 +81,9 @@ ...@@ -81,7 +81,9 @@
DISABLED_UsingRealWebcam_CheckPhotoCallbackRelease DISABLED_UsingRealWebcam_CheckPhotoCallbackRelease
#elif defined(OS_ANDROID) #elif defined(OS_ANDROID)
#define MAYBE_UsingRealWebcam_AllocateBadSize UsingRealWebcam_AllocateBadSize #define MAYBE_UsingRealWebcam_AllocateBadSize UsingRealWebcam_AllocateBadSize
#define MAYBE_UsingRealWebcam_CaptureMjpeg UsingRealWebcam_CaptureMjpeg // This format is not returned by VideoCaptureDeviceFactoryAndroid's
// GetSupportedFormats
#define MAYBE_UsingRealWebcam_CaptureMjpeg DISABLED_UsingRealWebcam_CaptureMjpeg
#define MAYBE_UsingRealWebcam_TakePhoto UsingRealWebcam_TakePhoto #define MAYBE_UsingRealWebcam_TakePhoto UsingRealWebcam_TakePhoto
#define MAYBE_UsingRealWebcam_GetPhotoState UsingRealWebcam_GetPhotoState #define MAYBE_UsingRealWebcam_GetPhotoState UsingRealWebcam_GetPhotoState
#define MAYBE_UsingRealWebcam_CaptureWithSize UsingRealWebcam_CaptureWithSize #define MAYBE_UsingRealWebcam_CaptureWithSize UsingRealWebcam_CaptureWithSize
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment