| Message ID | 20220112161014.972076-4-jeanmichel.hautbois@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add 12bit and 14bit luma-only formats | expand |
Hi Jean-Michel Thank you for the patch. On Wed, Jan 12, 2022 at 05:10:14PM +0100, Jean-Michel Hautbois wrote: > This is a packed grey-scale image format with a depth of 14 bits per > pixel. Every four consecutive samples are packed into seven bytes. Each > of the first four bytes contain the eight high order bits of the pixels, > and the three following bytes contains the six least significants bits > of each pixel, in the same order. > > As the other formats only needed 5 bytes before, append two bytes in the > documentation array. > > Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com> > --- > .../media/v4l/pixfmt-yuv-luma.rst | 33 +++++++++++++++++++ > drivers/media/v4l2-core/v4l2-ioctl.c | 1 + > include/uapi/linux/videodev2.h | 1 + > 3 files changed, 35 insertions(+) > > diff --git a/Documentation/userspace-api/media/v4l/pixfmt-yuv-luma.rst b/Documentation/userspace-api/media/v4l/pixfmt-yuv-luma.rst > index d37ce6027095..1f645fde6d5c 100644 > --- a/Documentation/userspace-api/media/v4l/pixfmt-yuv-luma.rst > +++ b/Documentation/userspace-api/media/v4l/pixfmt-yuv-luma.rst > @@ -36,6 +36,8 @@ are often referred to as greyscale formats. > - Byte 2 > - Byte 3 > - Byte 4 > + - Byte 5 > + - Byte 6 > > * .. _V4L2-PIX-FMT-GREY: > > @@ -47,6 +49,8 @@ are often referred to as greyscale formats. > - ... > - ... > - ... > + - ... > + - ... > > * .. _V4L2-PIX-FMT-Y10: > > @@ -58,6 +62,8 @@ are often referred to as greyscale formats. > - ... > - ... > - ... > + - ... > + - ... > > * .. _V4L2-PIX-FMT-Y10BPACK: > > @@ -69,6 +75,8 @@ are often referred to as greyscale formats. > - Y'\ :sub:`1`\ [3:0] Y'\ :sub:`2`\ [9:6] > - Y'\ :sub:`2`\ [5:0] Y'\ :sub:`3`\ [9:8] > - Y'\ :sub:`3`\ [7:0] > + - ... > + - ... > > * .. _V4L2-PIX-FMT-Y10P: > > @@ -80,6 +88,8 @@ are often referred to as greyscale formats. > - Y'\ :sub:`2`\ [9:2] > - Y'\ :sub:`3`\ [9:2] > - Y'\ :sub:`3`\ [1:0] Y'\ :sub:`2`\ [1:0] Y'\ :sub:`1`\ [1:0] Y'\ :sub:`0`\ [1:0] > + - ... > + - ... > > * .. _V4L2-PIX-FMT-Y12: > > @@ -91,6 +101,8 @@ are often referred to as greyscale formats. > - ... > - ... > - ... > + - ... > + - ... > > * .. _V4L2-PIX-FMT-Y12P: > > @@ -102,6 +114,8 @@ are often referred to as greyscale formats. > - Y'\ :sub:`1`\ [3:0] Y'\ :sub:`0`\ [3:0] > - ... > - ... > + - ... > + - ... > > * .. _V4L2-PIX-FMT-Y14: > > @@ -113,6 +127,21 @@ are often referred to as greyscale formats. > - ... > - ... > - ... > + - ... > + - ... > + > + * .. _V4L2-PIX-FMT-Y14P: > + > + - ``V4L2_PIX_FMT_Y14P`` > + - 'Y14P' > + > + - Y'\ :sub:`0`\ [13:6] > + - Y'\ :sub:`1`\ [13:6] > + - Y'\ :sub:`2`\ [13:6] > + - Y'\ :sub:`3`\ [13:6] > + - Y'\ :sub:`1`\ [1:0] Y'\ :sub:`0`\ [5:0] > + - Y'\ :sub:`2`\ [3:0] Y'\ :sub:`1`\ [5:2] > + - Y'\ :sub:`3`\ [5:0] Y'\ :sub:`2`\ [1:0] This should be - Y'\ :sub:`3`\ [5:0] Y'\ :sub:`2`\ [5:4] Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > * .. _V4L2-PIX-FMT-Y16: > > @@ -124,6 +153,8 @@ are often referred to as greyscale formats. > - ... > - ... > - ... > + - ... > + - ... > > * .. _V4L2-PIX-FMT-Y16-BE: > > @@ -135,6 +166,8 @@ are often referred to as greyscale formats. > - ... > - ... > - ... > + - ... > + - ... > > .. raw:: latex > > diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c > index e90979af8efb..4e33b86c6d27 100644 > --- a/drivers/media/v4l2-core/v4l2-ioctl.c > +++ b/drivers/media/v4l2-core/v4l2-ioctl.c > @@ -1264,6 +1264,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) > case V4L2_PIX_FMT_Y10BPACK: descr = "10-bit Greyscale (Packed)"; break; > case V4L2_PIX_FMT_Y10P: descr = "10-bit Greyscale (MIPI Packed)"; break; > case V4L2_PIX_FMT_Y12P: descr = "12-bit Greyscale (MIPI Packed)"; break; > + case V4L2_PIX_FMT_Y14P: descr = "14-bit Greyscale (MIPI Packed)"; break; > case V4L2_PIX_FMT_Y8I: descr = "Interleaved 8-bit Greyscale"; break; > case V4L2_PIX_FMT_Y12I: descr = "Interleaved 12-bit Greyscale"; break; > case V4L2_PIX_FMT_Z16: descr = "16-bit Depth"; break; > diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h > index 39ab8c216fe8..581537ce12a3 100644 > --- a/include/uapi/linux/videodev2.h > +++ b/include/uapi/linux/videodev2.h > @@ -570,6 +570,7 @@ struct v4l2_pix_format { > #define V4L2_PIX_FMT_Y10BPACK v4l2_fourcc('Y', '1', '0', 'B') /* 10 Greyscale bit-packed */ > #define V4L2_PIX_FMT_Y10P v4l2_fourcc('Y', '1', '0', 'P') /* 10 Greyscale, MIPI RAW10 packed */ > #define V4L2_PIX_FMT_Y12P v4l2_fourcc('Y', '1', '2', 'P') /* 12 Greyscale, MIPI RAW12 packed */ > +#define V4L2_PIX_FMT_Y14P v4l2_fourcc('Y', '1', '4', 'P') /* 14 Greyscale, MIPI RAW12 packed */ > > /* Palette formats */ > #define V4L2_PIX_FMT_PAL8 v4l2_fourcc('P', 'A', 'L', '8') /* 8 8-bit palette */
diff --git a/Documentation/userspace-api/media/v4l/pixfmt-yuv-luma.rst b/Documentation/userspace-api/media/v4l/pixfmt-yuv-luma.rst index d37ce6027095..1f645fde6d5c 100644 --- a/Documentation/userspace-api/media/v4l/pixfmt-yuv-luma.rst +++ b/Documentation/userspace-api/media/v4l/pixfmt-yuv-luma.rst @@ -36,6 +36,8 @@ are often referred to as greyscale formats. - Byte 2 - Byte 3 - Byte 4 + - Byte 5 + - Byte 6 * .. _V4L2-PIX-FMT-GREY: @@ -47,6 +49,8 @@ are often referred to as greyscale formats. - ... - ... - ... + - ... + - ... * .. _V4L2-PIX-FMT-Y10: @@ -58,6 +62,8 @@ are often referred to as greyscale formats. - ... - ... - ... + - ... + - ... * .. _V4L2-PIX-FMT-Y10BPACK: @@ -69,6 +75,8 @@ are often referred to as greyscale formats. - Y'\ :sub:`1`\ [3:0] Y'\ :sub:`2`\ [9:6] - Y'\ :sub:`2`\ [5:0] Y'\ :sub:`3`\ [9:8] - Y'\ :sub:`3`\ [7:0] + - ... + - ... * .. _V4L2-PIX-FMT-Y10P: @@ -80,6 +88,8 @@ are often referred to as greyscale formats. - Y'\ :sub:`2`\ [9:2] - Y'\ :sub:`3`\ [9:2] - Y'\ :sub:`3`\ [1:0] Y'\ :sub:`2`\ [1:0] Y'\ :sub:`1`\ [1:0] Y'\ :sub:`0`\ [1:0] + - ... + - ... * .. _V4L2-PIX-FMT-Y12: @@ -91,6 +101,8 @@ are often referred to as greyscale formats. - ... - ... - ... + - ... + - ... * .. _V4L2-PIX-FMT-Y12P: @@ -102,6 +114,8 @@ are often referred to as greyscale formats. - Y'\ :sub:`1`\ [3:0] Y'\ :sub:`0`\ [3:0] - ... - ... + - ... + - ... * .. _V4L2-PIX-FMT-Y14: @@ -113,6 +127,21 @@ are often referred to as greyscale formats. - ... - ... - ... + - ... + - ... + + * .. _V4L2-PIX-FMT-Y14P: + + - ``V4L2_PIX_FMT_Y14P`` + - 'Y14P' + + - Y'\ :sub:`0`\ [13:6] + - Y'\ :sub:`1`\ [13:6] + - Y'\ :sub:`2`\ [13:6] + - Y'\ :sub:`3`\ [13:6] + - Y'\ :sub:`1`\ [1:0] Y'\ :sub:`0`\ [5:0] + - Y'\ :sub:`2`\ [3:0] Y'\ :sub:`1`\ [5:2] + - Y'\ :sub:`3`\ [5:0] Y'\ :sub:`2`\ [1:0] * .. _V4L2-PIX-FMT-Y16: @@ -124,6 +153,8 @@ are often referred to as greyscale formats. - ... - ... - ... + - ... + - ... * .. _V4L2-PIX-FMT-Y16-BE: @@ -135,6 +166,8 @@ are often referred to as greyscale formats. - ... - ... - ... + - ... + - ... .. raw:: latex diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index e90979af8efb..4e33b86c6d27 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1264,6 +1264,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) case V4L2_PIX_FMT_Y10BPACK: descr = "10-bit Greyscale (Packed)"; break; case V4L2_PIX_FMT_Y10P: descr = "10-bit Greyscale (MIPI Packed)"; break; case V4L2_PIX_FMT_Y12P: descr = "12-bit Greyscale (MIPI Packed)"; break; + case V4L2_PIX_FMT_Y14P: descr = "14-bit Greyscale (MIPI Packed)"; break; case V4L2_PIX_FMT_Y8I: descr = "Interleaved 8-bit Greyscale"; break; case V4L2_PIX_FMT_Y12I: descr = "Interleaved 12-bit Greyscale"; break; case V4L2_PIX_FMT_Z16: descr = "16-bit Depth"; break; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 39ab8c216fe8..581537ce12a3 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -570,6 +570,7 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_Y10BPACK v4l2_fourcc('Y', '1', '0', 'B') /* 10 Greyscale bit-packed */ #define V4L2_PIX_FMT_Y10P v4l2_fourcc('Y', '1', '0', 'P') /* 10 Greyscale, MIPI RAW10 packed */ #define V4L2_PIX_FMT_Y12P v4l2_fourcc('Y', '1', '2', 'P') /* 12 Greyscale, MIPI RAW12 packed */ +#define V4L2_PIX_FMT_Y14P v4l2_fourcc('Y', '1', '4', 'P') /* 14 Greyscale, MIPI RAW12 packed */ /* Palette formats */ #define V4L2_PIX_FMT_PAL8 v4l2_fourcc('P', 'A', 'L', '8') /* 8 8-bit palette */
This is a packed grey-scale image format with a depth of 14 bits per pixel. Every four consecutive samples are packed into seven bytes. Each of the first four bytes contain the eight high order bits of the pixels, and the three following bytes contains the six least significants bits of each pixel, in the same order. As the other formats only needed 5 bytes before, append two bytes in the documentation array. Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com> --- .../media/v4l/pixfmt-yuv-luma.rst | 33 +++++++++++++++++++ drivers/media/v4l2-core/v4l2-ioctl.c | 1 + include/uapi/linux/videodev2.h | 1 + 3 files changed, 35 insertions(+)