Commit 16e2d220 authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Mauro Carvalho Chehab
Browse files

media: uapi: Move the HEVC stateless control type out of staging 



Move the HEVC stateless controls types out of staging,
and re-number them.

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: default avatarEzequiel Garcia <ezequiel@vanguardiasur.com.ar>
Acked-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Tested-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 01dcfd53

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

+5 −0
Original line number Diff line number Diff line
@@ -153,6 +153,11 @@ replace symbol V4L2_CTRL_TYPE_VP9_COMPRESSED_HDR :c:type:`v4l2_ctrl_type` 
replace symbol V4L2_CTRL_TYPE_VP9_FRAME :c:type:`v4l2_ctrl_type`

replace symbol V4L2_CTRL_TYPE_HDR10_CLL_INFO :c:type:`v4l2_ctrl_type`

replace symbol V4L2_CTRL_TYPE_HDR10_MASTERING_DISPLAY :c:type:`v4l2_ctrl_type`

replace symbol V4L2_CTRL_TYPE_HEVC_SPS :c:type:`v4l2_ctrl_type`

replace symbol V4L2_CTRL_TYPE_HEVC_PPS :c:type:`v4l2_ctrl_type`

replace symbol V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS :c:type:`v4l2_ctrl_type`

replace symbol V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX :c:type:`v4l2_ctrl_type`

replace symbol V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS :c:type:`v4l2_ctrl_type`



# V4L2 capability defines

replace define V4L2_CAP_VIDEO_CAPTURE device-capabilities

include/media/hevc-ctrls.h

+0 −7
Original line number Diff line number Diff line
@@ -22,13 +22,6 @@ 
#define V4L2_CID_STATELESS_HEVC_START_CODE	(V4L2_CID_CODEC_BASE + 1016)

#define V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS (V4L2_CID_CODEC_BASE + 1017)



/* enum v4l2_ctrl_type type values */

#define V4L2_CTRL_TYPE_HEVC_SPS 0x0120

#define V4L2_CTRL_TYPE_HEVC_PPS 0x0121

#define V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS 0x0122

#define V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX 0x0123

#define V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS 0x0124



enum v4l2_stateless_hevc_decode_mode {

	V4L2_STATELESS_HEVC_DECODE_MODE_SLICE_BASED,

	V4L2_STATELESS_HEVC_DECODE_MODE_FRAME_BASED,

include/uapi/linux/videodev2.h

+6 −0
Original line number Diff line number Diff line
@@ -1860,6 +1860,12 @@ enum v4l2_ctrl_type { 


	V4L2_CTRL_TYPE_VP9_COMPRESSED_HDR	= 0x0260,

	V4L2_CTRL_TYPE_VP9_FRAME		= 0x0261,



	V4L2_CTRL_TYPE_HEVC_SPS			= 0x0270,

	V4L2_CTRL_TYPE_HEVC_PPS			= 0x0271,

	V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS	= 0x0272,

	V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX	= 0x0273,

	V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS	= 0x0274,

};



/*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */