Move the H264 stateless control types out of staging, and re-number them to avoid any confusion.
Unified · Split
| @@ -35,14 +35,6 @@ · 34 unmodified lines | |||
| 35 | #define V4L2_CID_MPEG_VIDEO_H264_START_CODE (V4L2_CID_CODEC_BASE+1006) | 35 | #define V4L2_CID_MPEG_VIDEO_H264_START_CODE (V4L2_CID_CODEC_BASE+1006) |
| 36 | #define V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS (V4L2_CID_CODEC_BASE+1007) | 36 | #define V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS (V4L2_CID_CODEC_BASE+1007) |
| 37 | 37 | ||
| 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 | |||
| 46 | /** | 38 | /** |
| 47 | * enum v4l2_mpeg_video_h264_decode_mode - Decoding mode | 39 | * enum v4l2_mpeg_video_h264_decode_mode - Decoding mode |
| 48 | * | 40 | * |
| @@ -1780,6 +1780,13 @@ enum v4l2_ctrl_type { · 1779 unmodified lines | |||
| 1780 | V4L2_CTRL_TYPE_U16 = 0x0101, | 1780 | V4L2_CTRL_TYPE_U16 = 0x0101, |
| 1781 | V4L2_CTRL_TYPE_U32 = 0x0102, | 1781 | V4L2_CTRL_TYPE_U32 = 0x0102, |
| 1782 | V4L2_CTRL_TYPE_AREA = 0x0106, | 1782 | 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, | ||
| 1783 | }; | 1790 | }; |
| 1784 | 1791 | ||
| 1785 | /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ | 1792 | /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ |