Add a new control class to hold the stateless codecs controls that are ready to be moved out of staging.
Showing the changes to include/uapi (1 of 3 files). Show all
Unified · Split
| @@ -65,6 +65,7 @@ · 64 unmodified lines | |||
| 65 | #define V4L2_CTRL_CLASS_FM_RX 0x00a10000 /* FM Receiver controls */ | 65 | #define V4L2_CTRL_CLASS_FM_RX 0x00a10000 /* FM Receiver controls */ |
| 66 | #define V4L2_CTRL_CLASS_RF_TUNER 0x00a20000 /* RF tuner controls */ | 66 | #define V4L2_CTRL_CLASS_RF_TUNER 0x00a20000 /* RF tuner controls */ |
| 67 | #define V4L2_CTRL_CLASS_DETECT 0x00a30000 /* Detection controls */ | 67 | #define V4L2_CTRL_CLASS_DETECT 0x00a30000 /* Detection controls */ |
| 68 | #define V4L2_CTRL_CLASS_CODEC_STATELESS 0x00a40000 /* Stateless codecs controls */ | ||
| 68 | 69 | ||
| 69 | /* User-class control IDs */ | 70 | /* User-class control IDs */ |
| 70 | 71 | ||
| @@ -1177,6 +1178,12 @@ enum v4l2_detect_md_mode { · 1106 unmodified lines | |||
| 1177 | #define V4L2_CID_DETECT_MD_THRESHOLD_GRID (V4L2_CID_DETECT_CLASS_BASE + 3) | 1178 | #define V4L2_CID_DETECT_MD_THRESHOLD_GRID (V4L2_CID_DETECT_CLASS_BASE + 3) |
| 1178 | #define V4L2_CID_DETECT_MD_REGION_GRID (V4L2_CID_DETECT_CLASS_BASE + 4) | 1179 | #define V4L2_CID_DETECT_MD_REGION_GRID (V4L2_CID_DETECT_CLASS_BASE + 4) |
| 1179 | 1180 | ||
| 1181 | |||
| 1182 | /* Stateless CODECs controls */ | ||
| 1183 | #define V4L2_CID_CODEC_STATELESS_BASE (V4L2_CTRL_CLASS_CODEC_STATELESS | 0x900) | ||
| 1184 | #define V4L2_CID_CODEC_STATELESS_CLASS (V4L2_CTRL_CLASS_CODEC_STATELESS | 1) | ||
| 1185 | |||
| 1186 | |||
| 1180 | /* MPEG-compression definitions kept for backwards compatibility */ | 1187 | /* MPEG-compression definitions kept for backwards compatibility */ |
| 1181 | #ifndef __KERNEL__ | 1188 | #ifndef __KERNEL__ |
| 1182 | #define V4L2_CTRL_CLASS_MPEG V4L2_CTRL_CLASS_CODEC | 1189 | #define V4L2_CTRL_CLASS_MPEG V4L2_CTRL_CLASS_CODEC |