diff options
| author | yucliu <yucliu@chromium.org> | 2015-09-14 10:56:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-14 17:56:53 +0000 |
| commit | 961e401b4806ca187084a8d9210243b5985bdde6 (patch) | |
| tree | d4056620c772f2759a1f0069d8dbbc2ad506c4a5 /media | |
| parent | 95f15875106062c4dd3c5927be7f6ee5775eb78a (diff) | |
| download | chromium_src-961e401b4806ca187084a8d9210243b5985bdde6.zip chromium_src-961e401b4806ca187084a8d9210243b5985bdde6.tar.gz chromium_src-961e401b4806ca187084a8d9210243b5985bdde6.tar.bz2 | |
Disable YUVConvertTest.YUVAtoARGB_MMX_MatchReference on android x86
The test fails on nexus player. Re-enable it once the bug is fixed.
BUG=522311
Review URL: https://codereview.chromium.org/1334983002
Cr-Commit-Position: refs/heads/master@{#348652}
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/yuv_convert_unittest.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/base/yuv_convert_unittest.cc b/media/base/yuv_convert_unittest.cc index 9ab8a9c..fff56b9 100644 --- a/media/base/yuv_convert_unittest.cc +++ b/media/base/yuv_convert_unittest.cc @@ -73,7 +73,8 @@ static void ReadYV16Data(scoped_ptr<uint8[]>* data) { ReadData(FILE_PATH_LITERAL("bali_640x360_P422.yuv"), kYUV16Size, data); } -#if !defined(ARCH_CPU_ARM_FAMILY) && !defined(ARCH_CPU_MIPS_FAMILY) +#if !defined(ARCH_CPU_ARM_FAMILY) && !defined(ARCH_CPU_MIPS_FAMILY) && \ + !defined(OS_ANDROID) static void ReadYV12AData(scoped_ptr<uint8[]>* data) { ReadData(FILE_PATH_LITERAL("bali_640x360_P420_alpha.yuv"), kYUVA12Size, data); } @@ -529,6 +530,7 @@ TEST(YUVConvertTest, DownScaleYUVToRGB32WithRect) { } #if !defined(ARCH_CPU_ARM_FAMILY) && !defined(ARCH_CPU_MIPS_FAMILY) +#if !defined(OS_ANDROID) TEST(YUVConvertTest, YUVAtoARGB_MMX_MatchReference) { // Allocate all surfaces. scoped_ptr<uint8[]> yuv_bytes; @@ -570,6 +572,7 @@ TEST(YUVConvertTest, YUVAtoARGB_MMX_MatchReference) { rgb_converted_bytes_ref.get(), kRGBSizeConverted)); } +#endif // !defined(OS_ANDROID) TEST(YUVConvertTest, RGB32ToYUV_SSE2_MatchReference) { base::CPU cpu; |