History

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.

Ezequiel Garcia committed 5 years ago

Commit a7ead391 parent ee6fcc62 files · +7 −8Browse files

Unified · Split

2 files
  1. include/media/h264-ctrls.h +0 −8
  2. include/uapi/linux/videodev2.h +7 −0
include/media/h264-ctrls.h+0−8
@@ -35,14 +35,6 @@ · 34 unmodified lines
3535 #define V4L2_CID_MPEG_VIDEO_H264_START_CODE (V4L2_CID_CODEC_BASE+1006)
3636 #define V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS (V4L2_CID_CODEC_BASE+1007)
3737
38−/* enum v4l2_ctrl_type type values */
39−#define V4L2_CTRL_TYPE_H264_SPS 0x0110
40−#define V4L2_CTRL_TYPE_H264_PPS 0x0111
41−#define V4L2_CTRL_TYPE_H264_SCALING_MATRIX 0x0112
42−#define V4L2_CTRL_TYPE_H264_SLICE_PARAMS 0x0113
43−#define V4L2_CTRL_TYPE_H264_DECODE_PARAMS 0x0114
44−#define V4L2_CTRL_TYPE_H264_PRED_WEIGHTS 0x0115
45−
4638 /**
4739 * enum v4l2_mpeg_video_h264_decode_mode - Decoding mode
4840 *
include/uapi/linux/videodev2.h+7−0
@@ -1780,6 +1780,13 @@ enum v4l2_ctrl_type { · 1779 unmodified lines
17801780 V4L2_CTRL_TYPE_U16 = 0x0101,
17811781 V4L2_CTRL_TYPE_U32 = 0x0102,
17821782 V4L2_CTRL_TYPE_AREA = 0x0106,
1783+
1784+ V4L2_CTRL_TYPE_H264_SPS = 0x0200,
1785+ V4L2_CTRL_TYPE_H264_PPS = 0x0201,
1786+ V4L2_CTRL_TYPE_H264_SCALING_MATRIX = 0x0202,
1787+ V4L2_CTRL_TYPE_H264_SLICE_PARAMS = 0x0203,
1788+ V4L2_CTRL_TYPE_H264_DECODE_PARAMS = 0x0204,
1789+ V4L2_CTRL_TYPE_H264_PRED_WEIGHTS = 0x0205,
17831790 };
17841791
17851792 /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */