Commit f452e7b6 authored by Sasha McIntosh's avatar Sasha McIntosh Committed by Commit Bot

gpu/mac: Final UYVY cleanup

Fix some comments about UYVY format in tests and remove remaining
references to this format.

Bug: 988538
Change-Id: Ib14051e146c49df7b654b6192b7d4a28935dc922
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1825080Reviewed-by: default avatarDaniele Castagna <dcastagna@chromium.org>
Reviewed-by: default avatarEmily Stark <estark@chromium.org>
Reviewed-by: default avatarDan Sanders <sandersd@chromium.org>
Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Commit-Queue: Sasha McIntosh <sashamcintosh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706991}
parent 612b2729
...@@ -204,7 +204,7 @@ message VideoDecoderConfig { ...@@ -204,7 +204,7 @@ message VideoDecoderConfig {
PIXEL_FORMAT_I444 = 5; PIXEL_FORMAT_I444 = 5;
PIXEL_FORMAT_NV12 = 6; PIXEL_FORMAT_NV12 = 6;
PIXEL_FORMAT_NV21 = 7; PIXEL_FORMAT_NV21 = 7;
PIXEL_FORMAT_UYVY = 8; PIXEL_FORMAT_UYVY = 8 [deprecated = true];
PIXEL_FORMAT_YUY2 = 9; PIXEL_FORMAT_YUY2 = 9;
PIXEL_FORMAT_ARGB = 10; PIXEL_FORMAT_ARGB = 10;
PIXEL_FORMAT_XRGB = 11; PIXEL_FORMAT_XRGB = 11;
......
...@@ -31,7 +31,6 @@ enum ResourceFormat { ...@@ -31,7 +31,6 @@ enum ResourceFormat {
BGRX_1010102, BGRX_1010102,
YVU_420, YVU_420,
YUV_420_BIPLANAR, YUV_420_BIPLANAR,
UYVY_422,
P010, P010,
}; };
......
...@@ -324,7 +324,7 @@ TEST_F(DrmOverlayValidatorTest, OverlayFormat_YUV) { ...@@ -324,7 +324,7 @@ TEST_F(DrmOverlayValidatorTest, OverlayFormat_YUV) {
} }
TEST_F(DrmOverlayValidatorTest, RejectYUVBuffersIfNotSupported) { TEST_F(DrmOverlayValidatorTest, RejectYUVBuffersIfNotSupported) {
// Check case where buffer storage format is already UYVY but planes dont // Check case where buffer storage format is already YUV 420 but planes don't
// support it. // support it.
overlay_params_.back().buffer_size = overlay_rect_.size(); overlay_params_.back().buffer_size = overlay_rect_.size();
overlay_params_.back().display_rect = gfx::RectF(overlay_rect_); overlay_params_.back().display_rect = gfx::RectF(overlay_rect_);
...@@ -391,7 +391,7 @@ TEST_F(DrmOverlayValidatorTest, ...@@ -391,7 +391,7 @@ TEST_F(DrmOverlayValidatorTest,
EXPECT_EQ(returns.back(), ui::OVERLAY_STATUS_ABLE); EXPECT_EQ(returns.back(), ui::OVERLAY_STATUS_ABLE);
// This configuration should not be promoted to Overlay when either of the // This configuration should not be promoted to Overlay when either of the
// controllers dont support UYVY format. // controllers don't support YUV 420 format.
// Check case where we dont have support for packed formats in Mirrored CRTC. // Check case where we dont have support for packed formats in Mirrored CRTC.
crtc_states[1].planes[1].formats = {DRM_FORMAT_XRGB8888}; crtc_states[1].planes[1].formats = {DRM_FORMAT_XRGB8888};
......
...@@ -68,7 +68,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { ...@@ -68,7 +68,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
DRM_FORMAT_R8, DRM_FORMAT_GR88, DRM_FORMAT_ABGR8888, DRM_FORMAT_R8, DRM_FORMAT_GR88, DRM_FORMAT_ABGR8888,
DRM_FORMAT_XBGR8888, DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888, DRM_FORMAT_XBGR8888, DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888,
DRM_FORMAT_XRGB2101010, DRM_FORMAT_XBGR2101010, DRM_FORMAT_RGB565, DRM_FORMAT_XRGB2101010, DRM_FORMAT_XBGR2101010, DRM_FORMAT_RGB565,
DRM_FORMAT_UYVY, DRM_FORMAT_NV12, DRM_FORMAT_YVU420}; DRM_FORMAT_NV12, DRM_FORMAT_YVU420};
base::SingleThreadTaskExecutor main_task_executor(base::MessagePumpType::UI); base::SingleThreadTaskExecutor main_task_executor(base::MessagePumpType::UI);
......
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