aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2017-09-15 11:41:12 +0200
committerHans Verkuil <hans.verkuil@cisco.com>2017-09-15 11:41:12 +0200
commit518199fcb8a8025875b4778bbe114486f84a3b2a (patch)
tree4dfaea1ccd7bfe617171243718760e59a29673e0 /contrib
parente4ca59846517e6ad180d0cbe67374b0a74572eb9 (diff)
v4l-utils: sync-with-kernel
Sync with the latest media_tree master branch. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/freebsd/include/linux/videodev2.h5
-rw-r--r--contrib/test/ioctl-test.h2
-rw-r--r--contrib/test/ioctl_32.h2
-rw-r--r--contrib/test/ioctl_64.h2
4 files changed, 5 insertions, 6 deletions
diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h
index c6aa8844..70272d67 100644
--- a/contrib/freebsd/include/linux/videodev2.h
+++ b/contrib/freebsd/include/linux/videodev2.h
@@ -633,6 +633,11 @@ struct v4l2_pix_format {
#define V4L2_PIX_FMT_SGBRG12 v4l2_fourcc('G', 'B', '1', '2') /* 12 GBGB.. RGRG.. */
#define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') /* 12 GRGR.. BGBG.. */
#define V4L2_PIX_FMT_SRGGB12 v4l2_fourcc('R', 'G', '1', '2') /* 12 RGRG.. GBGB.. */
+ /* 12bit raw bayer packed, 6 bytes for every 4 pixels */
+#define V4L2_PIX_FMT_SBGGR12P v4l2_fourcc('p', 'B', 'C', 'C')
+#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')
#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.. */
diff --git a/contrib/test/ioctl-test.h b/contrib/test/ioctl-test.h
index 9a213ca5..8e824be6 100644
--- a/contrib/test/ioctl-test.h
+++ b/contrib/test/ioctl-test.h
@@ -86,14 +86,12 @@ static const struct {
} ioctls[] = {
/* ioctl structs */
ioc(demux, DMX_ADD_PID), /* __u16 */
- ioc(demux, DMX_GET_CAPS), /* dmx_caps_t */
ioc(demux, DMX_GET_PES_PIDS), /* __u16[5] */
ioc(demux, DMX_GET_STC), /* struct dmx_stc */
ioc(demux, DMX_REMOVE_PID), /* __u16 */
ioc(demux, DMX_SET_BUFFER_SIZE), /* void */
ioc(demux, DMX_SET_FILTER), /* struct dmx_sct_filter_params */
ioc(demux, DMX_SET_PES_FILTER), /* struct dmx_pes_filter_params */
- ioc(demux, DMX_SET_SOURCE), /* dmx_source_t */
ioc(demux, DMX_START), /* void */
ioc(demux, DMX_STOP), /* void */
ioc(frontend, FE_DISEQC_RECV_SLAVE_REPLY), /* struct dvb_diseqc_slave_reply */
diff --git a/contrib/test/ioctl_32.h b/contrib/test/ioctl_32.h
index 25bfef31..45fd4a77 100644
--- a/contrib/test/ioctl_32.h
+++ b/contrib/test/ioctl_32.h
@@ -1,14 +1,12 @@
/* This file is auto-generated by make sync-with-kernel */
#define CMD32_DMX_ADD_PID 0x40026f33
-#define CMD32_DMX_GET_CAPS 0x80086f30
#define CMD32_DMX_GET_PES_PIDS 0x800a6f2f
#define CMD32_DMX_GET_STC 0xc0106f32
#define CMD32_DMX_REMOVE_PID 0x40026f34
#define CMD32_DMX_SET_BUFFER_SIZE 0x6f2d
#define CMD32_DMX_SET_FILTER 0x403c6f2b
#define CMD32_DMX_SET_PES_FILTER 0x40146f2c
-#define CMD32_DMX_SET_SOURCE 0x40046f31
#define CMD32_DMX_START 0x6f29
#define CMD32_DMX_STOP 0x6f2a
#define CMD32_FE_DISEQC_RECV_SLAVE_REPLY 0x800c6f40
diff --git a/contrib/test/ioctl_64.h b/contrib/test/ioctl_64.h
index fa366034..8abde586 100644
--- a/contrib/test/ioctl_64.h
+++ b/contrib/test/ioctl_64.h
@@ -1,14 +1,12 @@
/* This file is auto-generated by make sync-with-kernel */
#define CMD64_DMX_ADD_PID 0x40026f33
-#define CMD64_DMX_GET_CAPS 0x80086f30
#define CMD64_DMX_GET_PES_PIDS 0x800a6f2f
#define CMD64_DMX_GET_STC 0xc0106f32
#define CMD64_DMX_REMOVE_PID 0x40026f34
#define CMD64_DMX_SET_BUFFER_SIZE 0x6f2d
#define CMD64_DMX_SET_FILTER 0x403c6f2b
#define CMD64_DMX_SET_PES_FILTER 0x40146f2c
-#define CMD64_DMX_SET_SOURCE 0x40046f31
#define CMD64_DMX_START 0x6f29
#define CMD64_DMX_STOP 0x6f2a
#define CMD64_FE_DISEQC_RECV_SLAVE_REPLY 0x800c6f40

Privacy Policy