Commit ff7b6c5e authored by Ted Choc's avatar Ted Choc Committed by Commit Bot

Disable flaky MediaColorTest for KitKat devices.

BUG=907572

Change-Id: Iad549397cbf3e6391d3d92dccb492ef73e1cb65d
Reviewed-on: https://chromium-review.googlesource.com/c/1354443Reviewed-by: default avatarFredrik Hubinette <hubbe@chromium.org>
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612036}
parent 20230dcf
...@@ -8,6 +8,10 @@ ...@@ -8,6 +8,10 @@
#include "media/base/test_data_util.h" #include "media/base/test_data_util.h"
#include "media/media_buildflags.h" #include "media/media_buildflags.h"
#if defined(OS_ANDROID)
#include "base/android/build_info.h"
#endif
namespace content { namespace content {
class MediaColorTest : public MediaBrowserTest { class MediaColorTest : public MediaBrowserTest {
...@@ -50,6 +54,14 @@ IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv444pVp9) { ...@@ -50,6 +54,14 @@ IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv444pVp9) {
#if BUILDFLAG(USE_PROPRIETARY_CODECS) #if BUILDFLAG(USE_PROPRIETARY_CODECS)
IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv420pH264) { IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv420pH264) {
#if defined(OS_ANDROID)
// https://crbug.com/907572
if (base::android::BuildInfo::GetInstance()->sdk_int() <=
base::android::SDK_VERSION_KITKAT) {
DVLOG(0) << "Skipping test - Yuv420pH264 is flaky on KitKat devices.";
return;
}
#endif
RunColorTest("yuv420p.mp4"); RunColorTest("yuv420p.mp4");
} }
...@@ -70,6 +82,14 @@ IN_PROC_BROWSER_TEST_F(MediaColorTest, MAYBE_Yuvj420pH264) { ...@@ -70,6 +82,14 @@ IN_PROC_BROWSER_TEST_F(MediaColorTest, MAYBE_Yuvj420pH264) {
#define MAYBE_Yuv420pRec709H264 Yuv420pRec709H264 #define MAYBE_Yuv420pRec709H264 Yuv420pRec709H264
#endif #endif
IN_PROC_BROWSER_TEST_F(MediaColorTest, MAYBE_Yuv420pRec709H264) { IN_PROC_BROWSER_TEST_F(MediaColorTest, MAYBE_Yuv420pRec709H264) {
#if defined(OS_ANDROID)
// https://crbug.com/907572
if (base::android::BuildInfo::GetInstance()->sdk_int() <=
base::android::SDK_VERSION_KITKAT) {
DVLOG(0) << "Skipping test - Yuv420pRec709H264 is flaky on KitKat devices.";
return;
}
#endif
RunColorTest("yuv420p_rec709.mp4"); RunColorTest("yuv420p_rec709.mp4");
} }
......
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