Commit 9e54b0b2 authored by Alexis Hetu's avatar Alexis Hetu Committed by Commit Bot

Clean-up obsolete YUV related checks

Some Android specific YUV related checks should no longer be necessary
now that proper support exists in Skia for these cases.

Bug: 985458
Change-Id: Ic53aeee278a7751fdfecc532b185bf4dc91fc892
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2500243Reviewed-by: default avatarSunny Sachanandani <sunnyps@chromium.org>
Reviewed-by: default avatarAndres Calderon Jaramillo <andrescj@chromium.org>
Commit-Queue: Alexis Hétu <sugoi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820980}
parent cb5179d8
...@@ -200,14 +200,6 @@ class ImageTransferCacheEntryTest ...@@ -200,14 +200,6 @@ class ImageTransferCacheEntryTest
}; };
TEST_P(ImageTransferCacheEntryTest, Deserialize) { TEST_P(ImageTransferCacheEntryTest, Deserialize) {
#if defined(OS_ANDROID)
// TODO(crbug.com/985458): this test is failing on Android for NV12 and we
// don't understand why yet. Revisit this once Skia supports an RG8
// SkColorType.
if (GetParam() == YUVDecodeFormat::kYUV2)
return;
#endif
// Create a client-side entry from YUV planes. Use a different stride than the // Create a client-side entry from YUV planes. Use a different stride than the
// width to test that alignment works correctly. // width to test that alignment works correctly.
const int image_width = 12; const int image_width = 12;
...@@ -294,13 +286,6 @@ TEST_P(ImageTransferCacheEntryTest, HardwareDecodedNoMipsAtCreation) { ...@@ -294,13 +286,6 @@ TEST_P(ImageTransferCacheEntryTest, HardwareDecodedNoMipsAtCreation) {
} }
TEST_P(ImageTransferCacheEntryTest, HardwareDecodedMipsAtCreation) { TEST_P(ImageTransferCacheEntryTest, HardwareDecodedMipsAtCreation) {
#if defined(OS_ANDROID)
// TODO(crbug.com/985458): this test is failing on Android for NV12 and we
// don't understand why yet. Revisit this once Skia supports an RG8
// SkColorType.
if (GetParam() == YUVDecodeFormat::kYUV2)
return;
#endif
std::unique_ptr<bool[]> release_flags; std::unique_ptr<bool[]> release_flags;
std::vector<sk_sp<SkImage>> plane_images = CreateTestYUVImage(&release_flags); std::vector<sk_sp<SkImage>> plane_images = CreateTestYUVImage(&release_flags);
const size_t plane_images_size = plane_images.size(); const size_t plane_images_size = plane_images.size();
...@@ -332,13 +317,6 @@ TEST_P(ImageTransferCacheEntryTest, HardwareDecodedMipsAtCreation) { ...@@ -332,13 +317,6 @@ TEST_P(ImageTransferCacheEntryTest, HardwareDecodedMipsAtCreation) {
} }
TEST_P(ImageTransferCacheEntryTest, HardwareDecodedMipsAfterCreation) { TEST_P(ImageTransferCacheEntryTest, HardwareDecodedMipsAfterCreation) {
#if defined(OS_ANDROID)
// TODO(crbug.com/985458): this test is failing on Android for NV12 and we
// don't understand why yet. Revisit this once Skia supports an RG8
// SkColorType.
if (GetParam() == YUVDecodeFormat::kYUV2)
return;
#endif
std::unique_ptr<bool[]> release_flags; std::unique_ptr<bool[]> release_flags;
std::vector<sk_sp<SkImage>> plane_images = CreateTestYUVImage(&release_flags); std::vector<sk_sp<SkImage>> plane_images = CreateTestYUVImage(&release_flags);
const size_t plane_images_size = plane_images.size(); const size_t plane_images_size = plane_images.size();
......
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