[display][api-types] Integrate Color with PixelFormat.

Bug: 42079190
Multiply: display-api-types-cpp: 1
Multiply: display-api-types-cpp17: 1
Test: fx test //src/graphics/display/lib/api-types
Change-Id: If0b3ba21a48eaceab769cb0d876b3378c42ab25b
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1176613
Fuchsia-Auto-Submit: Victor Costan <[email protected]>
Reviewed-by: Yilong Li <[email protected]>
Commit-Queue: Victor Costan <[email protected]>

Author: pwnall

src/graphics/display/lib/api-types/cpp/color-test.cc

@@ -7,30 +7,31 @@
 #include <fidl/fuchsia.hardware.display.types/cpp/wire.h>
 #include <fidl/fuchsia.images2/cpp/wire.h>
 #include <fuchsia/hardware/display/controller/c/banjo.h>
-#include <lib/image-format/image_format.h>
 
 #include <cstdint>
 #include <initializer_list>
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include "src/graphics/display/lib/api-types/cpp/pixel-format.h"
+
 namespace display {
 
 namespace {
 
 constexpr Color kRgbaGreyish({
-    .format = fuchsia_images2::wire::PixelFormat::kR8G8B8A8,
+    .format = PixelFormat::kR8G8B8A8,
     .bytes = std::initializer_list<uint8_t>{0x41, 0x42, 0x43, 0x44, 0, 0, 0, 0},
 });
 
 constexpr Color kRgbaGreyish2({
-    .format = fuchsia_images2::wire::PixelFormat::kR8G8B8A8,
+    .format = PixelFormat::kR8G8B8A8,
     .bytes = std::initializer_list<uint8_t>{0x41, 0x42, 0x43, 0x44, 0, 0, 0, 0},
 });
 
 constexpr Color kBgraGreyish2({
-    .format = fuchsia_images2::wire::PixelFormat::kB8G8R8A8,
+    .format = PixelFormat::kB8G8R8A8,
     .bytes = std::initializer_list<uint8_t>{0x41, 0x42, 0x43, 0x44, 0, 0, 0, 0},
 });
 
@@ -47,7 +48,7 @@ TEST(ColorTest, EqualityIsSymmetric) {
 
 TEST(ColorTest, EqualityForDifferentContents) {
   static constexpr Color kRgbaFuchsia({
-      .format = fuchsia_images2::wire::PixelFormat::kR8G8B8A8,
+      .format = PixelFormat::kR8G8B8A8,
       .bytes = std::initializer_list<uint8_t>{0xff, 0x00, 0xff, 0xff, 0, 0, 0, 0},
   });
 
@@ -57,7 +58,7 @@ TEST(ColorTest, EqualityForDifferentContents) {
 
 TEST(ColorTest, EqualityForDifferentFormats) {
   static constexpr Color kBgraGreyish({
-      .format = fuchsia_images2::wire::PixelFormat::kB8G8R8A8,
+      .format = PixelFormat::kB8G8R8A8,
       .bytes = std::initializer_list<uint8_t>{0x41, 0x42, 0x43, 0x44, 0, 0, 0, 0},
   });
   EXPECT_NE(kRgbaGreyish, kBgraGreyish);
@@ -66,10 +67,10 @@ TEST(ColorTest, EqualityForDifferentFormats) {
 
 TEST(ColorTest, FromDesignatedInitializer) {
   static constexpr Color color({
-      .format = fuchsia_images2::wire::PixelFormat::kR8G8B8A8,
+      .format = PixelFormat::kR8G8B8A8,
       .bytes = std::initializer_list<uint8_t>{0x41, 0x42, 0x43, 0x44, 0, 0, 0, 0},
   });
-  EXPECT_EQ(fuchsia_images2::wire::PixelFormat::kR8G8B8A8, color.format());
+  EXPECT_EQ(PixelFormat::kR8G8B8A8, color.format());
   EXPECT_THAT(color.bytes(), testing::ElementsAreArray(std::initializer_list<uint8_t>{
                                  0x41, 0x42, 0x43, 0x44, 0, 0, 0, 0}));
 }
@@ -81,26 +82,27 @@ TEST(ColorTest, FromFidlColor) {
   };
 
   static constexpr Color color = Color::From(fidl_color);
-  EXPECT_EQ(fuchsia_images2::wire::PixelFormat::kR8G8B8A8, color.format());
+  EXPECT_EQ(PixelFormat::kR8G8B8A8, color.format());
   EXPECT_THAT(color.bytes(), testing::ElementsAreArray(std::initializer_list<uint8_t>{
                                  0x41, 0x42, 0x43, 0x44, 0, 0, 0, 0}));
 }
 
 TEST(ColorTest, FromBanjoColor) {
   static constexpr color_t banjo_color = {
-      .format = static_cast<uint32_t>(fuchsia_images2::wire::PixelFormat::kR8G8B8A8),
+      .format = static_cast<fuchsia_images2_pixel_format_enum_value_t>(
+          fuchsia_images2::wire::PixelFormat::kR8G8B8A8),
       .bytes = {0x41, 0x42, 0x43, 0x44, 0, 0, 0, 0},
   };
 
   static constexpr Color color = Color::From(banjo_color);
-  EXPECT_EQ(fuchsia_images2::wire::PixelFormat::kR8G8B8A8, color.format());
+  EXPECT_EQ(PixelFormat::kR8G8B8A8, color.format());
   EXPECT_THAT(color.bytes(), testing::ElementsAreArray(std::initializer_list<uint8_t>{
                                  0x41, 0x42, 0x43, 0x44, 0, 0, 0, 0}));
 }
 
 TEST(ColorTest, ToFidlColor) {
   static constexpr Color color({
-      .format = fuchsia_images2::wire::PixelFormat::kR8G8B8A8,
+      .format = PixelFormat::kR8G8B8A8,
       .bytes = std::initializer_list<uint8_t>{0x41, 0x42, 0x43, 0x44, 0, 0, 0, 0},
   });
 
@@ -112,12 +114,13 @@ TEST(ColorTest, ToFidlColor) {
 
 TEST(ColorTest, ToBanjoColor) {
   static constexpr Color color({
-      .format = fuchsia_images2::wire::PixelFormat::kR8G8B8A8,
+      .format = PixelFormat::kR8G8B8A8,
       .bytes = std::initializer_list<uint8_t>{0x41, 0x42, 0x43, 0x44, 0, 0, 0, 0},
   });
 
   static constexpr color_t banjo_color = color.ToBanjo();
-  EXPECT_EQ(static_cast<uint32_t>(fuchsia_images2::wire::PixelFormat::kR8G8B8A8),
+  EXPECT_EQ(static_cast<fuchsia_images2_pixel_format_enum_value_t>(
+                fuchsia_images2::wire::PixelFormat::kR8G8B8A8),
             banjo_color.format);
   EXPECT_THAT(banjo_color.bytes, testing::ElementsAreArray(std::initializer_list<uint8_t>{
                                      0x41, 0x42, 0x43, 0x44, 0, 0, 0, 0}));
@@ -138,62 +141,31 @@ TEST(ColorTest, IsValidBanjoRgbaGreyish) {
 }
 
 TEST(ColorTest, SupportsFormatRgbaFormats) {
-  EXPECT_TRUE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kB8G8R8A8));
-  EXPECT_TRUE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kR8G8B8A8));
-  EXPECT_TRUE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kB8G8R8A8));
-  EXPECT_TRUE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kA2B10G10R10));
-  EXPECT_TRUE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kA2R10G10B10));
+  EXPECT_TRUE(Color::SupportsFormat(PixelFormat::kB8G8R8A8));
+  EXPECT_TRUE(Color::SupportsFormat(PixelFormat::kR8G8B8A8));
+  EXPECT_TRUE(Color::SupportsFormat(PixelFormat::kB8G8R8A8));
+  EXPECT_TRUE(Color::SupportsFormat(PixelFormat::kA2B10G10R10));
+  EXPECT_TRUE(Color::SupportsFormat(PixelFormat::kA2R10G10B10));
 }
 
 TEST(ColorTest, SupportsFormatRgbFormats) {
-  EXPECT_TRUE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kB8G8R8));
-  EXPECT_TRUE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kR5G6B5));
-  EXPECT_TRUE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kR3G3B2));
-  EXPECT_TRUE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kR8G8B8));
+  EXPECT_TRUE(Color::SupportsFormat(PixelFormat::kB8G8R8));
+  EXPECT_TRUE(Color::SupportsFormat(PixelFormat::kR5G6B5));
+  EXPECT_TRUE(Color::SupportsFormat(PixelFormat::kR3G3B2));
+  EXPECT_TRUE(Color::SupportsFormat(PixelFormat::kR8G8B8));
 }
 
 TEST(ColorTest, SupportsFormatImplicitColorChannels) {
-  EXPECT_TRUE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kL8));
-  EXPECT_TRUE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kR8));
-}
-
-TEST(ColorTest, SupportsFormatUnspecifiedAlpha) {
-  EXPECT_FALSE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kB8G8R8X8));
-  EXPECT_FALSE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kR8G8B8X8));
-  EXPECT_FALSE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kR2G2B2X2));
+  EXPECT_TRUE(Color::SupportsFormat(PixelFormat::kL8));
+  EXPECT_TRUE(Color::SupportsFormat(PixelFormat::kR8));
 }
 
 TEST(ColorTest, SupportsFormatMultiPlanar) {
-  EXPECT_FALSE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kI420));
-  EXPECT_FALSE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kM420));
-  EXPECT_FALSE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kNv12));
-  EXPECT_FALSE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kYuy2));
-  EXPECT_FALSE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kYv12));
-  EXPECT_FALSE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kP010));
-}
-
-TEST(ColorTest, SupportsFormatInvalid) {
-  EXPECT_FALSE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kInvalid));
-  EXPECT_FALSE(Color::SupportsFormat(fuchsia_images2::wire::PixelFormat::kMjpeg));
-}
-
-TEST(ColorTest, EncodingSizeMatchesImageFormat) {
-  static constexpr std::array kSupportedFormats = {
-      fuchsia_images2::PixelFormat::kR8G8B8A8,    fuchsia_images2::PixelFormat::kB8G8R8A8,
-      fuchsia_images2::PixelFormat::kB8G8R8,      fuchsia_images2::PixelFormat::kR5G6B5,
-      fuchsia_images2::PixelFormat::kR3G3B2,      fuchsia_images2::PixelFormat::kL8,
-      fuchsia_images2::PixelFormat::kR8,          fuchsia_images2::PixelFormat::kA2R10G10B10,
-      fuchsia_images2::PixelFormat::kA2B10G10R10, fuchsia_images2::PixelFormat::kR8G8B8,
-  };
-
-  for (fuchsia_images2::PixelFormat format : kSupportedFormats) {
-    SCOPED_TRACE(::testing::Message() << "Format code: " << static_cast<uint32_t>(format));
-    ASSERT_TRUE(Color::SupportsFormat(format));
-    const PixelFormatAndModifier sysmem_format(format,
-                                               fuchsia_images2::wire::PixelFormatModifier::kLinear);
-    EXPECT_EQ(ImageFormatBitsPerPixel(sysmem_format),
-              static_cast<uint32_t>(Color::EncodingSize(format) * 8));
-  }
+  EXPECT_FALSE(Color::SupportsFormat(PixelFormat::kI420));
+  EXPECT_FALSE(Color::SupportsFormat(PixelFormat::kNv12));
+  EXPECT_FALSE(Color::SupportsFormat(PixelFormat::kYuy2));
+  EXPECT_FALSE(Color::SupportsFormat(PixelFormat::kYv12));
+  EXPECT_FALSE(Color::SupportsFormat(PixelFormat::kP010));
 }
 
 }  // namespace

src/graphics/display/lib/api-types/cpp/color.cc

@@ -7,16 +7,15 @@
 #include <fidl/fuchsia.hardware.display.engine/cpp/wire.h>
 #include <fuchsia/hardware/display/controller/c/banjo.h>
 
-#include <tuple>
-
 namespace display {
 
+// static
 void Color::StaticAsserts() {
-  static_assert(std::tuple_size_v<decltype(bytes_)> == sizeof(color_t::bytes),
+  static_assert(kBytesElements == sizeof(color_t::bytes),
                 "Banjo color_t bytes size doesn't match Color");
-  static_assert(std::tuple_size_v<decltype(bytes_)> ==
-                    decltype(fuchsia_hardware_display_types::wire::Color::bytes)::size(),
-                "FIDL fuchsia.hardware.display.types/Color bytes size doesn't match Color");
+  static_assert(
+      kBytesElements == decltype(fuchsia_hardware_display_types::wire::Color::bytes)::size(),
+      "FIDL fuchsia.hardware.display.types/Color bytes size doesn't match Color");
 }
 
 }  // namespace display