diff options
Diffstat (limited to 'include/uapi')
-rw-r--r-- | include/uapi/linux/media.h | 1 | ||||
-rw-r--r-- | include/uapi/linux/v4l2-controls.h | 9 | ||||
-rw-r--r-- | include/uapi/linux/v4l2-mediabus.h | 3 | ||||
-rw-r--r-- | include/uapi/linux/videodev2.h | 4 | ||||
-rw-r--r-- | include/uapi/linux/vsp1.h | 34 |
5 files changed, 49 insertions, 2 deletions
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index ed49574ad757..d847c760e8f0 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h | |||
@@ -98,6 +98,7 @@ struct media_entity_desc { | |||
98 | 98 | ||
99 | #define MEDIA_PAD_FL_SINK (1 << 0) | 99 | #define MEDIA_PAD_FL_SINK (1 << 0) |
100 | #define MEDIA_PAD_FL_SOURCE (1 << 1) | 100 | #define MEDIA_PAD_FL_SOURCE (1 << 1) |
101 | #define MEDIA_PAD_FL_MUST_CONNECT (1 << 2) | ||
101 | 102 | ||
102 | struct media_pad_desc { | 103 | struct media_pad_desc { |
103 | __u32 entity; /* entity ID */ | 104 | __u32 entity; /* entity ID */ |
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index 1666aabbbb86..2cbe605bbe04 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h | |||
@@ -164,6 +164,10 @@ enum v4l2_colorfx { | |||
164 | * this driver */ | 164 | * this driver */ |
165 | #define V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_USER_BASE + 0x1050) | 165 | #define V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_USER_BASE + 0x1050) |
166 | 166 | ||
167 | /* The base for the saa7134 driver controls. | ||
168 | * We reserve 16 controls for this driver. */ | ||
169 | #define V4L2_CID_USER_SAA7134_BASE (V4L2_CID_USER_BASE + 0x1060) | ||
170 | |||
167 | /* MPEG-class control IDs */ | 171 | /* MPEG-class control IDs */ |
168 | /* The MPEG controls are applicable to all codec controls | 172 | /* The MPEG controls are applicable to all codec controls |
169 | * and the 'MPEG' part of the define is historical */ | 173 | * and the 'MPEG' part of the define is historical */ |
@@ -554,6 +558,11 @@ enum v4l2_vp8_golden_frame_sel { | |||
554 | V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_USE_PREV = 0, | 558 | V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_USE_PREV = 0, |
555 | V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_USE_REF_PERIOD = 1, | 559 | V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_USE_REF_PERIOD = 1, |
556 | }; | 560 | }; |
561 | #define V4L2_CID_MPEG_VIDEO_VPX_MIN_QP (V4L2_CID_MPEG_BASE+507) | ||
562 | #define V4L2_CID_MPEG_VIDEO_VPX_MAX_QP (V4L2_CID_MPEG_BASE+508) | ||
563 | #define V4L2_CID_MPEG_VIDEO_VPX_I_FRAME_QP (V4L2_CID_MPEG_BASE+509) | ||
564 | #define V4L2_CID_MPEG_VIDEO_VPX_P_FRAME_QP (V4L2_CID_MPEG_BASE+510) | ||
565 | #define V4L2_CID_MPEG_VIDEO_VPX_PROFILE (V4L2_CID_MPEG_BASE+511) | ||
557 | 566 | ||
558 | /* MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */ | 567 | /* MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */ |
559 | #define V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000) | 568 | #define V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000) |
diff --git a/include/uapi/linux/v4l2-mediabus.h b/include/uapi/linux/v4l2-mediabus.h index a9601257bb43..b5c3aab6e82c 100644 --- a/include/uapi/linux/v4l2-mediabus.h +++ b/include/uapi/linux/v4l2-mediabus.h | |||
@@ -110,6 +110,9 @@ enum v4l2_mbus_pixelcode { | |||
110 | 110 | ||
111 | /* S5C73M3 sensor specific interleaved UYVY and JPEG */ | 111 | /* S5C73M3 sensor specific interleaved UYVY and JPEG */ |
112 | V4L2_MBUS_FMT_S5C_UYVY_JPEG_1X8 = 0x5001, | 112 | V4L2_MBUS_FMT_S5C_UYVY_JPEG_1X8 = 0x5001, |
113 | |||
114 | /* HSV - next is 0x6002 */ | ||
115 | V4L2_MBUS_FMT_AHSV8888_1X32 = 0x6001, | ||
113 | }; | 116 | }; |
114 | 117 | ||
115 | /** | 118 | /** |
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 437f1b0f8937..6ae7bbe988cc 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h | |||
@@ -207,8 +207,8 @@ enum v4l2_priority { | |||
207 | struct v4l2_rect { | 207 | struct v4l2_rect { |
208 | __s32 left; | 208 | __s32 left; |
209 | __s32 top; | 209 | __s32 top; |
210 | __s32 width; | 210 | __u32 width; |
211 | __s32 height; | 211 | __u32 height; |
212 | }; | 212 | }; |
213 | 213 | ||
214 | struct v4l2_fract { | 214 | struct v4l2_fract { |
diff --git a/include/uapi/linux/vsp1.h b/include/uapi/linux/vsp1.h new file mode 100644 index 000000000000..e18858f6e865 --- /dev/null +++ b/include/uapi/linux/vsp1.h | |||
@@ -0,0 +1,34 @@ | |||
1 | /* | ||
2 | * vsp1.h | ||
3 | * | ||
4 | * Renesas R-Car VSP1 - User-space API | ||
5 | * | ||
6 | * Copyright (C) 2013 Renesas Corporation | ||
7 | * | ||
8 | * Contacts: Laurent Pinchart <laurent.pinchart@ideasonboard.com> | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License version 2 as | ||
12 | * published by the Free Software Foundation. | ||
13 | */ | ||
14 | |||
15 | #ifndef __VSP1_USER_H__ | ||
16 | #define __VSP1_USER_H__ | ||
17 | |||
18 | #include <linux/types.h> | ||
19 | #include <linux/videodev2.h> | ||
20 | |||
21 | /* | ||
22 | * Private IOCTLs | ||
23 | * | ||
24 | * VIDIOC_VSP1_LUT_CONFIG - Configure the lookup table | ||
25 | */ | ||
26 | |||
27 | #define VIDIOC_VSP1_LUT_CONFIG \ | ||
28 | _IOWR('V', BASE_VIDIOC_PRIVATE + 1, struct vsp1_lut_config) | ||
29 | |||
30 | struct vsp1_lut_config { | ||
31 | u32 lut[256]; | ||
32 | }; | ||
33 | |||
34 | #endif /* __VSP1_USER_H__ */ | ||