Commit 1dff2beb authored by Mingjia Zhang's avatar Mingjia Zhang Committed by Mauro Carvalho Chehab
Browse files

media: mediatek: vcodec: Add capture format to support 10bit raster mode 



Define one uncompressed capture format V4L2_PIX_FMT_MT2110R in order to
support 10bit for H264 in mt8195.

Signed-off-by: default avatarMingjia Zhang <mingjia.zhang@mediatek.com>
Co-developed-by: default avatarYunfei Dong <yunfei.dong@mediatek.com>
Signed-off-by: default avatarYunfei Dong <yunfei.dong@mediatek.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 6afcc2b0

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

+6 −0
Original line number Diff line number Diff line
@@ -282,6 +282,12 @@ please make a proposal on the linux-media mailing list. 
      - This format is two-planar 10-Bit tile mode and having similitude with

        ``V4L2_PIX_FMT_MM21`` in term of alignment and tiling. Used for VP9, AV1

        and HEVC.

    * .. _V4L2-PIX-FMT-MT2110R:



      - ``V4L2_PIX_FMT_MT2110R``

      - 'MT2110R'

      - This format is two-planar 10-Bit raster mode and having similitude with

        ``V4L2_PIX_FMT_MM21`` in term of alignment and tiling. Used for AVC.

.. raw:: latex



    \normalsize

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

+2 −0
Original line number Diff line number Diff line
@@ -264,6 +264,8 @@ const struct v4l2_format_info *v4l2_format_info(u32 format) 
		{ .format = V4L2_PIX_FMT_YUV48_12, .pixel_enc = V4L2_PIXEL_ENC_YUV, .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_MT2110T, .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 2, .comp_planes = 2, .bpp = { 5, 10, 0, 0 }, .bpp_div = { 4, 4, 1, 1 }, .hdiv = 2, .vdiv = 2,

		  .block_w = { 16, 8, 0, 0 }, .block_h = { 32, 16, 0, 0 }},

		{ .format = V4L2_PIX_FMT_MT2110R, .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 2, .comp_planes = 2, .bpp = { 5, 10, 0, 0 }, .bpp_div = { 4, 4, 1, 1 }, .hdiv = 2, .vdiv = 2,

		  .block_w = { 16, 8, 0, 0 }, .block_h = { 32, 16, 0, 0 }},



		/* YUV planar formats */

		{ .format = V4L2_PIX_FMT_NV12,    .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 1, .comp_planes = 2, .bpp = { 1, 2, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 2, .vdiv = 2 },

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

+1 −0
Original line number Diff line number Diff line
@@ -1509,6 +1509,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) 
		case V4L2_PIX_FMT_AJPG:		descr = "Aspeed JPEG"; break;

		case V4L2_PIX_FMT_AV1_FRAME:	descr = "AV1 Frame"; break;

		case V4L2_PIX_FMT_MT2110T:	descr = "Mediatek 10bit Tile Mode"; break;

		case V4L2_PIX_FMT_MT2110R:	descr = "Mediatek 10bit Raster Mode"; break;

		default:

			if (fmt->description[0])

				return;

include/uapi/linux/videodev2.h

+1 −0
Original line number Diff line number Diff line
@@ -797,6 +797,7 @@ struct v4l2_pix_format { 
#define V4L2_PIX_FMT_MT21C    v4l2_fourcc('M', 'T', '2', '1') /* Mediatek compressed block mode  */

#define V4L2_PIX_FMT_MM21     v4l2_fourcc('M', 'M', '2', '1') /* Mediatek 8-bit block mode, two non-contiguous planes */

#define V4L2_PIX_FMT_MT2110T  v4l2_fourcc('M', 'T', '2', 'T') /* Mediatek 10-bit block tile mode */

#define V4L2_PIX_FMT_MT2110R  v4l2_fourcc('M', 'T', '2', 'R') /* Mediatek 10-bit block raster mode */

#define V4L2_PIX_FMT_INZI     v4l2_fourcc('I', 'N', 'Z', 'I') /* Intel Planar Greyscale 10-bit and Depth 16-bit */

#define V4L2_PIX_FMT_CNF4     v4l2_fourcc('C', 'N', 'F', '4') /* Intel 4-bit packed depth confidence information */

#define V4L2_PIX_FMT_HI240    v4l2_fourcc('H', 'I', '2', '4') /* BTTV 8-bit dithered RGB */