Commit df22026a authored by Shunqian Zheng's avatar Shunqian Zheng Committed by Mauro Carvalho Chehab
Browse files

media: videodev2.h, v4l2-ioctl: add rkisp1 meta buffer format 



Add the Rockchip ISP1 specific processing parameter format
V4L2_META_FMT_RK_ISP1_PARAMS and metadata format
V4L2_META_FMT_RK_ISP1_STAT_3A for 3A.

Signed-off-by: default avatarShunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: default avatarJacob Chen <jacob2.chen@rock-chips.com>
Signed-off-by: default avatarHelen Koike <helen.koike@collabora.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 9d28a76d

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

+2 −0
Original line number Diff line number Diff line
@@ -1403,6 +1403,8 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) 
	case V4L2_META_FMT_UVC:		descr = "UVC Payload Header Metadata"; break;

	case V4L2_META_FMT_D4XX:	descr = "Intel D4xx UVC Metadata"; break;

	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;



	default:

		/* Compressed formats */

drivers/staging/media/rkisp1/uapi/rkisp1-config.h

+0 −4
Original line number Diff line number Diff line
@@ -9,10 +9,6 @@ 


#include <linux/types.h>



/* Vendor specific - used for RK_ISP1 camera sub-system */

#define V4L2_META_FMT_RK_ISP1_PARAMS   v4l2_fourcc('R', 'K', '1', 'P') /* Rockchip ISP1 params */

#define V4L2_META_FMT_RK_ISP1_STAT_3A  v4l2_fourcc('R', 'K', '1', 'S') /* Rockchip ISP1 3A statistics */



/* Defect Pixel Cluster Detection */

#define RKISP1_CIF_ISP_MODULE_DPCC		(1U << 0)

/* Black Level Subtraction */

include/uapi/linux/videodev2.h

+4 −0
Original line number Diff line number Diff line
@@ -768,6 +768,10 @@ struct v4l2_pix_format { 
#define V4L2_META_FMT_D4XX        v4l2_fourcc('D', '4', 'X', 'X') /* D4XX Payload Header metadata */

#define V4L2_META_FMT_VIVID	  v4l2_fourcc('V', 'I', 'V', 'D') /* Vivid Metadata */



/* Vendor specific - used for RK_ISP1 camera sub-system */

#define V4L2_META_FMT_RK_ISP1_PARAMS	v4l2_fourcc('R', 'K', '1', 'P') /* Rockchip ISP1 3A Parameters */

#define V4L2_META_FMT_RK_ISP1_STAT_3A	v4l2_fourcc('R', 'K', '1', 'S') /* Rockchip ISP1 3A Statistics */



/* priv field value to indicates that subsequent fields are valid. */

#define V4L2_PIX_FMT_PRIV_MAGIC		0xfeedcafe