Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(497)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/ozone/platform/drm/gpu/drm_overlay_validator_unittest.cc

Issue 2684993005: (NotForReview) Enable YUV video overlay on Skylake ChromeOS.
Patch Set: rebase to ToT (Mar/27) Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_overlay_validator.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/drm/gpu/drm_overlay_validator_unittest.cc
diff --git a/ui/ozone/platform/drm/gpu/drm_overlay_validator_unittest.cc b/ui/ozone/platform/drm/gpu/drm_overlay_validator_unittest.cc
index 3bffad61bcb7fc590edef8be8717d2dcd88b0537..7516103ca8b33341bed0a8cea0d6d8beaee8b2c5 100644
--- a/ui/ozone/platform/drm/gpu/drm_overlay_validator_unittest.cc
+++ b/ui/ozone/platform/drm/gpu/drm_overlay_validator_unittest.cc
@@ -191,7 +191,7 @@ TEST_F(DrmOverlayValidatorTest, ClearCacheOnReset) {
overlay_params_.back().display_rect = overlay_rect_;
plane_list_.back().display_bounds = overlay_rect_;
std::vector<uint32_t> xrgb_yuv_packed_formats = {DRM_FORMAT_XRGB8888,
- DRM_FORMAT_UYVY};
+ DRM_FORMAT_YUYV};
ui::FakePlaneInfo primary_plane_info(
100, 1 << 0, std::vector<uint32_t>(1, DRM_FORMAT_XRGB8888));
@@ -224,7 +224,7 @@ TEST_F(DrmOverlayValidatorTest, ClearCacheOnResetWithScaling) {
plane_list_.back().display_bounds = overlay_rect_;
plane_list_.back().crop_rect = crop_rect;
std::vector<uint32_t> xrgb_yuv_packed_formats = {DRM_FORMAT_XRGB8888,
- DRM_FORMAT_UYVY};
+ DRM_FORMAT_YUYV};
ui::FakePlaneInfo primary_plane_info(
100, 1 << 0, std::vector<uint32_t>(1, DRM_FORMAT_XRGB8888));
@@ -238,7 +238,7 @@ TEST_F(DrmOverlayValidatorTest, ClearCacheOnResetWithScaling) {
ui::OverlayPlaneList plane_list =
overlay_validator_->PrepareBuffersForPageFlip(plane_list_);
// Scaling allows format conversion.
- EXPECT_EQ(DRM_FORMAT_UYVY,
+ EXPECT_EQ(DRM_FORMAT_YUYV,
plane_list.back().buffer->GetFramebufferPixelFormat());
// Check if ClearCache actually clears the cache.
overlay_validator_->ClearCache();
@@ -260,7 +260,7 @@ TEST_F(DrmOverlayValidatorTest, OptimalFormatForOverlayInFullScreen_XRGB) {
ui::FakePlaneInfo primary_plane_info(
100, 1 << 0, std::vector<uint32_t>(1, DRM_FORMAT_XRGB8888));
std::vector<uint32_t> xrgb_yuv_packed_formats = {DRM_FORMAT_XRGB8888,
- DRM_FORMAT_UYVY};
+ DRM_FORMAT_YUYV};
ui::FakePlaneInfo plane_info(101, 1 << 0, xrgb_yuv_packed_formats);
std::vector<ui::FakePlaneInfo> planes{primary_plane_info, plane_info};
@@ -279,7 +279,7 @@ TEST_F(DrmOverlayValidatorTest, OptimalFormatForOverlayInFullScreen_YUV) {
overlay_params_.back().display_rect = primary_rect_;
plane_list_.back().display_bounds = primary_rect_;
std::vector<uint32_t> xrgb_yuv_packed_formats = {DRM_FORMAT_XRGB8888,
- DRM_FORMAT_UYVY};
+ DRM_FORMAT_YUYV};
// We should prefer YUV when primary can support it.
ui::FakePlaneInfo primary_plane_info(100, 1 << 0, xrgb_yuv_packed_formats);
@@ -292,7 +292,7 @@ TEST_F(DrmOverlayValidatorTest, OptimalFormatForOverlayInFullScreen_YUV) {
overlay_validator_->TestPageFlip(overlay_params_, ui::OverlayPlaneList());
ui::OverlayPlaneList plane_list =
overlay_validator_->PrepareBuffersForPageFlip(plane_list_);
- // TODO(dcastagna): If Atomic support is enabled, a packed format (UYVY) might
+ // TODO(dcastagna): If Atomic support is enabled, a packed format (YUYV) might
// be the optimal one and should be preferred.
EXPECT_EQ(DRM_FORMAT_XRGB8888,
plane_list.back().buffer->GetFramebufferPixelFormat());
@@ -306,7 +306,7 @@ TEST_F(DrmOverlayValidatorTest, OverlayPreferredFormat) {
plane_list_.back().display_bounds = overlay_rect_;
std::vector<uint32_t> xrgb_yuv_packed_formats = {DRM_FORMAT_XRGB8888,
- DRM_FORMAT_UYVY};
+ DRM_FORMAT_YUYV};
ui::FakePlaneInfo primary_plane_info(
100, 1 << 0, std::vector<uint32_t>(1, DRM_FORMAT_XRGB8888));
ui::FakePlaneInfo overlay_info(101, 1 << 0, xrgb_yuv_packed_formats);
@@ -341,7 +341,7 @@ TEST_F(DrmOverlayValidatorTest, OverlayPreferredFormat_YUV) {
plane_list_.back().crop_rect = crop_rect;
std::vector<uint32_t> xrgb_yuv_packed_formats = {DRM_FORMAT_XRGB8888,
- DRM_FORMAT_UYVY};
+ DRM_FORMAT_YUYV};
ui::FakePlaneInfo primary_plane_info(
100, 1 << 0, std::vector<uint32_t>(1, DRM_FORMAT_XRGB8888));
ui::FakePlaneInfo overlay_info(101, 1 << 0, xrgb_yuv_packed_formats);
@@ -359,7 +359,7 @@ TEST_F(DrmOverlayValidatorTest, OverlayPreferredFormat_YUV) {
ui::OverlayPlaneList plane_list =
overlay_validator_->PrepareBuffersForPageFlip(plane_list_);
- EXPECT_EQ(DRM_FORMAT_UYVY,
+ EXPECT_EQ(DRM_FORMAT_YUYV,
plane_list.back().buffer->GetFramebufferPixelFormat());
}
@@ -372,7 +372,7 @@ TEST_F(DrmOverlayValidatorTest, OverlayPreferredFormat_XRGB) {
plane_list_.back().display_bounds = overlay_rect_;
std::vector<uint32_t> xrgb_yuv_packed_formats = {DRM_FORMAT_XRGB8888,
- DRM_FORMAT_UYVY};
+ DRM_FORMAT_YUYV};
ui::FakePlaneInfo primary_plane_info(100, 1 << 0, xrgb_yuv_packed_formats);
ui::FakePlaneInfo overlay_info(101, 1 << 0,
std::vector<uint32_t>(1, DRM_FORMAT_XRGB8888));
@@ -393,14 +393,14 @@ TEST_F(DrmOverlayValidatorTest, OverlayPreferredFormat_XRGB) {
TEST_F(DrmOverlayValidatorTest, RejectYUVBuffersIfNotSupported) {
plane_manager_->ResetPlaneCount();
- // Check case where buffer storage format is already UYVY but planes dont
+ // Check case where buffer storage format is already YUYV but planes dont
// support it.
overlay_params_.back().buffer_size = overlay_rect_.size();
overlay_params_.back().display_rect = overlay_rect_;
plane_list_.back().display_bounds = overlay_rect_;
std::vector<uint32_t> xrgb_yuv_packed_formats = {DRM_FORMAT_XRGB8888,
- DRM_FORMAT_UYVY};
+ DRM_FORMAT_YUYV};
ui::FakePlaneInfo primary_plane_info(100, 1 << 0, xrgb_yuv_packed_formats);
ui::FakePlaneInfo overlay_info(101, 1 << 0,
std::vector<uint32_t>(1, DRM_FORMAT_XRGB8888));
@@ -409,7 +409,7 @@ TEST_F(DrmOverlayValidatorTest, RejectYUVBuffersIfNotSupported) {
overlay_validator_->ClearCache();
std::vector<ui::OverlayCheck_Params> validated_params = overlay_params_;
- validated_params.back().format = gfx::BufferFormat::UYVY_422;
+ validated_params.back().format = gfx::BufferFormat::YUYV_422;
plane_manager_->ResetPlaneCount();
validated_params = overlay_validator_->TestPageFlip(validated_params,
ui::OverlayPlaneList());
@@ -424,7 +424,7 @@ TEST_F(DrmOverlayValidatorTest,
std::vector<uint32_t> only_rgb_format{DRM_FORMAT_XRGB8888};
std::vector<uint32_t> xrgb_yuv_packed_formats{DRM_FORMAT_XRGB8888,
- DRM_FORMAT_UYVY};
+ DRM_FORMAT_YUYV};
ui::HardwareDisplayController* controller = window_->GetController();
controller->AddCrtc(std::unique_ptr<ui::CrtcController>(
new ui::CrtcController(drm_.get(), kSecondaryCrtc, kSecondaryConnector)));
@@ -452,22 +452,22 @@ TEST_F(DrmOverlayValidatorTest,
overlay_validator_->ClearCache();
std::vector<ui::OverlayCheck_Params> validated_params = overlay_params_;
- validated_params.back().format = gfx::BufferFormat::UYVY_422;
+ validated_params.back().format = gfx::BufferFormat::YUYV_422;
plane_manager_->ResetPlaneCount();
validated_params = overlay_validator_->TestPageFlip(validated_params,
ui::OverlayPlaneList());
EXPECT_TRUE(validated_params.back().is_overlay_candidate);
- // Both controllers have Overlay which support DRM_FORMAT_UYVY, and scaling is
+ // Both controllers have Overlay which support DRM_FORMAT_YUYV, and scaling is
// needed, hence this should be picked as the optimal format.
ui::OverlayPlaneList plane_list =
overlay_validator_->PrepareBuffersForPageFlip(plane_list_);
- EXPECT_EQ(DRM_FORMAT_UYVY,
+ EXPECT_EQ(DRM_FORMAT_YUYV,
plane_list.back().buffer->GetFramebufferPixelFormat());
// This configuration should not be promoted to Overlay when either of the
- // controllers dont support UYVY format.
+ // controllers dont support YUYV format.
// Check case where we dont have support for packed formats in Mirrored CRTC.
planes_info.back().allowed_formats = only_rgb_format;
@@ -508,7 +508,7 @@ TEST_F(DrmOverlayValidatorTest, OptimalFormatYUV_MirroredControllers) {
plane_list_.back().display_bounds = overlay_rect_;
std::vector<uint32_t> only_rgb_format = {DRM_FORMAT_XRGB8888};
std::vector<uint32_t> xrgb_yuv_packed_formats = {DRM_FORMAT_XRGB8888,
- DRM_FORMAT_UYVY};
+ DRM_FORMAT_YUYV};
ui::FakePlaneInfo primary_crtc_primary_plane(100, 1 << 0, only_rgb_format);
ui::FakePlaneInfo primary_crtc_overlay(101, 1 << 0, xrgb_yuv_packed_formats);
@@ -572,7 +572,7 @@ TEST_F(DrmOverlayValidatorTest, OptimizeOnlyIfProcessingCallbackPresent) {
plane_list_.back().display_bounds = overlay_rect_;
plane_list_.back().crop_rect = crop_rect;
std::vector<uint32_t> xrgb_yuv_packed_formats = {DRM_FORMAT_XRGB8888,
- DRM_FORMAT_UYVY};
+ DRM_FORMAT_YUYV};
ui::FakePlaneInfo primary_plane_info(
100, 1 << 0, std::vector<uint32_t>(1, DRM_FORMAT_XRGB8888));
@@ -586,7 +586,7 @@ TEST_F(DrmOverlayValidatorTest, OptimizeOnlyIfProcessingCallbackPresent) {
ui::OverlayPlaneList plane_list =
overlay_validator_->PrepareBuffersForPageFlip(plane_list_);
// Scaling allows format conversion.
- EXPECT_EQ(DRM_FORMAT_UYVY,
+ EXPECT_EQ(DRM_FORMAT_YUYV,
plane_list.back().buffer->GetFramebufferPixelFormat());
plane_list_.back().processing_callback.Reset();
plane_list = overlay_validator_->PrepareBuffersForPageFlip(plane_list_);
@@ -605,7 +605,7 @@ TEST_F(DrmOverlayValidatorTest, DontResetOriginalBufferIfProcessedIsInvalid) {
plane_list_.back().display_bounds = overlay_rect_;
plane_list_.back().crop_rect = crop_rect;
std::vector<uint32_t> xrgb_yuv_packed_formats = {DRM_FORMAT_XRGB8888,
- DRM_FORMAT_UYVY};
+ DRM_FORMAT_YUYV};
ui::FakePlaneInfo primary_plane_info(
100, 1 << 0, std::vector<uint32_t>(1, DRM_FORMAT_XRGB8888));
@@ -619,7 +619,7 @@ TEST_F(DrmOverlayValidatorTest, DontResetOriginalBufferIfProcessedIsInvalid) {
ui::OverlayPlaneList plane_list =
overlay_validator_->PrepareBuffersForPageFlip(plane_list_);
// Scaling allows format conversion.
- EXPECT_EQ(DRM_FORMAT_UYVY,
+ EXPECT_EQ(DRM_FORMAT_YUYV,
plane_list.back().buffer->GetFramebufferPixelFormat());
plane_list_.back().processing_callback = base::Bind(
&DrmOverlayValidatorTest::ReturnNullBuffer, base::Unretained(this));
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_overlay_validator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698