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 latest kernel Author: Hans Verkuil <hverkuil-ci...@xs4all.nl> Date: Fri Sep 6 09:15:33 2024 +0200 Sync up with the latest media_stage master tree. Specifically to get the updated videodev2.h header. Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl> contrib/freebsd/include/linux/videodev2.h | 2 ++ include/linux/videodev2.h | 2 ++ utils/common/v4l2-pix-formats.h | 1 + utils/v4l2-tracer/v4l2-tracer-info-gen.h | 1 + 4 files changed, 6 insertions(+) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=0a0187941ccb17db79eab38b96b4083b688065b9 diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h index ddf7e5a22e36..a993916b7145 100644 --- a/contrib/freebsd/include/linux/videodev2.h +++ b/contrib/freebsd/include/linux/videodev2.h @@ -509,6 +509,7 @@ struct v4l2_capability { #define V4L2_CAP_META_CAPTURE 0x00800000 /* Is a metadata capture device */ #define V4L2_CAP_READWRITE 0x01000000 /* read/write systemcalls */ +#define V4L2_CAP_EDID 0x02000000 /* Is an EDID-only device */ #define V4L2_CAP_STREAMING 0x04000000 /* streaming I/O ioctls */ #define V4L2_CAP_META_OUTPUT 0x08000000 /* Is a metadata output device */ @@ -861,6 +862,7 @@ struct v4l2_pix_format { /* Vendor specific - used for RK_ISP1 camera sub-system */ #define V4L2_META_FMT_RK_ISP1_PARAMS v4l2_fourcc('R', 'K', '1', 'P') /* Rockchip ISP1 3A Parameters */ #define V4L2_META_FMT_RK_ISP1_STAT_3A v4l2_fourcc('R', 'K', '1', 'S') /* Rockchip ISP1 3A Statistics */ +#define V4L2_META_FMT_RK_ISP1_EXT_PARAMS v4l2_fourcc('R', 'K', '1', 'E') /* Rockchip ISP1 3a Extensible Parameters */ /* Vendor specific - used for RaspberryPi PiSP */ #define V4L2_META_FMT_RPI_BE_CFG v4l2_fourcc('R', 'P', 'B', 'C') /* PiSP BE configuration */ diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index f18a40d406e2..d3360227c90f 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -475,6 +475,7 @@ struct v4l2_capability { #define V4L2_CAP_META_CAPTURE 0x00800000 /* Is a metadata capture device */ #define V4L2_CAP_READWRITE 0x01000000 /* read/write systemcalls */ +#define V4L2_CAP_EDID 0x02000000 /* Is an EDID-only device */ #define V4L2_CAP_STREAMING 0x04000000 /* streaming I/O ioctls */ #define V4L2_CAP_META_OUTPUT 0x08000000 /* Is a metadata output device */ @@ -827,6 +828,7 @@ struct v4l2_pix_format { /* Vendor specific - used for RK_ISP1 camera sub-system */ #define V4L2_META_FMT_RK_ISP1_PARAMS v4l2_fourcc('R', 'K', '1', 'P') /* Rockchip ISP1 3A Parameters */ #define V4L2_META_FMT_RK_ISP1_STAT_3A v4l2_fourcc('R', 'K', '1', 'S') /* Rockchip ISP1 3A Statistics */ +#define V4L2_META_FMT_RK_ISP1_EXT_PARAMS v4l2_fourcc('R', 'K', '1', 'E') /* Rockchip ISP1 3a Extensible Parameters */ /* Vendor specific - used for RaspberryPi PiSP */ #define V4L2_META_FMT_RPI_BE_CFG v4l2_fourcc('R', 'P', 'B', 'C') /* PiSP BE configuration */ diff --git a/utils/common/v4l2-pix-formats.h b/utils/common/v4l2-pix-formats.h index 7cb208fe9792..d27d48894918 100644 --- a/utils/common/v4l2-pix-formats.h +++ b/utils/common/v4l2-pix-formats.h @@ -189,6 +189,7 @@ case V4L2_META_FMT_VIVID: return "Vivid Metadata"; case V4L2_META_FMT_RK_ISP1_PARAMS: return "Rockchip ISP1 3A Parameters"; case V4L2_META_FMT_RK_ISP1_STAT_3A: return "Rockchip ISP1 3A Statistics"; + case V4L2_META_FMT_RK_ISP1_EXT_PARAMS: return "Rockchip ISP1 Ext 3A Params"; case V4L2_PIX_FMT_NV12_8L128: return "NV12 (8x128 Linear)"; case V4L2_PIX_FMT_NV12M_8L128: return "NV12M (8x128 Linear)"; case V4L2_PIX_FMT_NV12_10BE_8L128: return "10-bit NV12 (8x128 Linear, BE)"; diff --git a/utils/v4l2-tracer/v4l2-tracer-info-gen.h b/utils/v4l2-tracer/v4l2-tracer-info-gen.h index 31cc5f913c86..677b44115d95 100644 --- a/utils/v4l2-tracer/v4l2-tracer-info-gen.h +++ b/utils/v4l2-tracer/v4l2-tracer-info-gen.h @@ -1225,6 +1225,7 @@ constexpr flag_def v4l2_cap_flag_def[] = { { V4L2_CAP_SDR_OUTPUT, "V4L2_CAP_SDR_OUTPUT" }, { V4L2_CAP_META_CAPTURE, "V4L2_CAP_META_CAPTURE" }, { V4L2_CAP_READWRITE, "V4L2_CAP_READWRITE" }, + { V4L2_CAP_EDID, "V4L2_CAP_EDID" }, { V4L2_CAP_STREAMING, "V4L2_CAP_STREAMING" }, { V4L2_CAP_META_OUTPUT, "V4L2_CAP_META_OUTPUT" }, { V4L2_CAP_TOUCH, "V4L2_CAP_TOUCH" },
