This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: v4l-utils: sync with media_tree master repo Author: Hans Verkuil <hans.verk...@cisco.com> Date: Thu Aug 2 18:48:59 2018 +0200 Main change: removal of VIDIOC_RESERVED. Signed-off-by: Hans Verkuil <hans.verk...@cisco.com> contrib/freebsd/include/linux/videodev2.h | 7 ++++++- contrib/test/ioctl-test.h | 1 - contrib/test/ioctl_32.h | 1 - contrib/test/ioctl_64.h | 1 - include/linux/media-bus-format.h | 3 ++- include/linux/media.h | 3 +-- include/linux/videodev2.h | 7 ++++++- lib/libv4l2/log.c | 1 - utils/libv4l2util/TODO | 1 - 9 files changed, 15 insertions(+), 10 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=70b13df426d30ca58c79cf8a366e73463bb22cbb diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h index 84e60c6d3485..62afcd82b583 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 d6d10251ca2a..f2d1069d4af4 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 6efca41b62b2..e690b0e43a2b 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 d769be7c7bc7..f0d2682693b0 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 diff --git a/include/linux/media-bus-format.h b/include/linux/media-bus-format.h index 9e3511742fdc..d6a5a3bfe6c4 100644 --- a/include/linux/media-bus-format.h +++ b/include/linux/media-bus-format.h @@ -62,7 +62,7 @@ #define MEDIA_BUS_FMT_RGB121212_1X36 0x1019 #define MEDIA_BUS_FMT_RGB161616_1X48 0x101a -/* YUV (including grey) - next is 0x202c */ +/* YUV (including grey) - next is 0x202d */ #define MEDIA_BUS_FMT_Y8_1X8 0x2001 #define MEDIA_BUS_FMT_UV8_1X8 0x2015 #define MEDIA_BUS_FMT_UYVY8_1_5X8 0x2002 @@ -74,6 +74,7 @@ #define MEDIA_BUS_FMT_YUYV8_2X8 0x2008 #define MEDIA_BUS_FMT_YVYU8_2X8 0x2009 #define MEDIA_BUS_FMT_Y10_1X10 0x200a +#define MEDIA_BUS_FMT_Y10_2X8_PADHI_LE 0x202c #define MEDIA_BUS_FMT_UYVY10_2X10 0x2018 #define MEDIA_BUS_FMT_VYUY10_2X10 0x2019 #define MEDIA_BUS_FMT_YUYV10_2X10 0x200b diff --git a/include/linux/media.h b/include/linux/media.h index 57f00bcca1de..c75664617760 100644 --- a/include/linux/media.h +++ b/include/linux/media.h @@ -23,7 +23,6 @@ #include <stdint.h> #include <linux/ioctl.h> #include <linux/types.h> -#include <linux/version.h> struct media_device_info { char driver[16]; @@ -401,7 +400,7 @@ struct media_v2_topology { #define MEDIA_INTF_T_ALSA_TIMER (MEDIA_INTF_T_ALSA_BASE + 7) /* Obsolete symbol for media_version, no longer used in the kernel */ -#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0) +#define MEDIA_API_VERSION ((0 << 16) | (1 << 8) | 0) #endif /* __LINUX_MEDIA_H */ diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index bb3a2c6bbb6c..1a95662f5ad0 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -518,6 +518,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 */ @@ -605,6 +606,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.. */ @@ -2303,7 +2309,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/lib/libv4l2/log.c b/lib/libv4l2/log.c index d36b2e2399ae..9517b86fd7a3 100644 --- a/lib/libv4l2/log.c +++ b/lib/libv4l2/log.c @@ -43,7 +43,6 @@ FILE *v4l2_log_file = NULL; const char *v4l2_ioctls[] = { /* start v4l2 ioctls */ [_IOC_NR(VIDIOC_QUERYCAP)] = "VIDIOC_QUERYCAP", - [_IOC_NR(VIDIOC_RESERVED)] = "VIDIOC_RESERVED", [_IOC_NR(VIDIOC_ENUM_FMT)] = "VIDIOC_ENUM_FMT", [_IOC_NR(VIDIOC_G_FMT)] = "VIDIOC_G_FMT", [_IOC_NR(VIDIOC_S_FMT)] = "VIDIOC_S_FMT", diff --git a/utils/libv4l2util/TODO b/utils/libv4l2util/TODO index 456a916ce3d4..ad89546858b9 100644 --- a/utils/libv4l2util/TODO +++ b/utils/libv4l2util/TODO @@ -66,7 +66,6 @@ Missing V4L2 ioctls to be implemented at library: VIDIOC_S_JPEGCOMP VIDIOC_LOG_STATUS VIDIOC_PRIVATE - VIDIOC_RESERVED VIDIOC_OVERLAY_OLD VIDIOC_S_PARM_OLD VIDIOC_S_CTRL_OLD _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
