Commit 0dc1d7a7 authored by Tomi Valkeinen's avatar Tomi Valkeinen Committed by Laurent Pinchart
Browse files

media: Add Y210, Y212 and Y216 formats 



Add Y210, Y212 and Y216 formats.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
Acked-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
parent 8d0e3fc6

Documentation/userspace-api/media/v4l/pixfmt-packed-yuv.rst

+47 −2
Original line number Diff line number Diff line
@@ -262,7 +262,12 @@ the second byte and Y'\ :sub:`7-0` in the third byte. 
=================



These formats, commonly referred to as YUYV or YUY2, subsample the chroma

components horizontally by 2, storing 2 pixels in 4 bytes.

components horizontally by 2, storing 2 pixels in a container. The container

is 32-bits for 8-bit formats, and 64-bits for 10+-bit formats.



The packed YUYV formats with more than 8 bits per component are stored as four

16-bit little-endian words. Each word's most significant bits contain one

component, and the least significant bits are zero padding.



.. raw:: latex
@@ -270,7 +275,7 @@ components horizontally by 2, storing 2 pixels in 4 bytes. 


.. tabularcolumns:: |p{3.4cm}|p{1.2cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|



.. flat-table:: Packed YUV 4:2:2 Formats

.. flat-table:: Packed YUV 4:2:2 Formats in 32-bit container

    :header-rows: 1

    :stub-columns: 0
@@ -337,6 +342,46 @@ components horizontally by 2, storing 2 pixels in 4 bytes. 
      - Y'\ :sub:`3`

      - Cb\ :sub:`2`



.. tabularcolumns:: |p{3.4cm}|p{1.2cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|



.. flat-table:: Packed YUV 4:2:2 Formats in 64-bit container

    :header-rows: 1

    :stub-columns: 0



    * - Identifier

      - Code

      - Word 0

      - Word 1

      - Word 2

      - Word 3

    * .. _V4L2-PIX-FMT-Y210:



      - ``V4L2_PIX_FMT_Y210``

      - 'Y210'



      - Y'\ :sub:`0` (bits 15-6)

      - Cb\ :sub:`0` (bits 15-6)

      - Y'\ :sub:`1` (bits 15-6)

      - Cr\ :sub:`0` (bits 15-6)

    * .. _V4L2-PIX-FMT-Y212:



      - ``V4L2_PIX_FMT_Y212``

      - 'Y212'



      - Y'\ :sub:`0` (bits 15-4)

      - Cb\ :sub:`0` (bits 15-4)

      - Y'\ :sub:`1` (bits 15-4)

      - Cr\ :sub:`0` (bits 15-4)

    * .. _V4L2-PIX-FMT-Y216:



      - ``V4L2_PIX_FMT_Y216``

      - 'Y216'



      - Y'\ :sub:`0` (bits 15-0)

      - Cb\ :sub:`0` (bits 15-0)

      - Y'\ :sub:`1` (bits 15-0)

      - Cr\ :sub:`0` (bits 15-0)



.. raw:: latex



    \normalsize

drivers/media/v4l2-core/v4l2-ioctl.c

+3 −0
Original line number Diff line number Diff line
@@ -1445,6 +1445,9 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) 
	case V4L2_PIX_FMT_NV12M_8L128:	descr = "NV12M (8x128 Linear)"; break;

	case V4L2_PIX_FMT_NV12_10BE_8L128:	descr = "10-bit NV12 (8x128 Linear, BE)"; break;

	case V4L2_PIX_FMT_NV12M_10BE_8L128:	descr = "10-bit NV12M (8x128 Linear, BE)"; break;

	case V4L2_PIX_FMT_Y210:		descr = "10-bit YUYV Packed"; break;

	case V4L2_PIX_FMT_Y212:		descr = "12-bit YUYV Packed"; break;

	case V4L2_PIX_FMT_Y216:		descr = "16-bit YUYV Packed"; break;



	default:

		/* Compressed formats */

include/uapi/linux/videodev2.h

+8 −0
Original line number Diff line number Diff line
@@ -621,6 +621,14 @@ struct v4l2_pix_format { 
#define V4L2_PIX_FMT_YUVX32  v4l2_fourcc('Y', 'U', 'V', 'X') /* 32  YUVX-8-8-8-8  */

#define V4L2_PIX_FMT_M420    v4l2_fourcc('M', '4', '2', '0') /* 12  YUV 4:2:0 2 lines y, 1 line uv interleaved */



/*

 * YCbCr packed format. For each Y2xx format, xx bits of valid data occupy the MSBs

 * of the 16 bit components, and 16-xx bits of zero padding occupy the LSBs.

 */

#define V4L2_PIX_FMT_Y210    v4l2_fourcc('Y', '2', '1', '0') /* 32  YUYV 4:2:2 */

#define V4L2_PIX_FMT_Y212    v4l2_fourcc('Y', '2', '1', '2') /* 32  YUYV 4:2:2 */

#define V4L2_PIX_FMT_Y216    v4l2_fourcc('Y', '2', '1', '6') /* 32  YUYV 4:2:2 */



/* two planes -- one Y, one Cr + Cb interleaved  */

#define V4L2_PIX_FMT_NV12    v4l2_fourcc('N', 'V', '1', '2') /* 12  Y/CbCr 4:2:0  */

#define V4L2_PIX_FMT_NV21    v4l2_fourcc('N', 'V', '2', '1') /* 12  Y/CrCb 4:2:0  */