[{"id":4933,"web_url":"https://patchwork.libcamera.org/comment/4933/","msgid":"<9b4c3fe8-95a7-f804-a176-52a85d036de2@ideasonboard.com>","date":"2020-05-28T10:23:13","subject":"Re: [libcamera-devel] [PATCH/RFC 11/11] libcamera: Replace explicit\n\tDRM FourCCs with libcamera formats","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 22/05/2020 15:54, Laurent Pinchart wrote:\n> Use the new pixel format constants to replace usage of macros from\n> drm_fourcc.h.\n> \n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> ---\n>  include/libcamera/pixel_format.h   |   2 -\n>  src/libcamera/formats.cpp          | 146 +++++++++++++++--------------\n>  src/libcamera/v4l2_pixelformat.cpp |  83 ++++++++--------\n>  3 files changed, 111 insertions(+), 120 deletions(-)\n> \n> diff --git a/include/libcamera/pixel_format.h b/include/libcamera/pixel_format.h\n> index 8dfeb8922418..6727315a11b1 100644\n> --- a/include/libcamera/pixel_format.h\n> +++ b/include/libcamera/pixel_format.h\n> @@ -11,8 +11,6 @@\n>  #include <stdint.h>\n>  #include <string>\n>  \n> -#include <linux/drm_fourcc.h>\n> -\n>  namespace libcamera {\n>  \n>  class PixelFormat\n> diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\n> index 74c239a5e710..97e986786cc8 100644\n> --- a/src/libcamera/formats.cpp\n> +++ b/src/libcamera/formats.cpp\n> @@ -9,6 +9,8 @@\n>  \n>  #include <errno.h>\n>  \n> +#include <libcamera/formats.h>\n> +\n>  #include \"libcamera/internal/log.h\"\n>  \n>  /**\n> @@ -166,43 +168,43 @@ namespace {\n>  \n>  const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n>  \t/* RGB formats. */\n> -\t{ PixelFormat(DRM_FORMAT_BGR888), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_BGR888),\n> +\t{ formats::BGR888, {\n> +\t\t.format = formats::BGR888,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_RGB24),\n>  \t\t.bitsPerPixel = 24,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRGB,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_RGB888), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_RGB888),\n> +\t{ formats::RGB888, {\n> +\t\t.format = formats::RGB888,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_BGR24),\n>  \t\t.bitsPerPixel = 24,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRGB,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_ABGR8888), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_ABGR8888),\n> +\t{ formats::ABGR8888, {\n> +\t\t.format = formats::ABGR8888,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_RGBA32),\n>  \t\t.bitsPerPixel = 32,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRGB,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_ARGB8888), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_ARGB8888),\n> +\t{ formats::ARGB8888, {\n> +\t\t.format = formats::ARGB8888,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_ABGR32),\n>  \t\t.bitsPerPixel = 32,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRGB,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_BGRA8888), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_BGRA8888),\n> +\t{ formats::BGRA8888, {\n> +\t\t.format = formats::BGRA8888,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_ARGB32),\n>  \t\t.bitsPerPixel = 32,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRGB,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_RGBA8888), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_RGBA8888),\n> +\t{ formats::RGBA8888, {\n> +\t\t.format = formats::RGBA8888,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_BGRA32),\n>  \t\t.bitsPerPixel = 32,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRGB,\n> @@ -210,29 +212,29 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n>  \t} },\n>  \n>  \t/* YUV packed formats. */\n> -\t{ PixelFormat(DRM_FORMAT_YUYV), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_YUYV),\n> +\t{ formats::YUYV, {\n> +\t\t.format = formats::YUYV,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_YUYV),\n>  \t\t.bitsPerPixel = 16,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_YVYU), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_YVYU),\n> +\t{ formats::YVYU, {\n> +\t\t.format = formats::YVYU,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_YVYU),\n>  \t\t.bitsPerPixel = 16,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_UYVY), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_UYVY),\n> +\t{ formats::UYVY, {\n> +\t\t.format = formats::UYVY,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_UYVY),\n>  \t\t.bitsPerPixel = 16,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_VYUY), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_VYUY),\n> +\t{ formats::VYUY, {\n> +\t\t.format = formats::VYUY,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_VYUY),\n>  \t\t.bitsPerPixel = 16,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n> @@ -240,29 +242,29 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n>  \t} },\n>  \n>  \t/* YUV planar formats. */\n> -\t{ PixelFormat(DRM_FORMAT_NV16), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_NV16),\n> +\t{ formats::NV16, {\n> +\t\t.format = formats::NV16,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV16),\n>  \t\t.bitsPerPixel = 16,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_NV61), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_NV61),\n> +\t{ formats::NV61, {\n> +\t\t.format = formats::NV61,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV61),\n>  \t\t.bitsPerPixel = 16,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_NV12), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_NV12),\n> +\t{ formats::NV12, {\n> +\t\t.format = formats::NV12,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV12),\n>  \t\t.bitsPerPixel = 12,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_NV21), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_NV21),\n> +\t{ formats::NV21, {\n> +\t\t.format = formats::NV21,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV21),\n>  \t\t.bitsPerPixel = 12,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n> @@ -270,8 +272,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n>  \t} },\n>  \n>  \t/* Greyscale formats. */\n> -\t{ PixelFormat(DRM_FORMAT_R8), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_R8),\n> +\t{ formats::R8, {\n> +\t\t.format = formats::R8,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_GREY),\n>  \t\t.bitsPerPixel = 8,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n> @@ -279,141 +281,141 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n>  \t} },\n>  \n>  \t/* Bayer formats. */\n> -\t{ PixelFormat(DRM_FORMAT_SBGGR8), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SBGGR8),\n> +\t{ formats::SBGGR8, {\n> +\t\t.format = formats::SBGGR8,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8),\n>  \t\t.bitsPerPixel = 8,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_SGBRG8), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SGBRG8),\n> +\t{ formats::SGBRG8, {\n> +\t\t.format = formats::SGBRG8,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGBRG8),\n>  \t\t.bitsPerPixel = 8,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_SGRBG8), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SGRBG8),\n> +\t{ formats::SGRBG8, {\n> +\t\t.format = formats::SGRBG8,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGRBG8),\n>  \t\t.bitsPerPixel = 8,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_SRGGB8), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SRGGB8),\n> +\t{ formats::SRGGB8, {\n> +\t\t.format = formats::SRGGB8,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SRGGB8),\n>  \t\t.bitsPerPixel = 8,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_SBGGR10), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SBGGR10),\n> +\t{ formats::SBGGR10, {\n> +\t\t.format = formats::SBGGR10,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10),\n>  \t\t.bitsPerPixel = 10,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_SGBRG10), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SGBRG10),\n> +\t{ formats::SGBRG10, {\n> +\t\t.format = formats::SGBRG10,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10),\n>  \t\t.bitsPerPixel = 10,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_SGRBG10), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SGRBG10),\n> +\t{ formats::SGRBG10, {\n> +\t\t.format = formats::SGRBG10,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10),\n>  \t\t.bitsPerPixel = 10,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_SRGGB10), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SRGGB10),\n> +\t{ formats::SRGGB10, {\n> +\t\t.format = formats::SRGGB10,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10),\n>  \t\t.bitsPerPixel = 10,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_SBGGR10, MIPI_FORMAT_MOD_CSI2_PACKED), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SBGGR10, MIPI_FORMAT_MOD_CSI2_PACKED),\n> +\t{ formats::SBGGR10_CSI2P, {\n> +\t\t.format = formats::SBGGR10_CSI2P,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10P),\n>  \t\t.bitsPerPixel = 10,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n>  \t\t.packed = true,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_SGBRG10, MIPI_FORMAT_MOD_CSI2_PACKED), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SGBRG10, MIPI_FORMAT_MOD_CSI2_PACKED),\n> +\t{ formats::SGBRG10_CSI2P, {\n> +\t\t.format = formats::SGBRG10_CSI2P,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10P),\n>  \t\t.bitsPerPixel = 10,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n>  \t\t.packed = true,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_SGRBG10, MIPI_FORMAT_MOD_CSI2_PACKED), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SGRBG10, MIPI_FORMAT_MOD_CSI2_PACKED),\n> +\t{ formats::SGRBG10_CSI2P, {\n> +\t\t.format = formats::SGRBG10_CSI2P,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10P),\n>  \t\t.bitsPerPixel = 10,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n>  \t\t.packed = true,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_SRGGB10, MIPI_FORMAT_MOD_CSI2_PACKED), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SRGGB10, MIPI_FORMAT_MOD_CSI2_PACKED),\n> +\t{ formats::SRGGB10_CSI2P, {\n> +\t\t.format = formats::SRGGB10_CSI2P,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10P),\n>  \t\t.bitsPerPixel = 10,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n>  \t\t.packed = true,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_SBGGR12), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SBGGR12),\n> +\t{ formats::SBGGR12, {\n> +\t\t.format = formats::SBGGR12,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12),\n>  \t\t.bitsPerPixel = 12,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_SGBRG12), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SGBRG12),\n> +\t{ formats::SGBRG12, {\n> +\t\t.format = formats::SGBRG12,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12),\n>  \t\t.bitsPerPixel = 12,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_SGRBG12), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SGRBG12),\n> +\t{ formats::SGRBG12, {\n> +\t\t.format = formats::SGRBG12,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12),\n>  \t\t.bitsPerPixel = 12,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_SRGGB12), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SRGGB12),\n> +\t{ formats::SRGGB12, {\n> +\t\t.format = formats::SRGGB12,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12),\n>  \t\t.bitsPerPixel = 12,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n>  \t\t.packed = false,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_SBGGR12, MIPI_FORMAT_MOD_CSI2_PACKED), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SBGGR12, MIPI_FORMAT_MOD_CSI2_PACKED),\n> +\t{ formats::SBGGR12_CSI2P, {\n> +\t\t.format = formats::SBGGR12_CSI2P,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12P),\n>  \t\t.bitsPerPixel = 12,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n>  \t\t.packed = true,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_SGBRG12, MIPI_FORMAT_MOD_CSI2_PACKED), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SGBRG12, MIPI_FORMAT_MOD_CSI2_PACKED),\n> +\t{ formats::SGBRG12_CSI2P, {\n> +\t\t.format = formats::SGBRG12_CSI2P,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12P),\n>  \t\t.bitsPerPixel = 12,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n>  \t\t.packed = true,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_SGRBG12, MIPI_FORMAT_MOD_CSI2_PACKED), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SGRBG12, MIPI_FORMAT_MOD_CSI2_PACKED),\n> +\t{ formats::SGRBG12_CSI2P, {\n> +\t\t.format = formats::SGRBG12_CSI2P,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12P),\n>  \t\t.bitsPerPixel = 12,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n>  \t\t.packed = true,\n>  \t} },\n> -\t{ PixelFormat(DRM_FORMAT_SRGGB12, MIPI_FORMAT_MOD_CSI2_PACKED), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_SRGGB12, MIPI_FORMAT_MOD_CSI2_PACKED),\n> +\t{ formats::SRGGB12_CSI2P, {\n> +\t\t.format = formats::SRGGB12_CSI2P,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12P),\n>  \t\t.bitsPerPixel = 12,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n> @@ -421,8 +423,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n>  \t} },\n>  \n>  \t/* Compressed formats. */\n> -\t{ PixelFormat(DRM_FORMAT_MJPEG), {\n> -\t\t.format = PixelFormat(DRM_FORMAT_MJPEG),\n> +\t{ formats::MJPEG, {\n> +\t\t.format = formats::MJPEG,\n>  \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_MJPEG),\n>  \t\t.bitsPerPixel = 0,\n>  \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n> diff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp\n> index 94fae470f926..741f6c2646bc 100644\n> --- a/src/libcamera/v4l2_pixelformat.cpp\n> +++ b/src/libcamera/v4l2_pixelformat.cpp\n> @@ -12,8 +12,7 @@\n>  #include <map>\n>  #include <string.h>\n>  \n> -#include <linux/drm_fourcc.h>\n> -\n> +#include <libcamera/formats.h>\n>  #include <libcamera/pixel_format.h>\n>  \n>  #include \"libcamera/internal/formats.h\"\n> @@ -46,60 +45,52 @@ namespace {\n>  \n>  const std::map<V4L2PixelFormat, PixelFormat> vpf2pf{\n>  \t/* RGB formats. */\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_RGB24), PixelFormat(DRM_FORMAT_BGR888) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_BGR24), PixelFormat(DRM_FORMAT_RGB888) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_RGBA32), PixelFormat(DRM_FORMAT_ABGR8888) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_ABGR32), PixelFormat(DRM_FORMAT_ARGB8888) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_ARGB32), PixelFormat(DRM_FORMAT_BGRA8888) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_BGRA32), PixelFormat(DRM_FORMAT_RGBA8888) },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_RGB24), formats::BGR888 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_BGR24), formats::RGB888 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_RGBA32), formats::ABGR8888 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_ABGR32), formats::ARGB8888 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_ARGB32), formats::BGRA8888 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_BGRA32), formats::RGBA8888 },\n>  \n>  \t/* YUV packed formats. */\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_YUYV), PixelFormat(DRM_FORMAT_YUYV) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_YVYU), PixelFormat(DRM_FORMAT_YVYU) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_UYVY), PixelFormat(DRM_FORMAT_UYVY) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_VYUY), PixelFormat(DRM_FORMAT_VYUY) },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_YUYV), formats::YUYV },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_YVYU), formats::YVYU },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_UYVY), formats::UYVY },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_VYUY), formats::VYUY },\n>  \n>  \t/* YUV planar formats. */\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_NV16), PixelFormat(DRM_FORMAT_NV16) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_NV61), PixelFormat(DRM_FORMAT_NV61) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_NV12), PixelFormat(DRM_FORMAT_NV12) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_NV21), PixelFormat(DRM_FORMAT_NV21) },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_NV16), formats::NV16 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_NV61), formats::NV61 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_NV12), formats::NV12 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_NV21), formats::NV21 },\n>  \n>  \t/* Greyscale formats. */\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_GREY), PixelFormat(DRM_FORMAT_R8) },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_GREY), formats::R8 },\n>  \n>  \t/* Bayer formats. */\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8), PixelFormat(DRM_FORMAT_SBGGR8) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG8), PixelFormat(DRM_FORMAT_SGBRG8) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG8), PixelFormat(DRM_FORMAT_SGRBG8) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB8), PixelFormat(DRM_FORMAT_SRGGB8) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10), PixelFormat(DRM_FORMAT_SBGGR10) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10), PixelFormat(DRM_FORMAT_SGBRG10) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10), PixelFormat(DRM_FORMAT_SGRBG10) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10), PixelFormat(DRM_FORMAT_SRGGB10) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10P),\n> -\t  PixelFormat(DRM_FORMAT_SBGGR10, MIPI_FORMAT_MOD_CSI2_PACKED) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10P),\n> -\t  PixelFormat(DRM_FORMAT_SGBRG10, MIPI_FORMAT_MOD_CSI2_PACKED) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10P),\n> -\t  PixelFormat(DRM_FORMAT_SGRBG10, MIPI_FORMAT_MOD_CSI2_PACKED) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10P),\n> -\t  PixelFormat(DRM_FORMAT_SRGGB10, MIPI_FORMAT_MOD_CSI2_PACKED) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12), PixelFormat(DRM_FORMAT_SBGGR12) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12), PixelFormat(DRM_FORMAT_SGBRG12) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12), PixelFormat(DRM_FORMAT_SGRBG12) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12), PixelFormat(DRM_FORMAT_SRGGB12) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12P),\n> -\t  PixelFormat(DRM_FORMAT_SBGGR12, MIPI_FORMAT_MOD_CSI2_PACKED) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12P),\n> -\t  PixelFormat(DRM_FORMAT_SGBRG12, MIPI_FORMAT_MOD_CSI2_PACKED) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12P),\n> -\t  PixelFormat(DRM_FORMAT_SGRBG12, MIPI_FORMAT_MOD_CSI2_PACKED) },\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12P),\n> -\t  PixelFormat(DRM_FORMAT_SRGGB12, MIPI_FORMAT_MOD_CSI2_PACKED) },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8), formats::SBGGR8 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG8), formats::SGBRG8 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG8), formats::SGRBG8 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB8), formats::SRGGB8 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10), formats::SBGGR10 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10), formats::SGBRG10 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10), formats::SGRBG10 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10), formats::SRGGB10 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10P), formats::SBGGR10_CSI2P },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10P), formats::SGBRG10_CSI2P },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10P), formats::SGRBG10_CSI2P },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10P), formats::SRGGB10_CSI2P },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12), formats::SBGGR12 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12), formats::SGBRG12 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12), formats::SGRBG12 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12), formats::SRGGB12 },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12P), formats::SBGGR12_CSI2P },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12P), formats::SGBRG12_CSI2P },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12P), formats::SGRBG12_CSI2P },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12P), formats::SRGGB12_CSI2P },\n\nI'm happy to see that table formats nicely now too!\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n>  \n>  \t/* Compressed formats. */\n> -\t{ V4L2PixelFormat(V4L2_PIX_FMT_MJPEG), PixelFormat(DRM_FORMAT_MJPEG) },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_MJPEG), formats::MJPEG },\n>  };\n>  \n>  } /* namespace */\n>","headers":{"Return-Path":"<kieran.bingham@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0B806603D0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 28 May 2020 12:23:17 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 64CE12A8;\n\tThu, 28 May 2020 12:23:16 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"Fcfi37Mx\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1590661396;\n\tbh=cqgK3qsGhRP8F/5lPjdnklsoKriERrodQ42/lfAcc6M=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=Fcfi37MxwVplKV7ic88YqQUyGSkIYY/lwpwA5cJbBWY7HC2l8yf+3shhntMPlPYZq\n\tQmR2o1cw+x35xhFhvo1KFhWS5S7nIB9M7LyGaE+sjrrPpAWnRbs/bbAmAdyA+I6EA6\n\tvHQQdAp6esI7BlleFrlcSUse59njfngoiOzhEXq0=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200522145459.16836-1-laurent.pinchart@ideasonboard.com>\n\t<20200522145459.16836-13-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<9b4c3fe8-95a7-f804-a176-52a85d036de2@ideasonboard.com>","Date":"Thu, 28 May 2020 11:23:13 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.7.0","MIME-Version":"1.0","In-Reply-To":"<20200522145459.16836-13-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH/RFC 11/11] libcamera: Replace explicit\n\tDRM FourCCs with libcamera formats","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Thu, 28 May 2020 10:23:17 -0000"}}]