Commit 5b8bb216 authored by Ming Qian's avatar Ming Qian Committed by Mauro Carvalho Chehab
Browse files

media: add nv12_8l128 and nv12_10be_8l128 video format. 



add contiguous nv12 tiled format nv12_8l128 and nv12_10be_8l128

Signed-off-by: default avatarMing Qian <ming.qian@nxp.com>
Reviewed-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 0625b6b8

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

+8 −0
Original line number Diff line number Diff line
@@ -273,7 +273,9 @@ of the luma plane. 
.. _V4L2-PIX-FMT-NV12-16L16:

.. _V4L2-PIX-FMT-NV12-32L32:

.. _V4L2-PIX-FMT-NV12M-8L128:

.. _V4L2-PIX-FMT-NV12-8L128:

.. _V4L2-PIX-FMT-NV12M-10BE-8L128:

.. _V4L2-PIX-FMT-NV12-10BE-8L128:

.. _V4L2-PIX-FMT-MM21:



Tiled NV12
@@ -319,6 +321,9 @@ pixels in 2D 8x128 tiles, and stores tiles linearly in memory. 
The image height must be aligned to a multiple of 128.

The layouts of the luma and chroma planes are identical.



``V4L2_PIX_FMT_NV12_8L128`` is similar to ``V4L2_PIX_FMT_NV12M_8L128`` but stores

two planes in one memory.



``V4L2_PIX_FMT_NV12M_10BE_8L128`` is similar to ``V4L2_PIX_FMT_NV12M`` but stores

10 bits pixels in 2D 8x128 tiles, and stores tiles linearly in memory.

the data is arranged in big endian order.
@@ -334,6 +339,9 @@ byte 2: Y1(bits 3-0) Y2(bits 9-6) 
byte 3: Y2(bits 5-0) Y3(bits 9-8)

byte 4: Y3(bits 7-0)



``V4L2_PIX_FMT_NV12_10BE_8L128`` is similar to ``V4L2_PIX_FMT_NV12M_10BE_8L128`` but stores

two planes in one memory.



``V4L2_PIX_FMT_MM21`` store luma pixel in 16x32 tiles, and chroma pixels

in 16x16 tiles. The line stride must be aligned to a multiple of 16 and the

image height must be aligned to a multiple of 32. The number of luma and chroma

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

+2 −0
Original line number Diff line number Diff line
@@ -1438,7 +1438,9 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) 
	case V4L2_META_FMT_VIVID:       descr = "Vivid Metadata"; break;

	case V4L2_META_FMT_RK_ISP1_PARAMS:	descr = "Rockchip ISP1 3A Parameters"; break;

	case V4L2_META_FMT_RK_ISP1_STAT_3A:	descr = "Rockchip ISP1 3A Statistics"; break;

	case V4L2_PIX_FMT_NV12_8L128:	descr = "NV12 (8x128 Linear)"; break;

	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;



	default:

include/uapi/linux/videodev2.h

+2 −0
Original line number Diff line number Diff line
@@ -654,6 +654,8 @@ struct v4l2_pix_format { 
#define V4L2_PIX_FMT_NV12_16L16 v4l2_fourcc('H', 'M', '1', '2') /* 12  Y/CbCr 4:2:0 16x16 tiles */

#define V4L2_PIX_FMT_NV12_32L32 v4l2_fourcc('S', 'T', '1', '2') /* 12  Y/CbCr 4:2:0 32x32 tiles */

#define V4L2_PIX_FMT_P010_4L4 v4l2_fourcc('T', '0', '1', '0') /* 12  Y/CbCr 4:2:0 10-bit 4x4 macroblocks */

#define V4L2_PIX_FMT_NV12_8L128       v4l2_fourcc('A', 'T', '1', '2') /* Y/CbCr 4:2:0 8x128 tiles */

#define V4L2_PIX_FMT_NV12_10BE_8L128  v4l2_fourcc_be('A', 'X', '1', '2') /* Y/CbCr 4:2:0 10-bit 8x128 tiles */



/* Tiled YUV formats, non contiguous planes */

#define V4L2_PIX_FMT_NV12MT  v4l2_fourcc('T', 'M', '1', '2') /* 12  Y/CbCr 4:2:0 64x32 tiles */