aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2018-08-02 18:48:59 +0200
committerHans Verkuil <hans.verkuil@cisco.com>2018-08-02 18:48:59 +0200
commit70b13df426d30ca58c79cf8a366e73463bb22cbb (patch)
treefead1faa199e76d0303d13119fd70b1ae4a4dd92 /contrib
parent5583f43ef1a4814c2bd3c43cb06461b7f532b141 (diff)
v4l-utils: sync with media_tree master repo
Main change: removal of VIDIOC_RESERVED. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/freebsd/include/linux/videodev2.h7
-rw-r--r--contrib/test/ioctl-test.h1
-rw-r--r--contrib/test/ioctl_32.h1
-rw-r--r--contrib/test/ioctl_64.h1
4 files changed, 6 insertions, 4 deletions
diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h
index 84e60c6d..62afcd82 100644
--- a/contrib/freebsd/include/linux/videodev2.h
+++ b/contrib/freebsd/include/linux/videodev2.h
@@ -552,6 +552,7 @@ struct v4l2_pix_format {
/* Grey bit-packed formats */
#define V4L2_PIX_FMT_Y10BPACK v4l2_fourcc('Y', '1', '0', 'B') /* 10 Greyscale bit-packed */
+#define V4L2_PIX_FMT_Y10P v4l2_fourcc('Y', '1', '0', 'P') /* 10 Greyscale, MIPI RAW10 packed */
/* Palette formats */
#define V4L2_PIX_FMT_PAL8 v4l2_fourcc('P', 'A', 'L', '8') /* 8 8-bit palette */
@@ -639,6 +640,11 @@ struct v4l2_pix_format {
#define V4L2_PIX_FMT_SGBRG12P v4l2_fourcc('p', 'G', 'C', 'C')
#define V4L2_PIX_FMT_SGRBG12P v4l2_fourcc('p', 'g', 'C', 'C')
#define V4L2_PIX_FMT_SRGGB12P v4l2_fourcc('p', 'R', 'C', 'C')
+ /* 14bit raw bayer packed, 7 bytes for every 4 pixels */
+#define V4L2_PIX_FMT_SBGGR14P v4l2_fourcc('p', 'B', 'E', 'E')
+#define V4L2_PIX_FMT_SGBRG14P v4l2_fourcc('p', 'G', 'E', 'E')
+#define V4L2_PIX_FMT_SGRBG14P v4l2_fourcc('p', 'g', 'E', 'E')
+#define V4L2_PIX_FMT_SRGGB14P v4l2_fourcc('p', 'R', 'E', 'E')
#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16 BGBG.. GRGR.. */
#define V4L2_PIX_FMT_SGBRG16 v4l2_fourcc('G', 'B', '1', '6') /* 16 GBGB.. RGRG.. */
#define V4L2_PIX_FMT_SGRBG16 v4l2_fourcc('G', 'R', '1', '6') /* 16 GRGR.. BGBG.. */
@@ -2337,7 +2343,6 @@ struct v4l2_create_buffers {
*
*/
#define VIDIOC_QUERYCAP _IOR('V', 0, struct v4l2_capability)
-#define VIDIOC_RESERVED _IO('V', 1)
#define VIDIOC_ENUM_FMT _IOWR('V', 2, struct v4l2_fmtdesc)
#define VIDIOC_G_FMT _IOWR('V', 4, struct v4l2_format)
#define VIDIOC_S_FMT _IOWR('V', 5, struct v4l2_format)
diff --git a/contrib/test/ioctl-test.h b/contrib/test/ioctl-test.h
index d6d10251..f2d1069d 100644
--- a/contrib/test/ioctl-test.h
+++ b/contrib/test/ioctl-test.h
@@ -176,7 +176,6 @@ static const struct {
ioc(video, VIDIOC_QUERY_DV_TIMINGS), /* struct v4l2_dv_timings */
ioc(video, VIDIOC_QUERY_EXT_CTRL), /* struct v4l2_query_ext_ctrl */
ioc(video, VIDIOC_REQBUFS), /* struct v4l2_requestbuffers */
- ioc(video, VIDIOC_RESERVED), /* void */
ioc(video, VIDIOC_STREAMOFF), /* int */
ioc(video, VIDIOC_STREAMON), /* int */
ioc(subdev, VIDIOC_SUBDEV_DV_TIMINGS_CAP), /* struct v4l2_dv_timings_cap */
diff --git a/contrib/test/ioctl_32.h b/contrib/test/ioctl_32.h
index 6efca41b..e690b0e4 100644
--- a/contrib/test/ioctl_32.h
+++ b/contrib/test/ioctl_32.h
@@ -88,7 +88,6 @@
#define CMD32_VIDIOC_QUERY_DV_TIMINGS 0x80845663
#define CMD32_VIDIOC_QUERY_EXT_CTRL 0xc0e85667
#define CMD32_VIDIOC_REQBUFS 0xc0145608
-#define CMD32_VIDIOC_RESERVED 0x5601
#define CMD32_VIDIOC_STREAMOFF 0x40045613
#define CMD32_VIDIOC_STREAMON 0x40045612
#define CMD32_VIDIOC_SUBDEV_DV_TIMINGS_CAP 0xc0905664
diff --git a/contrib/test/ioctl_64.h b/contrib/test/ioctl_64.h
index d769be7c..f0d26826 100644
--- a/contrib/test/ioctl_64.h
+++ b/contrib/test/ioctl_64.h
@@ -88,7 +88,6 @@
#define CMD64_VIDIOC_QUERY_DV_TIMINGS 0x80845663
#define CMD64_VIDIOC_QUERY_EXT_CTRL 0xc0e85667
#define CMD64_VIDIOC_REQBUFS 0xc0145608
-#define CMD64_VIDIOC_RESERVED 0x5601
#define CMD64_VIDIOC_STREAMOFF 0x40045613
#define CMD64_VIDIOC_STREAMON 0x40045612
#define CMD64_VIDIOC_SUBDEV_DV_TIMINGS_CAP 0xc0905664

Privacy Policy