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: Mon Jul 1 11:45:41 2024 +0200 Sync up with the latest media_stage master tree. This also drops include/linux/compiler.h since it is no longer needed (and hasn't been for a long time). Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl> contrib/freebsd/include/linux/input-event-codes.h | 2 ++ contrib/freebsd/include/linux/v4l2-controls.h | 2 ++ contrib/freebsd/include/linux/videodev2.h | 17 +++++++++ contrib/test/gen_ioctl_list.pl | 1 - contrib/test/ioctl-test.h | 1 - include/linux/bpf.h | 44 +++++++++++++++++++---- include/linux/compiler.h | 6 ---- include/linux/v4l2-controls.h | 2 ++ include/linux/videodev2.h | 17 +++++++++ utils/common/v4l2-pix-formats.h | 13 +++++++ utils/keytable/parse.h | 2 ++ utils/keytable/rc_keymaps/meson.build | 1 + utils/keytable/rc_maps.cfg | 1 + utils/v4l2-tracer/v4l2-tracer-info-gen.h | 3 ++ 14 files changed, 97 insertions(+), 15 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=0ec2d6d7d8d82d7fe295cc1ef326790c33584842 diff --git a/contrib/freebsd/include/linux/input-event-codes.h b/contrib/freebsd/include/linux/input-event-codes.h index 45de2062ee12..de4647601e8b 100644 --- a/contrib/freebsd/include/linux/input-event-codes.h +++ b/contrib/freebsd/include/linux/input-event-codes.h @@ -618,6 +618,8 @@ #define KEY_CAMERA_ACCESS_ENABLE 0x24b /* Enables programmatic access to camera devices. (HUTRR72) */ #define KEY_CAMERA_ACCESS_DISABLE 0x24c /* Disables programmatic access to camera devices. (HUTRR72) */ #define KEY_CAMERA_ACCESS_TOGGLE 0x24d /* Toggles the current state of the camera access control. (HUTRR72) */ +#define KEY_ACCESSIBILITY 0x24e /* Toggles the system bound accessibility UI/command (HUTRR116) */ +#define KEY_DO_NOT_DISTURB 0x24f /* Toggles the system-wide "Do Not Disturb" control (HUTRR94)*/ #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ diff --git a/contrib/freebsd/include/linux/v4l2-controls.h b/contrib/freebsd/include/linux/v4l2-controls.h index 635d92d2eb6c..9fc663e6059e 100644 --- a/contrib/freebsd/include/linux/v4l2-controls.h +++ b/contrib/freebsd/include/linux/v4l2-controls.h @@ -898,6 +898,8 @@ enum v4l2_mpeg_video_av1_level { V4L2_MPEG_VIDEO_AV1_LEVEL_7_3 = 23 }; +#define V4L2_CID_MPEG_VIDEO_AVERAGE_QP (V4L2_CID_CODEC_BASE + 657) + /* MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */ #define V4L2_CID_CODEC_CX2341X_BASE (V4L2_CTRL_CLASS_CODEC | 0x1000) #define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE (V4L2_CID_CODEC_CX2341X_BASE+0) diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h index 74c2e9c234b3..ddf7e5a22e36 100644 --- a/contrib/freebsd/include/linux/videodev2.h +++ b/contrib/freebsd/include/linux/videodev2.h @@ -589,6 +589,8 @@ struct v4l2_pix_format { /* RGB formats (6 or 8 bytes per pixel) */ #define V4L2_PIX_FMT_BGR48_12 v4l2_fourcc('B', '3', '1', '2') /* 48 BGR 12-bit per component */ +#define V4L2_PIX_FMT_BGR48 v4l2_fourcc('B', 'G', 'R', '6') /* 48 BGR 16-bit per component */ +#define V4L2_PIX_FMT_RGB48 v4l2_fourcc('R', 'G', 'B', '6') /* 48 RGB 16-bit per component */ #define V4L2_PIX_FMT_ABGR64_12 v4l2_fourcc('B', '4', '1', '2') /* 64 BGRA 12-bit per component */ /* Grey formats */ @@ -821,6 +823,18 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_IPU3_SGRBG10 v4l2_fourcc('i', 'p', '3', 'G') /* IPU3 packed 10-bit GRBG bayer */ #define V4L2_PIX_FMT_IPU3_SRGGB10 v4l2_fourcc('i', 'p', '3', 'r') /* IPU3 packed 10-bit RGGB bayer */ +/* Raspberry Pi PiSP compressed formats. */ +#define V4L2_PIX_FMT_PISP_COMP1_RGGB v4l2_fourcc('P', 'C', '1', 'R') /* PiSP 8-bit mode 1 compressed RGGB bayer */ +#define V4L2_PIX_FMT_PISP_COMP1_GRBG v4l2_fourcc('P', 'C', '1', 'G') /* PiSP 8-bit mode 1 compressed GRBG bayer */ +#define V4L2_PIX_FMT_PISP_COMP1_GBRG v4l2_fourcc('P', 'C', '1', 'g') /* PiSP 8-bit mode 1 compressed GBRG bayer */ +#define V4L2_PIX_FMT_PISP_COMP1_BGGR v4l2_fourcc('P', 'C', '1', 'B') /* PiSP 8-bit mode 1 compressed BGGR bayer */ +#define V4L2_PIX_FMT_PISP_COMP1_MONO v4l2_fourcc('P', 'C', '1', 'M') /* PiSP 8-bit mode 1 compressed monochrome */ +#define V4L2_PIX_FMT_PISP_COMP2_RGGB v4l2_fourcc('P', 'C', '2', 'R') /* PiSP 8-bit mode 2 compressed RGGB bayer */ +#define V4L2_PIX_FMT_PISP_COMP2_GRBG v4l2_fourcc('P', 'C', '2', 'G') /* PiSP 8-bit mode 2 compressed GRBG bayer */ +#define V4L2_PIX_FMT_PISP_COMP2_GBRG v4l2_fourcc('P', 'C', '2', 'g') /* PiSP 8-bit mode 2 compressed GBRG bayer */ +#define V4L2_PIX_FMT_PISP_COMP2_BGGR v4l2_fourcc('P', 'C', '2', 'B') /* PiSP 8-bit mode 2 compressed BGGR bayer */ +#define V4L2_PIX_FMT_PISP_COMP2_MONO v4l2_fourcc('P', 'C', '2', 'M') /* PiSP 8-bit mode 2 compressed monochrome */ + /* SDR formats - used only for Software Defined Radio devices */ #define V4L2_SDR_FMT_CU8 v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */ #define V4L2_SDR_FMT_CU16LE v4l2_fourcc('C', 'U', '1', '6') /* IQ u16le */ @@ -848,6 +862,9 @@ struct v4l2_pix_format { #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 */ +/* Vendor specific - used for RaspberryPi PiSP */ +#define V4L2_META_FMT_RPI_BE_CFG v4l2_fourcc('R', 'P', 'B', 'C') /* PiSP BE configuration */ + /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe diff --git a/contrib/test/gen_ioctl_list.pl b/contrib/test/gen_ioctl_list.pl index 7a0f38c7cd27..1b17697c18c6 100755 --- a/contrib/test/gen_ioctl_list.pl +++ b/contrib/test/gen_ioctl_list.pl @@ -70,7 +70,6 @@ sub print_ioc() } printf "/* This file is auto-generated by sync-with-kernel.sh */\n"; -printf "#include <linux/compiler.h>\n"; foreach my $h (sort keys %headers) { my $line; diff --git a/contrib/test/ioctl-test.h b/contrib/test/ioctl-test.h index 691e15de03b1..d3eb81edfa05 100644 --- a/contrib/test/ioctl-test.h +++ b/contrib/test/ioctl-test.h @@ -1,5 +1,4 @@ /* This file is auto-generated by sync-with-kernel.sh */ -#include <linux/compiler.h> #include "linux/dvb/dmx.h" #include "linux/dvb/frontend.h" #include "linux/v4l2-subdev.h" diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 109ad86f772c..858a89984ec7 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -1115,6 +1115,7 @@ enum bpf_attach_type { BPF_CGROUP_UNIX_GETSOCKNAME, BPF_NETKIT_PRIMARY, BPF_NETKIT_PEER, + BPF_TRACE_KPROBE_SESSION, __MAX_BPF_ATTACH_TYPE }; @@ -1135,6 +1136,7 @@ enum bpf_link_type { BPF_LINK_TYPE_TCX = 11, BPF_LINK_TYPE_UPROBE_MULTI = 12, BPF_LINK_TYPE_NETKIT = 13, + BPF_LINK_TYPE_SOCKMAP = 14, __MAX_BPF_LINK_TYPE, }; @@ -1662,8 +1664,10 @@ union bpf_attr { } query; struct { /* anonymous struct used by BPF_RAW_TRACEPOINT_OPEN command */ - __u64 name; - __u32 prog_fd; + __u64 name; + __u32 prog_fd; + __u32 :32; + __aligned_u64 cookie; } raw_tracepoint; struct { /* anonymous struct for BPF_BTF_LOAD */ @@ -3392,6 +3396,10 @@ union bpf_attr { * for the nexthop. If the src addr cannot be derived, * **BPF_FIB_LKUP_RET_NO_SRC_ADDR** is returned. In this * case, *params*->dmac and *params*->smac are not set either. + * **BPF_FIB_LOOKUP_MARK** + * Use the mark present in *params*->mark for the fib lookup. + * This option should not be used with BPF_FIB_LOOKUP_DIRECT, + * as it only has meaning for full lookups. * * *ctx* is either **struct xdp_md** for XDP programs or * **struct sk_buff** tc cls_act programs. @@ -5020,7 +5028,7 @@ union bpf_attr { * bytes will be copied to *dst* * Return * The **hash_algo** is returned on success, - * **-EOPNOTSUP** if IMA is disabled or **-EINVAL** if + * **-EOPNOTSUPP** if IMA is disabled or **-EINVAL** if * invalid arguments are passed. * * struct socket *bpf_sock_from_file(struct file *file) @@ -5506,7 +5514,7 @@ union bpf_attr { * bytes will be copied to *dst* * Return * The **hash_algo** is returned on success, - * **-EOPNOTSUP** if the hash calculation failed or **-EINVAL** if + * **-EOPNOTSUPP** if the hash calculation failed or **-EINVAL** if * invalid arguments are passed. * * void *bpf_kptr_xchg(void *map_value, void *ptr) @@ -6718,6 +6726,10 @@ struct bpf_link_info { __u32 ifindex; __u32 attach_type; } netkit; + struct { + __u32 map_id; + __u32 attach_type; + } sockmap; }; } __attribute__((aligned(8))); @@ -6936,6 +6948,8 @@ enum { * socket transition to LISTEN state. */ BPF_SOCK_OPS_RTT_CB, /* Called on every RTT. + * Arg1: measured RTT input (mrtt) + * Arg2: updated srtt */ BPF_SOCK_OPS_PARSE_HDR_OPT_CB, /* Parse the header option. * It will be called to handle @@ -7118,6 +7132,7 @@ enum { BPF_FIB_LOOKUP_SKIP_NEIGH = (1U << 2), BPF_FIB_LOOKUP_TBID = (1U << 3), BPF_FIB_LOOKUP_SRC = (1U << 4), + BPF_FIB_LOOKUP_MARK = (1U << 5), }; enum { @@ -7150,7 +7165,7 @@ struct bpf_fib_lookup { /* output: MTU value */ __u16 mtu_result; - }; + } __attribute__((packed, aligned(2))); /* input: L3 device index for lookup * output: device index from FIB lookup */ @@ -7195,8 +7210,19 @@ struct bpf_fib_lookup { __u32 tbid; }; - __u8 smac[6]; /* ETH_ALEN */ - __u8 dmac[6]; /* ETH_ALEN */ + union { + /* input */ + struct { + __u32 mark; /* policy routing */ + /* 2 4-byte holes for input */ + }; + + /* output: source and dest mac */ + struct { + __u8 smac[6]; /* ETH_ALEN */ + __u8 dmac[6]; /* ETH_ALEN */ + }; + }; }; struct bpf_redir_neigh { @@ -7283,6 +7309,10 @@ struct bpf_timer { __u64 __opaque[2]; } __attribute__((aligned(8))); +struct bpf_wq { + __u64 __opaque[2]; +} __attribute__((aligned(8))); + struct bpf_dynptr { __u64 __opaque[2]; } __attribute__((aligned(8))); diff --git a/include/linux/compiler.h b/include/linux/compiler.h deleted file mode 100644 index 379629be962c..000000000000 --- a/include/linux/compiler.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __linux_compiler_h -#define __linux_compiler_h - -#define __user - -#endif diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h index 635d92d2eb6c..9fc663e6059e 100644 --- a/include/linux/v4l2-controls.h +++ b/include/linux/v4l2-controls.h @@ -898,6 +898,8 @@ enum v4l2_mpeg_video_av1_level { V4L2_MPEG_VIDEO_AV1_LEVEL_7_3 = 23 }; +#define V4L2_CID_MPEG_VIDEO_AVERAGE_QP (V4L2_CID_CODEC_BASE + 657) + /* MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */ #define V4L2_CID_CODEC_CX2341X_BASE (V4L2_CTRL_CLASS_CODEC | 0x1000) #define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE (V4L2_CID_CODEC_CX2341X_BASE+0) diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index e1c61b855338..f18a40d406e2 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -555,6 +555,8 @@ struct v4l2_pix_format { /* RGB formats (6 or 8 bytes per pixel) */ #define V4L2_PIX_FMT_BGR48_12 v4l2_fourcc('B', '3', '1', '2') /* 48 BGR 12-bit per component */ +#define V4L2_PIX_FMT_BGR48 v4l2_fourcc('B', 'G', 'R', '6') /* 48 BGR 16-bit per component */ +#define V4L2_PIX_FMT_RGB48 v4l2_fourcc('R', 'G', 'B', '6') /* 48 RGB 16-bit per component */ #define V4L2_PIX_FMT_ABGR64_12 v4l2_fourcc('B', '4', '1', '2') /* 64 BGRA 12-bit per component */ /* Grey formats */ @@ -787,6 +789,18 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_IPU3_SGRBG10 v4l2_fourcc('i', 'p', '3', 'G') /* IPU3 packed 10-bit GRBG bayer */ #define V4L2_PIX_FMT_IPU3_SRGGB10 v4l2_fourcc('i', 'p', '3', 'r') /* IPU3 packed 10-bit RGGB bayer */ +/* Raspberry Pi PiSP compressed formats. */ +#define V4L2_PIX_FMT_PISP_COMP1_RGGB v4l2_fourcc('P', 'C', '1', 'R') /* PiSP 8-bit mode 1 compressed RGGB bayer */ +#define V4L2_PIX_FMT_PISP_COMP1_GRBG v4l2_fourcc('P', 'C', '1', 'G') /* PiSP 8-bit mode 1 compressed GRBG bayer */ +#define V4L2_PIX_FMT_PISP_COMP1_GBRG v4l2_fourcc('P', 'C', '1', 'g') /* PiSP 8-bit mode 1 compressed GBRG bayer */ +#define V4L2_PIX_FMT_PISP_COMP1_BGGR v4l2_fourcc('P', 'C', '1', 'B') /* PiSP 8-bit mode 1 compressed BGGR bayer */ +#define V4L2_PIX_FMT_PISP_COMP1_MONO v4l2_fourcc('P', 'C', '1', 'M') /* PiSP 8-bit mode 1 compressed monochrome */ +#define V4L2_PIX_FMT_PISP_COMP2_RGGB v4l2_fourcc('P', 'C', '2', 'R') /* PiSP 8-bit mode 2 compressed RGGB bayer */ +#define V4L2_PIX_FMT_PISP_COMP2_GRBG v4l2_fourcc('P', 'C', '2', 'G') /* PiSP 8-bit mode 2 compressed GRBG bayer */ +#define V4L2_PIX_FMT_PISP_COMP2_GBRG v4l2_fourcc('P', 'C', '2', 'g') /* PiSP 8-bit mode 2 compressed GBRG bayer */ +#define V4L2_PIX_FMT_PISP_COMP2_BGGR v4l2_fourcc('P', 'C', '2', 'B') /* PiSP 8-bit mode 2 compressed BGGR bayer */ +#define V4L2_PIX_FMT_PISP_COMP2_MONO v4l2_fourcc('P', 'C', '2', 'M') /* PiSP 8-bit mode 2 compressed monochrome */ + /* SDR formats - used only for Software Defined Radio devices */ #define V4L2_SDR_FMT_CU8 v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */ #define V4L2_SDR_FMT_CU16LE v4l2_fourcc('C', 'U', '1', '6') /* IQ u16le */ @@ -814,6 +828,9 @@ struct v4l2_pix_format { #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 */ +/* Vendor specific - used for RaspberryPi PiSP */ +#define V4L2_META_FMT_RPI_BE_CFG v4l2_fourcc('R', 'P', 'B', 'C') /* PiSP BE configuration */ + /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe diff --git a/utils/common/v4l2-pix-formats.h b/utils/common/v4l2-pix-formats.h index 8356cbf40089..7cb208fe9792 100644 --- a/utils/common/v4l2-pix-formats.h +++ b/utils/common/v4l2-pix-formats.h @@ -38,6 +38,8 @@ case V4L2_PIX_FMT_RGBX1010102: return "32-bit RGBX 10-10-10-2"; case V4L2_PIX_FMT_RGBA1010102: return "32-bit RGBA 10-10-10-2"; case V4L2_PIX_FMT_ARGB2101010: return "32-bit ARGB 2-10-10-10"; + case V4L2_PIX_FMT_BGR48: return "48-bit BGR 16-16-16"; + case V4L2_PIX_FMT_RGB48: return "48-bit RGB 16-16-16"; case V4L2_PIX_FMT_BGR48_12: return "12-bit Depth BGR"; case V4L2_PIX_FMT_ABGR64_12: return "12-bit Depth BGRA"; case V4L2_PIX_FMT_GREY: return "8-bit Greyscale"; @@ -194,6 +196,7 @@ case V4L2_PIX_FMT_Y210: return "10-bit YUYV Packed"; case V4L2_PIX_FMT_Y212: return "12-bit YUYV Packed"; case V4L2_PIX_FMT_Y216: return "16-bit YUYV Packed"; + case V4L2_META_FMT_RPI_BE_CFG: return "RPi PiSP BE Config format"; case V4L2_PIX_FMT_MJPEG: return "Motion-JPEG"; case V4L2_PIX_FMT_JPEG: return "JFIF JPEG"; case V4L2_PIX_FMT_DV: return "1394"; @@ -247,3 +250,13 @@ case V4L2_PIX_FMT_MT2110T: return "Mediatek 10bit Tile Mode"; case V4L2_PIX_FMT_MT2110R: return "Mediatek 10bit Raster Mode"; case V4L2_PIX_FMT_HEXTILE: return "Hextile Compressed Format"; + case V4L2_PIX_FMT_PISP_COMP1_RGGB: return "PiSP 8b RGRG/GBGB mode1 compr"; + case V4L2_PIX_FMT_PISP_COMP1_GRBG: return "PiSP 8b GRGR/BGBG mode1 compr"; + case V4L2_PIX_FMT_PISP_COMP1_GBRG: return "PiSP 8b GBGB/RGRG mode1 compr"; + case V4L2_PIX_FMT_PISP_COMP1_BGGR: return "PiSP 8b BGBG/GRGR mode1 compr"; + case V4L2_PIX_FMT_PISP_COMP1_MONO: return "PiSP 8b monochrome mode1 compr"; + case V4L2_PIX_FMT_PISP_COMP2_RGGB: return "PiSP 8b RGRG/GBGB mode2 compr"; + case V4L2_PIX_FMT_PISP_COMP2_GRBG: return "PiSP 8b GRGR/BGBG mode2 compr"; + case V4L2_PIX_FMT_PISP_COMP2_GBRG: return "PiSP 8b GBGB/RGRG mode2 compr"; + case V4L2_PIX_FMT_PISP_COMP2_BGGR: return "PiSP 8b BGBG/GRGR mode2 compr"; + case V4L2_PIX_FMT_PISP_COMP2_MONO: return "PiSP 8b monochrome mode2 compr"; diff --git a/utils/keytable/parse.h b/utils/keytable/parse.h index a8f53673fa20..424b2fc92bc3 100644 --- a/utils/keytable/parse.h +++ b/utils/keytable/parse.h @@ -533,6 +533,8 @@ struct parse_event key_events[] = { {"KEY_CAMERA_ACCESS_ENABLE", 0x24b}, {"KEY_CAMERA_ACCESS_DISABLE", 0x24c}, {"KEY_CAMERA_ACCESS_TOGGLE", 0x24d}, + {"KEY_ACCESSIBILITY", 0x24e}, + {"KEY_DO_NOT_DISTURB", 0x24f}, {"KEY_BRIGHTNESS_MIN", 0x250}, {"KEY_BRIGHTNESS_MAX", 0x251}, {"KEY_KBDINPUTASSIST_PREV", 0x260}, diff --git a/utils/keytable/rc_keymaps/meson.build b/utils/keytable/rc_keymaps/meson.build index 2b8ebd8f71a2..829507b47e6d 100644 --- a/utils/keytable/rc_keymaps/meson.build +++ b/utils/keytable/rc_keymaps/meson.build @@ -94,6 +94,7 @@ ir_keytable_rc_keymaps = files( 'msi_digivox_ii.toml', 'msi_tvanywhere_plus.toml', 'msi_tvanywhere.toml', + 'mygica_utv3.toml', 'nebula.toml', 'nec_terratec_cinergy_xs.toml', 'norwood.toml', diff --git a/utils/keytable/rc_maps.cfg b/utils/keytable/rc_maps.cfg index 263ff0c6cec5..e366c477dd5c 100644 --- a/utils/keytable/rc_maps.cfg +++ b/utils/keytable/rc_maps.cfg @@ -112,6 +112,7 @@ * rc-msi-digivox-iii msi_digivox_iii.toml * rc-msi-tvanywhere-plus msi_tvanywhere_plus.toml * rc-msi-tvanywhere msi_tvanywhere.toml +* rc-mygica-utv3 mygica_utv3.toml * rc-nebula nebula.toml * rc-nec-terratec-cinergy-xs nec_terratec_cinergy_xs.toml * rc-norwood norwood.toml diff --git a/utils/v4l2-tracer/v4l2-tracer-info-gen.h b/utils/v4l2-tracer/v4l2-tracer-info-gen.h index 1ed43074407e..31cc5f913c86 100644 --- a/utils/v4l2-tracer/v4l2-tracer-info-gen.h +++ b/utils/v4l2-tracer/v4l2-tracer-info-gen.h @@ -1275,6 +1275,8 @@ constexpr val_def v4l2_pix_fmt_val_def[] = { { V4L2_PIX_FMT_RGBA1010102, "V4L2_PIX_FMT_RGBA1010102" }, { V4L2_PIX_FMT_ARGB2101010, "V4L2_PIX_FMT_ARGB2101010" }, { V4L2_PIX_FMT_BGR48_12, "V4L2_PIX_FMT_BGR48_12" }, + { V4L2_PIX_FMT_BGR48, "V4L2_PIX_FMT_BGR48" }, + { V4L2_PIX_FMT_RGB48, "V4L2_PIX_FMT_RGB48" }, { V4L2_PIX_FMT_ABGR64_12, "V4L2_PIX_FMT_ABGR64_12" }, { V4L2_PIX_FMT_GREY, "V4L2_PIX_FMT_GREY" }, { V4L2_PIX_FMT_Y4, "V4L2_PIX_FMT_Y4" }, @@ -2131,6 +2133,7 @@ constexpr val_def control_val_def[] = { { V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY_ENABLE, "V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY_ENABLE" }, { V4L2_CID_MPEG_VIDEO_AV1_PROFILE, "V4L2_CID_MPEG_VIDEO_AV1_PROFILE" }, { V4L2_CID_MPEG_VIDEO_AV1_LEVEL, "V4L2_CID_MPEG_VIDEO_AV1_LEVEL" }, + { V4L2_CID_MPEG_VIDEO_AVERAGE_QP, "V4L2_CID_MPEG_VIDEO_AVERAGE_QP" }, { V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE, "V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE" }, { V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER, "V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER" }, { V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE, "V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE" },
