Hi Kieran On Fri, Feb 09, 2024 at 05:35:50PM +0000, Kieran Bingham wrote: > In $SUBJECT s/BRG48/BGR48/ > > > The other references all look like they state BGR correctly so with that > fixed: > > Reviewed-by: Kieran Bingham <kieran.bingham@xxxxxxxxxxxxxxxx> > > I think I heard you might have run this through some new linux-media CI > system. Does that produce artifacts that make it easy to see the > produced documentation? That would be easier to look at than the source > to see the table. > The pipeline fails at checkpatch stage https://gitlab.freedesktop.org/linux-media/media-staging/-/pipelines/1099269 and does not continue further. As in this case the checkpatch errors are to be ignored, I opened an issue asking for pipelines not to be stopped if checkpatch fails https://gitlab.freedesktop.org/linux-media/media-ci/-/issues/25 Thanks j > -- > Kieran > > > > Quoting Jacopo Mondi (2024-02-09 16:48:18) > > Add BGR48 and RGB48 16-bit per component image formats. > > > > Signed-off-by: Jacopo Mondi <jacopo.mondi@xxxxxxxxxxxxxxxx> > > --- > > .../userspace-api/media/v4l/pixfmt-rgb.rst | 39 +++++++++++++++++++ > > drivers/media/v4l2-core/v4l2-common.c | 2 + > > drivers/media/v4l2-core/v4l2-ioctl.c | 2 + > > include/uapi/linux/videodev2.h | 4 ++ > > 4 files changed, 47 insertions(+) > > > > diff --git a/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst b/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst > > index b71b80d634d6..458308ae4eb8 100644 > > --- a/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst > > +++ b/Documentation/userspace-api/media/v4l/pixfmt-rgb.rst > > @@ -996,6 +996,45 @@ arranged in little endian order. > > > > \normalsize > > > > +16 Bits Per Component > > +===================== > > + > > +These formats store an RGB triplet in six bytes, with 16 bits per component. > > + > > +.. raw:: latex > > + > > + \small > > + > > +.. flat-table:: RGB Formats With 16 Bits Per Component > > + :header-rows: 1 > > + > > + * - Identifier > > + - Code > > + - Byte 1-0 > > + - Byte 3-2 > > + - Byte 5-4 > > + * .. _V4L2-PIX-FMT-BGR48: > > + > > + - ``V4L2_PIX_FMT_BGR48`` > > + - 'BGR6' > > + > > + - B\ :sub:`15-0` > > + - G\ :sub:`15-0` > > + - R\ :sub:`15-0` > > + - > > + * .. _V4L2-PIX-FMT-RGB48: > > + > > + - ``V4L2_PIX_FMT_RGB48`` > > + - 'RGB6' > > + > > + - R\ :sub:`15-0` > > + - G\ :sub:`15-0` > > + - B\ :sub:`15-0` > > + > > +.. raw:: latex > > + > > + \normalsize > > + > > Deprecated RGB Formats > > ====================== > > > > diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c > > index d34d210908d9..ff4b4d2de9d2 100644 > > --- a/drivers/media/v4l2-core/v4l2-common.c > > +++ b/drivers/media/v4l2-core/v4l2-common.c > > @@ -253,6 +253,8 @@ const struct v4l2_format_info *v4l2_format_info(u32 format) > > { .format = V4L2_PIX_FMT_RGB555, .pixel_enc = V4L2_PIXEL_ENC_RGB, .mem_planes = 1, .comp_planes = 1, .bpp = { 2, 0, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 1, .vdiv = 1 }, > > { .format = V4L2_PIX_FMT_BGR666, .pixel_enc = V4L2_PIXEL_ENC_RGB, .mem_planes = 1, .comp_planes = 1, .bpp = { 4, 0, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 1, .vdiv = 1 }, > > { .format = V4L2_PIX_FMT_BGR48_12, .pixel_enc = V4L2_PIXEL_ENC_RGB, .mem_planes = 1, .comp_planes = 1, .bpp = { 6, 0, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 1, .vdiv = 1 }, > > + { .format = V4L2_PIX_FMT_BGR48, .pixel_enc = V4L2_PIXEL_ENC_RGB, .mem_planes = 1, .comp_planes = 1, .bpp = { 6, 0, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 1, .vdiv = 1 }, > > + { .format = V4L2_PIX_FMT_RGB48, .pixel_enc = V4L2_PIXEL_ENC_RGB, .mem_planes = 1, .comp_planes = 1, .bpp = { 6, 0, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 1, .vdiv = 1 }, > > { .format = V4L2_PIX_FMT_ABGR64_12, .pixel_enc = V4L2_PIXEL_ENC_RGB, .mem_planes = 1, .comp_planes = 1, .bpp = { 8, 0, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 1, .vdiv = 1 }, > > { .format = V4L2_PIX_FMT_RGBA1010102, .pixel_enc = V4L2_PIXEL_ENC_RGB, .mem_planes = 1, .comp_planes = 1, .bpp = { 4, 0, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 1, .vdiv = 1 }, > > { .format = V4L2_PIX_FMT_RGBX1010102, .pixel_enc = V4L2_PIXEL_ENC_RGB, .mem_planes = 1, .comp_planes = 1, .bpp = { 4, 0, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 1, .vdiv = 1 }, > > diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c > > index 24f52485e59c..3c9b5b2f456c 100644 > > --- a/drivers/media/v4l2-core/v4l2-ioctl.c > > +++ b/drivers/media/v4l2-core/v4l2-ioctl.c > > @@ -1298,6 +1298,8 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) > > case V4L2_PIX_FMT_RGBX1010102: descr = "32-bit RGBX 10-10-10-2"; break; > > case V4L2_PIX_FMT_RGBA1010102: descr = "32-bit RGBA 10-10-10-2"; break; > > case V4L2_PIX_FMT_ARGB2101010: descr = "32-bit ARGB 2-10-10-10"; break; > > + case V4L2_PIX_FMT_BGR48: descr = "48-bit BGR 16-16-16"; break; > > + case V4L2_PIX_FMT_RGB48: descr = "48-bit RGB 16-16-16"; break; > > case V4L2_PIX_FMT_BGR48_12: descr = "12-bit Depth BGR"; break; > > case V4L2_PIX_FMT_ABGR64_12: descr = "12-bit Depth BGRA"; break; > > case V4L2_PIX_FMT_GREY: descr = "8-bit Greyscale"; break; > > diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h > > index 94a0373e8234..2782c7962974 100644 > > --- a/include/uapi/linux/videodev2.h > > +++ b/include/uapi/linux/videodev2.h > > @@ -584,6 +584,10 @@ struct v4l2_pix_format { > > #define V4L2_PIX_FMT_BGR48_12 v4l2_fourcc('B', '3', '1', '2') /* 48 BGR 12-bit per component */ > > #define V4L2_PIX_FMT_ABGR64_12 v4l2_fourcc('B', '4', '1', '2') /* 64 BGRA 12-bit per component */ > > > > +/* RGB formats (6 bytes per pixel) */ > > +#define V4L2_PIX_FMT_BGR48 v4l2_fourcc('B', 'G', 'R', '6') /* 16 BGR-16-16-16 */ > > +#define V4L2_PIX_FMT_RGB48 v4l2_fourcc('R', 'G', 'B', '6') /* 16 RGB-16-16-16 */ > > + > > /* Grey formats */ > > #define V4L2_PIX_FMT_GREY v4l2_fourcc('G', 'R', 'E', 'Y') /* 8 Greyscale */ > > #define V4L2_PIX_FMT_Y4 v4l2_fourcc('Y', '0', '4', ' ') /* 4 Greyscale */ > > -- > > 2.43.0 > >
