| Message ID | 20200930200831.2066751-6-niklas.soderlund@ragnatech.se |
|---|---|
| State | Accepted |
| Headers | show |
| Series |
|
| Related | show |
On Wed, Sep 30, 2020 at 10:08:30PM +0200, Niklas Söderlund wrote: > Add support for XRGB8888 and XBGR8888 formats. > > Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> > --- > src/libcamera/formats.cpp | 20 ++++++++++++++++++++ > src/libcamera/v4l2_pixelformat.cpp | 2 ++ > 2 files changed, 22 insertions(+) > > diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp > index ebaae9be3d75fe58..cc6e579005b2d4b6 100644 > --- a/src/libcamera/formats.cpp > +++ b/src/libcamera/formats.cpp > @@ -175,6 +175,26 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{ > .pixelsPerGroup = 1, > .planes = {{ { 3, 1 }, { 0, 0 }, { 0, 0 } }}, > } }, > + { formats::XRGB8888, { > + .name = "XRGB8888", > + .format = formats::XRGB8888, > + .v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_XBGR32), > + .bitsPerPixel = 32, > + .colourEncoding = PixelFormatInfo::ColourEncodingRGB, > + .packed = false, > + .pixelsPerGroup = 1, > + .planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }}, > + } }, > + { formats::XBGR8888, { > + .name = "XBGR8888", > + .format = formats::XBGR8888, > + .v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_XRGB32), > + .bitsPerPixel = 32, > + .colourEncoding = PixelFormatInfo::ColourEncodingRGB, > + .packed = false, > + .pixelsPerGroup = 1, > + .planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }}, > + } }, > { formats::ABGR8888, { > .name = "ABGR8888", > .format = formats::ABGR8888, > diff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp > index 30c94bb98f442b08..ea4eef2c19461d52 100644 > --- a/src/libcamera/v4l2_pixelformat.cpp > +++ b/src/libcamera/v4l2_pixelformat.cpp > @@ -48,6 +48,8 @@ const std::map<V4L2PixelFormat, PixelFormat> vpf2pf{ > { V4L2PixelFormat(V4L2_PIX_FMT_RGB565), formats::RGB565 }, > { V4L2PixelFormat(V4L2_PIX_FMT_RGB24), formats::BGR888 }, > { V4L2PixelFormat(V4L2_PIX_FMT_BGR24), formats::RGB888 }, > + { V4L2PixelFormat(V4L2_PIX_FMT_XBGR32), formats::XRGB8888 }, > + { V4L2PixelFormat(V4L2_PIX_FMT_XBGR32), formats::XBGR8888 }, V4L2_PIX_FMT_XRGB32 ? Paul > { V4L2PixelFormat(V4L2_PIX_FMT_RGBA32), formats::ABGR8888 }, > { V4L2PixelFormat(V4L2_PIX_FMT_ABGR32), formats::ARGB8888 }, > { V4L2PixelFormat(V4L2_PIX_FMT_ARGB32), formats::BGRA8888 }, > -- > 2.28.0 > > _______________________________________________ > libcamera-devel mailing list > libcamera-devel@lists.libcamera.org > https://lists.libcamera.org/listinfo/libcamera-devel
diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp index ebaae9be3d75fe58..cc6e579005b2d4b6 100644 --- a/src/libcamera/formats.cpp +++ b/src/libcamera/formats.cpp @@ -175,6 +175,26 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{ .pixelsPerGroup = 1, .planes = {{ { 3, 1 }, { 0, 0 }, { 0, 0 } }}, } }, + { formats::XRGB8888, { + .name = "XRGB8888", + .format = formats::XRGB8888, + .v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_XBGR32), + .bitsPerPixel = 32, + .colourEncoding = PixelFormatInfo::ColourEncodingRGB, + .packed = false, + .pixelsPerGroup = 1, + .planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }}, + } }, + { formats::XBGR8888, { + .name = "XBGR8888", + .format = formats::XBGR8888, + .v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_XRGB32), + .bitsPerPixel = 32, + .colourEncoding = PixelFormatInfo::ColourEncodingRGB, + .packed = false, + .pixelsPerGroup = 1, + .planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }}, + } }, { formats::ABGR8888, { .name = "ABGR8888", .format = formats::ABGR8888, diff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp index 30c94bb98f442b08..ea4eef2c19461d52 100644 --- a/src/libcamera/v4l2_pixelformat.cpp +++ b/src/libcamera/v4l2_pixelformat.cpp @@ -48,6 +48,8 @@ const std::map<V4L2PixelFormat, PixelFormat> vpf2pf{ { V4L2PixelFormat(V4L2_PIX_FMT_RGB565), formats::RGB565 }, { V4L2PixelFormat(V4L2_PIX_FMT_RGB24), formats::BGR888 }, { V4L2PixelFormat(V4L2_PIX_FMT_BGR24), formats::RGB888 }, + { V4L2PixelFormat(V4L2_PIX_FMT_XBGR32), formats::XRGB8888 }, + { V4L2PixelFormat(V4L2_PIX_FMT_XBGR32), formats::XBGR8888 }, { V4L2PixelFormat(V4L2_PIX_FMT_RGBA32), formats::ABGR8888 }, { V4L2PixelFormat(V4L2_PIX_FMT_ABGR32), formats::ARGB8888 }, { V4L2PixelFormat(V4L2_PIX_FMT_ARGB32), formats::BGRA8888 },
Add support for XRGB8888 and XBGR8888 formats. Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> --- src/libcamera/formats.cpp | 20 ++++++++++++++++++++ src/libcamera/v4l2_pixelformat.cpp | 2 ++ 2 files changed, 22 insertions(+)