Commit b84f60a3 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab
Browse files

media: Rename V4L2_PIX_FMT_SUNXI_TILED_NV12 to V4L2_PIX_FMT_NV12_32L32 



The V4L2_PIX_FMT_SUNXI_TILED_NV12 format is actually a fairly
common NV12 tiled format, with 32x32 linear tiles. Rename the format
and move its documentation together with the other tiled NV12 formats.

Keep V4L2_PIX_FMT_SUNXI_TILED_NV12 for application compatibility.

Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 9be0352d

Documentation/userspace-api/media/v4l/pixfmt-reserved.rst

+0 −14
Original line number Diff line number Diff line
@@ -246,20 +246,6 @@ please make a proposal on the linux-media mailing list. 
	It is an opaque intermediate format and the MDP hardware must be

	used to convert ``V4L2_PIX_FMT_MT21C`` to ``V4L2_PIX_FMT_NV12M``,

	``V4L2_PIX_FMT_YUV420M`` or ``V4L2_PIX_FMT_YVU420``.

    * .. _V4L2-PIX-FMT-SUNXI-TILED-NV12:



      - ``V4L2_PIX_FMT_SUNXI_TILED_NV12``

      - 'ST12'

      - Two-planar NV12-based format used by the video engine found on Allwinner

	(codenamed sunxi) platforms, with 32x32 tiles for the luminance plane

	and 32x64 tiles for the chrominance plane. The data in each tile is

	stored in linear order, within the tile bounds. Each tile follows the

	previous one linearly in memory (from left to right, top to bottom).



	The associated buffer dimensions are aligned to match an integer number

	of tiles, resulting in 32-aligned resolutions for the luminance plane

	and 16-aligned resolutions for the chrominance plane (with 2x2

	subsampling).



.. raw:: latex

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

+10 −3
Original line number Diff line number Diff line
@@ -254,14 +254,16 @@ of the luma plane. 


.. _V4L2-PIX-FMT-NV12MT:

.. _V4L2-PIX-FMT-NV12MT-16X16:

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



NV12MT and MV12MT_16X16

-----------------------

Tiled NV12

----------



Semi-planar YUV 4:2:0 formats, using macroblock tiling. The chroma plane is

subsampled by 2 in each direction. Chroma lines contain half the number of

pixels and the same number of bytes as luma lines, and the chroma plane

contains half the number of lines of the luma plane.

contains half the number of lines of the luma plane. Each tile follows the

previous one linearly in memory (from left to right, top to bottom).



``V4L2_PIX_FMT_NV12MT_16X16`` stores pixel in 2D 16x16 macroblocks, and stores

macroblocks linearly in memory. The line stride and image height must be
@@ -276,6 +278,11 @@ If the vertical resolution is an odd number of macroblocks, the last row of 
macroblocks is stored in linear order. The layouts of the luma and chroma

planes are identical.



``V4L2_PIX_FMT_NV12_32L32`` stores pixel in 32x32 tiles, and stores

tiles linearly in memory. The line stride and image height must be

aligned to a multiple of 32. The layouts of the luma and chroma planes are

identical.



.. _nv12mt:



.. kernel-figure:: nv12mt.svg

Documentation/userspace-api/media/videodev2.h.rst.exceptions

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ replace define V4L2_CAP_IO_MC device-capabilities 
# V4L2 pix flags

replace define V4L2_PIX_FMT_PRIV_MAGIC :c:type:`v4l2_pix_format`

replace define V4L2_PIX_FMT_FLAG_PREMUL_ALPHA format-flags

replace define V4L2_PIX_FMT_SUNXI_TILED_NV12 :c:type:`v4l2_pix_format`



# V4L2 format flags

replace define V4L2_FMT_FLAG_COMPRESSED fmtdesc-flags

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

+1 −1
Original line number Diff line number Diff line
@@ -1282,6 +1282,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) 
	case V4L2_PIX_FMT_NV61:		descr = "Y/CrCb 4:2:2"; break;

	case V4L2_PIX_FMT_NV24:		descr = "Y/CbCr 4:4:4"; break;

	case V4L2_PIX_FMT_NV42:		descr = "Y/CrCb 4:4:4"; break;

	case V4L2_PIX_FMT_NV12_32L32:   descr = "Y/CbCr 4:2:0 (32x32 Linear)"; break;

	case V4L2_PIX_FMT_NV12M:	descr = "Y/CbCr 4:2:0 (N-C)"; break;

	case V4L2_PIX_FMT_NV21M:	descr = "Y/CrCb 4:2:0 (N-C)"; break;

	case V4L2_PIX_FMT_NV16M:	descr = "Y/CbCr 4:2:2 (N-C)"; break;
@@ -1415,7 +1416,6 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) 
		case V4L2_PIX_FMT_SE401:	descr = "GSPCA SE401"; break;

		case V4L2_PIX_FMT_S5C_UYVY_JPG:	descr = "S5C73MX interleaved UYVY/JPEG"; break;

		case V4L2_PIX_FMT_MT21C:	descr = "Mediatek Compressed Format"; break;

		case V4L2_PIX_FMT_SUNXI_TILED_NV12: descr = "Sunxi Tiled NV12 Format"; break;

		default:

			if (fmt->description[0])

				return;

drivers/staging/media/sunxi/cedrus/cedrus.c

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static int cedrus_open(struct file *file) 
		ret = PTR_ERR(ctx->fh.m2m_ctx);

		goto err_ctrls;

	}

	ctx->dst_fmt.pixelformat = V4L2_PIX_FMT_SUNXI_TILED_NV12;

	ctx->dst_fmt.pixelformat = V4L2_PIX_FMT_NV12_32L32;

	cedrus_prepare_format(&ctx->dst_fmt);

	ctx->src_fmt.pixelformat = V4L2_PIX_FMT_MPEG2_SLICE;

	/*