From f87e4c3908655446386ced19f85e3a72f663f54a Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Tue, 23 Jan 2024 14:09:52 +0000 Subject: libcamera: formats: Fix sort ordering of R10_CSI2P Move formats::R10_CSI2P to be grouped with the formats::R10 counterpart and keep the section of format declarations sorted in increasing bit depth. Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham --- src/libcamera/formats.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp index 46ccd43b..8a606a7c 100644 --- a/src/libcamera/formats.cpp +++ b/src/libcamera/formats.cpp @@ -497,6 +497,16 @@ const std::map pixelFormatInfo{ .pixelsPerGroup = 1, .planes = {{ { 2, 1 }, { 0, 0 }, { 0, 0 } }}, } }, + { formats::R10_CSI2P, { + .name = "R10_CSI2P", + .format = formats::R10_CSI2P, + .v4l2Formats = { V4L2PixelFormat(V4L2_PIX_FMT_Y10P), }, + .bitsPerPixel = 10, + .colourEncoding = PixelFormatInfo::ColourEncodingYUV, + .packed = true, + .pixelsPerGroup = 4, + .planes = {{ { 5, 1 }, { 0, 0 }, { 0, 0 } }}, + } }, { formats::R12, { .name = "R12", .format = formats::R12, @@ -517,16 +527,6 @@ const std::map pixelFormatInfo{ .pixelsPerGroup = 1, .planes = {{ { 2, 1 }, { 0, 0 }, { 0, 0 } }}, } }, - { formats::R10_CSI2P, { - .name = "R10_CSI2P", - .format = formats::R10_CSI2P, - .v4l2Formats = { V4L2PixelFormat(V4L2_PIX_FMT_Y10P), }, - .bitsPerPixel = 10, - .colourEncoding = PixelFormatInfo::ColourEncodingYUV, - .packed = true, - .pixelsPerGroup = 4, - .planes = {{ { 5, 1 }, { 0, 0 }, { 0, 0 } }}, - } }, /* Bayer formats. */ { formats::SBGGR8, { -- cgit v1.2.1