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

media: uapi: Move the H264 stateless control types out of staging 



Move the H264 stateless control types out of staging,
and re-number them to avoid any confusion.

Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Tested-by: default avatarJernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent ee6fcc67

include/media/h264-ctrls.h

+0 −8
Original line number Original line Diff line number Diff line
@@ -35,14 +35,6 @@ 
#define V4L2_CID_MPEG_VIDEO_H264_START_CODE	(V4L2_CID_CODEC_BASE+1006)

#define V4L2_CID_MPEG_VIDEO_H264_START_CODE	(V4L2_CID_CODEC_BASE+1006)

#define V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS	(V4L2_CID_CODEC_BASE+1007)

#define V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS	(V4L2_CID_CODEC_BASE+1007)





/* enum v4l2_ctrl_type type values */

#define V4L2_CTRL_TYPE_H264_SPS			0x0110

#define V4L2_CTRL_TYPE_H264_PPS			0x0111

#define V4L2_CTRL_TYPE_H264_SCALING_MATRIX	0x0112

#define V4L2_CTRL_TYPE_H264_SLICE_PARAMS	0x0113

#define V4L2_CTRL_TYPE_H264_DECODE_PARAMS	0x0114

#define V4L2_CTRL_TYPE_H264_PRED_WEIGHTS	0x0115



/**

/**

 * enum v4l2_mpeg_video_h264_decode_mode - Decoding mode

 * enum v4l2_mpeg_video_h264_decode_mode - Decoding mode

 *

 *

include/uapi/linux/videodev2.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -1780,6 +1780,13 @@ enum v4l2_ctrl_type { 
	V4L2_CTRL_TYPE_U16	     = 0x0101,

	V4L2_CTRL_TYPE_U16	     = 0x0101,

	V4L2_CTRL_TYPE_U32	     = 0x0102,

	V4L2_CTRL_TYPE_U32	     = 0x0102,

	V4L2_CTRL_TYPE_AREA          = 0x0106,

	V4L2_CTRL_TYPE_AREA          = 0x0106,



	V4L2_CTRL_TYPE_H264_SPS             = 0x0200,

	V4L2_CTRL_TYPE_H264_PPS		    = 0x0201,

	V4L2_CTRL_TYPE_H264_SCALING_MATRIX  = 0x0202,

	V4L2_CTRL_TYPE_H264_SLICE_PARAMS    = 0x0203,

	V4L2_CTRL_TYPE_H264_DECODE_PARAMS   = 0x0204,

	V4L2_CTRL_TYPE_H264_PRED_WEIGHTS    = 0x0205,

};

};





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

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