Commit de26f290 authored by Elly Fong-Jones's avatar Elly Fong-Jones Committed by Chromium LUCI CQ

mac: disable some capture unittests on arm64

These tests are being bulk-disabled as part of arm64 bot stabilization.

Bug: 1154345
Change-Id: I903627c4ea56a175716a9618b73e1ed6fd330531
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2570195Reviewed-by: default avatarHenrik Boström <hbos@chromium.org>
Reviewed-by: default avatarEvan Shrubsole <eshr@google.com>
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833336}
parent 6320d83a
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <vector> #include <vector>
#include "base/logging.h" #include "base/logging.h"
#include "build/build_config.h"
#include "media/capture/video/mac/pixel_buffer_pool_mac.h" #include "media/capture/video/mac/pixel_buffer_pool_mac.h"
#include "media/capture/video/mac/test/pixel_buffer_test_utils_mac.h" #include "media/capture/video/mac/test/pixel_buffer_test_utils_mac.h"
#include "media/capture/video/mac/video_capture_device_avfoundation_utils_mac.h" #include "media/capture/video/mac/video_capture_device_avfoundation_utils_mac.h"
...@@ -59,7 +60,14 @@ TEST(PixelBufferTransfererTest, CanCopyYuvsAndVerifyColor) { ...@@ -59,7 +60,14 @@ TEST(PixelBufferTransfererTest, CanCopyYuvsAndVerifyColor) {
kColorR, kColorG, kColorB)); kColorR, kColorG, kColorB));
} }
TEST(PixelBufferTransfererTest, CanScaleYuvsAndVerifyColor) { #if defined(ARCH_CPU_ARM64)
// Bulk-disabled as part of arm64 bot stabilization: https://crbug.com/1154345
#define MAYBE_CanScaleYuvsAndVerifyColor DISABLED_CanScaleYuvsAndVerifyColor
#else
#define MAYBE_CanScaleYuvsAndVerifyColor CanScaleYuvsAndVerifyColor
#endif
TEST(PixelBufferTransfererTest, MAYBE_CanScaleYuvsAndVerifyColor) {
constexpr OSType kPixelFormat = kPixelFormatYuvs; constexpr OSType kPixelFormat = kPixelFormatYuvs;
constexpr int kSourceWidth = 32; constexpr int kSourceWidth = 32;
constexpr int kSourceHeight = 32; constexpr int kSourceHeight = 32;
...@@ -115,7 +123,16 @@ TEST(PixelBufferTransfererTest, CanScaleYuvsAndVerifyCheckerPattern) { ...@@ -115,7 +123,16 @@ TEST(PixelBufferTransfererTest, CanScaleYuvsAndVerifyCheckerPattern) {
EXPECT_EQ(num_tiles_across_y, kSourceNumTilesAcross); EXPECT_EQ(num_tiles_across_y, kSourceNumTilesAcross);
} }
TEST(PixelBufferTransfererTest, CanStretchYuvsAndVerifyCheckerPattern) { #if defined(ARCH_CPU_ARM64)
// Bulk-disabled as part of arm64 bot stabilization: https://crbug.com/1154345
#define MAYBE_CanStretchYuvsAndVerifyCheckerPattern \
DISABLED_CanStretchYuvsAndVerifyCheckerPattern
#else
#define MAYBE_CanStretchYuvsAndVerifyCheckerPattern \
CanStretchYuvsAndVerifyCheckerPattern
#endif
TEST(PixelBufferTransfererTest, MAYBE_CanStretchYuvsAndVerifyCheckerPattern) {
// Note: The ARGB -> YUVS -> ARGB conversions results in a small loss of // Note: The ARGB -> YUVS -> ARGB conversions results in a small loss of
// information, so for the checker pattern to be intact the buffer can't be // information, so for the checker pattern to be intact the buffer can't be
// tiny (e.g. 4x4). // tiny (e.g. 4x4).
...@@ -149,7 +166,14 @@ TEST(PixelBufferTransfererTest, CanStretchYuvsAndVerifyCheckerPattern) { ...@@ -149,7 +166,14 @@ TEST(PixelBufferTransfererTest, CanStretchYuvsAndVerifyCheckerPattern) {
EXPECT_EQ(num_tiles_across_y, kSourceNumTilesAcross); EXPECT_EQ(num_tiles_across_y, kSourceNumTilesAcross);
} }
TEST(PixelBufferTransfererTest, CanStretchYuvsAndVerifyColor) { #if defined(ARCH_CPU_ARM64)
// Bulk-disabled as part of arm64 bot stabilization: https://crbug.com/1154345
#define MAYBE_CanStretchYuvsAndVerifyColor DISABLED_CanStretchYuvsAndVerifyColor
#else
#define MAYBE_CanStretchYuvsAndVerifyColor CanStretchYuvsAndVerifyColor
#endif
TEST(PixelBufferTransfererTest, MAYBE_CanStretchYuvsAndVerifyColor) {
constexpr OSType kPixelFormat = kPixelFormatYuvs; constexpr OSType kPixelFormat = kPixelFormatYuvs;
constexpr int kSourceWidth = 32; constexpr int kSourceWidth = 32;
constexpr int kSourceHeight = 32; constexpr int kSourceHeight = 32;
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "base/logging.h" #include "base/logging.h"
#include "base/test/scoped_feature_list.h" #include "base/test/scoped_feature_list.h"
#include "build/build_config.h"
#include "media/capture/video/mac/test/pixel_buffer_test_utils_mac.h" #include "media/capture/video/mac/test/pixel_buffer_test_utils_mac.h"
#include "media/capture/video/mac/video_capture_device_avfoundation_utils_mac.h" #include "media/capture/video/mac/video_capture_device_avfoundation_utils_mac.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
...@@ -395,7 +396,14 @@ TEST_P(SampleBufferTransformerPixelTransferTest, CanConvertFullScale) { ...@@ -395,7 +396,14 @@ TEST_P(SampleBufferTransformerPixelTransferTest, CanConvertFullScale) {
PixelBufferIsSingleColor(output_pixel_buffer, kColorR, kColorG, kColorB)); PixelBufferIsSingleColor(output_pixel_buffer, kColorR, kColorG, kColorB));
} }
TEST_P(SampleBufferTransformerPixelTransferTest, CanConvertAndScaleDown) { #if defined(ARCH_CPU_ARM64)
// Bulk-disabled for arm64 bot stabilization: https://crbug.com/1154345
#define MAYBE_CanConvertAndScaleDown DISABLED_CanConvertAndScaleDown
#else
#define MAYBE_CanConvertAndScaleDown CanConvertAndScaleDown
#endif
TEST_P(SampleBufferTransformerPixelTransferTest, MAYBE_CanConvertAndScaleDown) {
OSType input_pixel_format; OSType input_pixel_format;
OSType output_pixel_format; OSType output_pixel_format;
std::tie(input_pixel_format, output_pixel_format) = GetParam(); std::tie(input_pixel_format, output_pixel_format) = GetParam();
......
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