[git:v4l-utils/master] v4l-utils: sync with latest kernel headers
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 headers
Author: Hans Verkuil
Date:Thu Nov 23 14:18:24 2023 +0100
Minor videodev2.h update.
Signed-off-by: Hans Verkuil
contrib/freebsd/include/linux/videodev2.h | 2 ++
include/linux/videodev2.h | 2 ++
2 files changed, 4 insertions(+)
---
http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=017644ebac36797cb2b1014a631a9216a90e8afa
diff --git a/contrib/freebsd/include/linux/videodev2.h
b/contrib/freebsd/include/linux/videodev2.h
index d505debc0790..4a8746ceeaea 100644
--- a/contrib/freebsd/include/linux/videodev2.h
+++ b/contrib/freebsd/include/linux/videodev2.h
@@ -1820,6 +1820,8 @@ struct v4l2_ext_control {
struct v4l2_ctrl_av1_tile_group_entry *p_av1_tile_group_entry;
struct v4l2_ctrl_av1_frame *p_av1_frame;
struct v4l2_ctrl_av1_film_grain *p_av1_film_grain;
+ struct v4l2_ctrl_hdr10_cll_info *p_hdr10_cll_info;
+ struct v4l2_ctrl_hdr10_mastering_display
*p_hdr10_mastering_display;
void *ptr;
};
} __attribute__ ((packed));
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index e7312cfb4b5f..397a99e3658b 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1786,6 +1786,8 @@ struct v4l2_ext_control {
struct v4l2_ctrl_av1_tile_group_entry *p_av1_tile_group_entry;
struct v4l2_ctrl_av1_frame *p_av1_frame;
struct v4l2_ctrl_av1_film_grain *p_av1_film_grain;
+ struct v4l2_ctrl_hdr10_cll_info *p_hdr10_cll_info;
+ struct v4l2_ctrl_hdr10_mastering_display
*p_hdr10_mastering_display;
void *ptr;
};
} __attribute__ ((packed));
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:v4l-utils/master] v4l-utils: sync with latest kernel headers
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 headers
Author: Hans Verkuil
Date:Thu Nov 23 13:05:48 2023 +0100
This adds support for V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS.
Signed-off-by: Hans Verkuil
contrib/freebsd/include/linux/videodev2.h | 7 ++-
include/linux/videodev2.h | 7 ++-
2 files changed, 12 insertions(+), 2 deletions(-)
---
http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=84c322b60375c73b45d32d7d837ebfef0c23b636
diff --git a/contrib/freebsd/include/linux/videodev2.h
b/contrib/freebsd/include/linux/videodev2.h
index 3bf0441ea23e..d505debc0790 100644
--- a/contrib/freebsd/include/linux/videodev2.h
+++ b/contrib/freebsd/include/linux/videodev2.h
@@ -1025,6 +1025,7 @@ struct v4l2_requestbuffers {
#define V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS(1 << 4)
#define V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF (1 << 5)
#define V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS (1 << 6)
+#define V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS (1 << 7)
/**
* struct v4l2_plane - plane info for multi-planar buffers
@@ -2579,6 +2580,9 @@ struct v4l2_dbg_chip_info {
* @flags: additional buffer management attributes (ignored unless the
* queue has V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS capability
* and configured for MMAP streaming I/O).
+ * @max_num_buffers: if V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS capability flag
is set
+ * this field indicate the maximum possible number of buffers
+ * for this queue.
* @reserved: future extensions
*/
struct v4l2_create_buffers {
@@ -2588,7 +2592,8 @@ struct v4l2_create_buffers {
struct v4l2_format format;
uint32_tcapabilities;
uint32_tflags;
- uint32_treserved[6];
+ uint32_tmax_num_buffers;
+ uint32_treserved[5];
};
/*
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 27680a39a879..e7312cfb4b5f 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -991,6 +991,7 @@ struct v4l2_requestbuffers {
#define V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS(1 << 4)
#define V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF (1 << 5)
#define V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS (1 << 6)
+#define V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS (1 << 7)
/**
* struct v4l2_plane - plane info for multi-planar buffers
@@ -2545,6 +2546,9 @@ struct v4l2_dbg_chip_info {
* @flags: additional buffer management attributes (ignored unless the
* queue has V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS capability
* and configured for MMAP streaming I/O).
+ * @max_num_buffers: if V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS capability flag
is set
+ * this field indicate the maximum possible number of buffers
+ * for this queue.
* @reserved: future extensions
*/
struct v4l2_create_buffers {
@@ -2554,7 +2558,8 @@ struct v4l2_create_buffers {
struct v4l2_format format;
__u32 capabilities;
__u32 flags;
- __u32 reserved[6];
+ __u32 max_num_buffers;
+ __u32 reserved[5];
};
/*
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:v4l-utils/master] v4l-utils: sync with latest kernel headers
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 headers
Author: Hans Verkuil
Date:Wed Nov 22 14:21:49 2023 +0100
Signed-off-by: Hans Verkuil
include/linux/bpf.h | 52
include/linux/media-bus-format.h | 3 ++-
2 files changed, 49 insertions(+), 6 deletions(-)
---
http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=6c5c18e61a824443152be91ce5ab3792dffd81e4
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index f6f4347b75a5..cdd6006d79fb 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -932,7 +932,14 @@ enum bpf_map_type {
*/
BPF_MAP_TYPE_CGROUP_STORAGE = BPF_MAP_TYPE_CGROUP_STORAGE_DEPRECATED,
BPF_MAP_TYPE_REUSEPORT_SOCKARRAY,
- BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE,
+ BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE_DEPRECATED,
+ /* BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE is available to bpf programs
+* attaching to a cgroup. The new mechanism (BPF_MAP_TYPE_CGRP_STORAGE +
+* local percpu kptr) supports all BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE
+* functionality and more. So mark * BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE
+* deprecated.
+*/
+ BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE =
BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE_DEPRECATED,
BPF_MAP_TYPE_QUEUE,
BPF_MAP_TYPE_STACK,
BPF_MAP_TYPE_SK_STORAGE,
@@ -1040,6 +1047,13 @@ enum bpf_attach_type {
BPF_TCX_INGRESS,
BPF_TCX_EGRESS,
BPF_TRACE_UPROBE_MULTI,
+ BPF_CGROUP_UNIX_CONNECT,
+ BPF_CGROUP_UNIX_SENDMSG,
+ BPF_CGROUP_UNIX_RECVMSG,
+ BPF_CGROUP_UNIX_GETPEERNAME,
+ BPF_CGROUP_UNIX_GETSOCKNAME,
+ BPF_NETKIT_PRIMARY,
+ BPF_NETKIT_PEER,
__MAX_BPF_ATTACH_TYPE
};
@@ -1059,6 +1073,7 @@ enum bpf_link_type {
BPF_LINK_TYPE_NETFILTER = 10,
BPF_LINK_TYPE_TCX = 11,
BPF_LINK_TYPE_UPROBE_MULTI = 12,
+ BPF_LINK_TYPE_NETKIT = 13,
MAX_BPF_LINK_TYPE,
};
@@ -1644,6 +1659,13 @@ union bpf_attr {
__u32 flags;
__u32 pid;
} uprobe_multi;
+ struct {
+ union {
+ __u32 relative_fd;
+ __u32 relative_id;
+ };
+ __u64 expected_revision;
+ } netkit;
};
} link_create;
@@ -2697,8 +2719,8 @@ union bpf_attr {
* *bpf_socket* should be one of the following:
*
* * **struct bpf_sock_ops** for **BPF_PROG_TYPE_SOCK_OPS**.
- * * **struct bpf_sock_addr** for **BPF_CGROUP_INET4_CONNECT**
- * and **BPF_CGROUP_INET6_CONNECT**.
+ * * **struct bpf_sock_addr** for **BPF_CGROUP_INET4_CONNECT**,
+ * **BPF_CGROUP_INET6_CONNECT** and **BPF_CGROUP_UNIX_CONNECT**.
*
* This helper actually implements a subset of **setsockopt()**.
* It supports the following *level*\ s:
@@ -2936,8 +2958,8 @@ union bpf_attr {
* *bpf_socket* should be one of the following:
*
* * **struct bpf_sock_ops** for **BPF_PROG_TYPE_SOCK_OPS**.
- * * **struct bpf_sock_addr** for **BPF_CGROUP_INET4_CONNECT**
- * and **BPF_CGROUP_INET6_CONNECT**.
+ * * **struct bpf_sock_addr** for **BPF_CGROUP_INET4_CONNECT**,
+ * **BPF_CGROUP_INET6_CONNECT** and **BPF_CGROUP_UNIX_CONNECT**.
*
* This helper actually implements a subset of **getsockopt()**.
* It supports the same set of *optname*\ s that is supported by
@@ -3257,6 +3279,11 @@ union bpf_attr {
* and *params*->smac will not be set as output. A common
* use case is to call **bpf_redirect_neigh**\ () after
* doing **bpf_fib_lookup**\ ().
+ * **BPF_FIB_LOOKUP_SRC**
+ * Derive and set source IP addr in *params*->ipv{4,6}_src
+ * 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.
*
* *ctx* is either **struct xdp_md** for XDP programs or
* **struct sk_buff** tc cls_act programs.
@@ -5089,6 +5116,8 @@ union bpf_attr {
* **BPF_F_TIMER_ABS**
* Start the timer in absolute expire value instead of the
* default relative one.
+ * **BPF_F_TIMER_CPU_PIN**
+ * Timer will be pinned to the CPU of the caller.
*
* Return
*
[git:v4l-utils/master] v4l-utils: sync with latest kernel headers
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 headers
Author: Hans Verkuil
Date:Wed Oct 18 09:00:00 2023 +0200
Signed-off-by: Hans Verkuil
contrib/freebsd/include/linux/v4l2-controls.h | 727 ++
contrib/freebsd/include/linux/videodev2.h | 14 +
include/linux/bpf.h | 186 ++-
include/linux/v4l2-controls.h | 727 ++
include/linux/videodev2.h | 14 +
utils/common/v4l2-pix-formats.h | 6 +
6 files changed, 1653 insertions(+), 21 deletions(-)
---
http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=10c97a62c1b125204fae535f435d39cedd79ca27
diff --git a/contrib/freebsd/include/linux/v4l2-controls.h
b/contrib/freebsd/include/linux/v4l2-controls.h
index 230475b7d453..cbf252bd85c7 100644
--- a/contrib/freebsd/include/linux/v4l2-controls.h
+++ b/contrib/freebsd/include/linux/v4l2-controls.h
@@ -205,6 +205,12 @@ enum v4l2_colorfx {
*/
#define V4L2_CID_USER_ASPEED_BASE (V4L2_CID_USER_BASE + 0x11a0)
+/*
+ * The base for Nuvoton NPCM driver controls.
+ * We reserve 16 controls for this driver.
+ */
+#define V4L2_CID_USER_NPCM_BASE(V4L2_CID_USER_BASE +
0x11b0)
+
/* MPEG-class control IDs */
/* The MPEG controls are applicable to all codec controls
* and the 'MPEG' part of the define is historical */
@@ -804,6 +810,88 @@ enum v4l2_mpeg_video_frame_skip_mode {
#define V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY (V4L2_CID_CODEC_BASE +
653)
#define V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY_ENABLE (V4L2_CID_CODEC_BASE +
654)
+#define V4L2_CID_MPEG_VIDEO_AV1_PROFILE (V4L2_CID_CODEC_BASE + 655)
+/**
+ * enum v4l2_mpeg_video_av1_profile - AV1 profiles
+ *
+ * @V4L2_MPEG_VIDEO_AV1_PROFILE_MAIN: compliant decoders must be able to decode
+ * streams with seq_profile equal to 0.
+ * @V4L2_MPEG_VIDEO_AV1_PROFILE_HIGH: compliant decoders must be able to decode
+ * streams with seq_profile equal less than or equal to 1.
+ * @V4L2_MPEG_VIDEO_AV1_PROFILE_PROFESSIONAL: compliant decoders must be able
to
+ * decode streams with seq_profile less than or equal to 2.
+ *
+ * Conveys the highest profile a decoder can work with.
+ */
+enum v4l2_mpeg_video_av1_profile {
+ V4L2_MPEG_VIDEO_AV1_PROFILE_MAIN = 0,
+ V4L2_MPEG_VIDEO_AV1_PROFILE_HIGH = 1,
+ V4L2_MPEG_VIDEO_AV1_PROFILE_PROFESSIONAL = 2,
+};
+
+#define V4L2_CID_MPEG_VIDEO_AV1_LEVEL (V4L2_CID_CODEC_BASE + 656)
+/**
+ * enum v4l2_mpeg_video_av1_level - AV1 levels
+ *
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_2_0: Level 2.0.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_2_1: Level 2.1.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_2_2: Level 2.2.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_2_3: Level 2.3.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_3_0: Level 3.0.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_3_1: Level 3.1.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_3_2: Level 3.2.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_3_3: Level 3.3.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_4_0: Level 4.0.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_4_1: Level 4.1.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_4_2: Level 4.2.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_4_3: Level 4.3.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_5_0: Level 5.0.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_5_1: Level 5.1.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_5_2: Level 5.2.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_5_3: Level 5.3.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_6_0: Level 6.0.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_6_1: Level 6.1.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_6_2: Level 6.2.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_6_3: Level 6.3.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_7_0: Level 7.0.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_7_1: Level 7.1.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_7_2: Level 7.2.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_7_3: Level 7.3.
+ *
+ * Conveys the highest level a decoder can work with.
+ */
+enum v4l2_mpeg_video_av1_level {
+ V4L2_MPEG_VIDEO_AV1_LEVEL_2_0 = 0,
+ V4L2_MPEG_VIDEO_AV1_LEVEL_2_1 = 1,
+ V4L2_MPEG_VIDEO_AV1_LEVEL_2_2 = 2,
+ V4L2_MPEG_VIDEO_AV1_LEVEL_2_3 = 3,
+
+ V4L2_MPEG_VIDEO_AV1_LEVEL_3_0 = 4,
+ V4L2_MPEG_VIDEO_AV1_LEVEL_3_1 = 5,
+ V4L2_MPEG_VIDEO_AV1_LEVEL_3_2 = 6,
+ V4L2_MPEG_VIDEO_AV1_LEVEL_3_3 = 7,
+
+ V4L2_MPEG_VIDEO_AV1_LEVEL_4_0 = 8,
+ V4L2_MPEG_VIDEO_AV1_LEVEL_4_1 = 9,
+ V4L2_MPEG_VIDEO_AV1_LEVEL_4_2 = 10,
+ V4L2_MPEG_VIDEO_AV1_LEVEL_4_3 = 11,
+
+ V4L2_MPEG_VIDEO_AV1_LEVEL_5_0 = 12,
+ V4L2_MPEG_VIDEO_AV1_LEVEL_5_1 = 13,
+ V4L2_MPEG_VIDEO_AV1_LEVEL_5_2 = 14,
+ V4L2_MPEG_VIDEO_AV1_LEVEL_5_3 = 15,
+
+ V4L2_MPEG_VIDEO_AV1_LEVEL_6_0 = 16,
+ V4L2_MPEG_VIDEO_AV1_LEVEL_6_1 = 17,
+ V4L2_MPEG_VIDEO_AV1_LEVEL_6_2 = 18,
+ V4L2_MPEG_VIDEO_AV1_LEVEL_6_3 = 19,
+
+ V4L2_MPEG_VIDEO_AV1_LEVEL_7_0 = 20,
+ V4L2_MPEG_VIDEO_AV1_LEVEL_7_1 = 21,
+ V4L2_MPEG_VIDEO_AV1_LEVEL_7_2 = 22,
+ V4L2_MPEG_VIDEO_AV1_LEVEL_7_3 = 23
+};
+
/* MPEG-cl
[git:v4l-utils/master] v4l-utils: sync with latest kernel headers
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 headers
Author: Hans Verkuil
Date:Mon Jul 18 09:16:13 2022 +0200
Update headers to the latest media staging kernel.
Signed-off-by: Hans Verkuil
contrib/freebsd/include/linux/v4l2-controls.h | 459 ++
contrib/freebsd/include/linux/videodev2.h | 17 +
include/linux/v4l2-controls.h | 459 ++
include/linux/videodev2.h | 17 +
utils/common/v4l2-pix-formats.h | 5 +-
utils/common/v4l2-tpg-core.c | 6 +
6 files changed, 962 insertions(+), 1 deletion(-)
---
http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=3b94a0ca4894d75de240b3ebb296071e551a261e
diff --git a/contrib/freebsd/include/linux/v4l2-controls.h
b/contrib/freebsd/include/linux/v4l2-controls.h
index 5d9215667806..b70d3ea10859 100644
--- a/contrib/freebsd/include/linux/v4l2-controls.h
+++ b/contrib/freebsd/include/linux/v4l2-controls.h
@@ -1999,6 +1999,465 @@ struct v4l2_ctrl_mpeg2_quantisation {
__u8chroma_non_intra_quantiser_matrix[64];
};
+#define V4L2_CID_STATELESS_HEVC_SPS(V4L2_CID_CODEC_STATELESS_BASE
+ 400)
+#define V4L2_CID_STATELESS_HEVC_PPS(V4L2_CID_CODEC_STATELESS_BASE
+ 401)
+#define V4L2_CID_STATELESS_HEVC_SLICE_PARAMS (V4L2_CID_CODEC_STATELESS_BASE
+ 402)
+#define V4L2_CID_STATELESS_HEVC_SCALING_MATRIX (V4L2_CID_CODEC_STATELESS_BASE
+ 403)
+#define V4L2_CID_STATELESS_HEVC_DECODE_PARAMS (V4L2_CID_CODEC_STATELESS_BASE
+ 404)
+#define V4L2_CID_STATELESS_HEVC_DECODE_MODE(V4L2_CID_CODEC_STATELESS_BASE
+ 405)
+#define V4L2_CID_STATELESS_HEVC_START_CODE (V4L2_CID_CODEC_STATELESS_BASE
+ 406)
+#define V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS
(V4L2_CID_CODEC_STATELESS_BASE + 407)
+
+enum v4l2_stateless_hevc_decode_mode {
+ V4L2_STATELESS_HEVC_DECODE_MODE_SLICE_BASED,
+ V4L2_STATELESS_HEVC_DECODE_MODE_FRAME_BASED,
+};
+
+enum v4l2_stateless_hevc_start_code {
+ V4L2_STATELESS_HEVC_START_CODE_NONE,
+ V4L2_STATELESS_HEVC_START_CODE_ANNEX_B,
+};
+
+#define V4L2_HEVC_SLICE_TYPE_B 0
+#define V4L2_HEVC_SLICE_TYPE_P 1
+#define V4L2_HEVC_SLICE_TYPE_I 2
+
+#define V4L2_HEVC_SPS_FLAG_SEPARATE_COLOUR_PLANE (1ULL << 0)
+#define V4L2_HEVC_SPS_FLAG_SCALING_LIST_ENABLED(1ULL
<< 1)
+#define V4L2_HEVC_SPS_FLAG_AMP_ENABLED (1ULL << 2)
+#define V4L2_HEVC_SPS_FLAG_SAMPLE_ADAPTIVE_OFFSET (1ULL << 3)
+#define V4L2_HEVC_SPS_FLAG_PCM_ENABLED (1ULL << 4)
+#define V4L2_HEVC_SPS_FLAG_PCM_LOOP_FILTER_DISABLED(1ULL << 5)
+#define V4L2_HEVC_SPS_FLAG_LONG_TERM_REF_PICS_PRESENT (1ULL << 6)
+#define V4L2_HEVC_SPS_FLAG_SPS_TEMPORAL_MVP_ENABLED(1ULL << 7)
+#define V4L2_HEVC_SPS_FLAG_STRONG_INTRA_SMOOTHING_ENABLED (1ULL << 8)
+
+/**
+ * struct v4l2_ctrl_hevc_sps - ITU-T Rec. H.265: Sequence parameter set
+ *
+ * @video_parameter_set_id: specifies the value of the
+ * vps_video_parameter_set_id of the active VPS
+ * @seq_parameter_set_id: provides an identifier for the SPS for
+ * reference by other syntax elements
+ * @pic_width_in_luma_samples: specifies the width of each decoded picture
+ * in units of luma samples
+ * @pic_height_in_luma_samples: specifies the height of each decoded picture
+ * in units of luma samples
+ * @bit_depth_luma_minus8: this value plus 8specifies the bit depth of the
+ * samples of the luma array
+ * @bit_depth_chroma_minus8: this value plus 8 specifies the bit depth of the
+ * samples of the chroma arrays
+ * @log2_max_pic_order_cnt_lsb_minus4: this value plus 4 specifies the value of
+ * the variable MaxPicOrderCntLsb
+ * @sps_max_dec_pic_buffering_minus1: this value plus 1 specifies the maximum
+ *required size of the decoded picture
+ *buffer for the codec video sequence
+ * @sps_max_num_reorder_pics: indicates the maximum allowed number of pictures
+ * @sps_max_latency_increase_plus1: not equal to 0 is used to compute the
+ * value of SpsMaxLatencyPictures array
+ * @log2_min_luma_coding_block_size_minus3: plus 3 specifies the minimum
+ * luma coding block size
+ * @log2_diff_max_min_luma_coding_block_size: specifies the difference between
+ * the maximum and minimum luma
+ * coding block size
+ * @log2_min_luma_transform_block_size_minus2: plus 2 specifies the minimum
luma
+ *
[git:v4l-utils/master] v4l-utils: sync with latest kernel headers
This is an automatic generated email to let you know that the following patch
were queued at the
http://git.linuxtv.org/v4l-utils.git tree:
Subject: v4l-utils: sync with latest kernel headers
Author: Hans Verkuil
Date:Sat Jul 26 07:30:05 2014 +0200
Signed-off-by: Hans Verkuil
contrib/freebsd/include/linux/v4l2-controls.h | 15 ++
contrib/freebsd/include/linux/videodev2.h |2 +
include/linux/v4l2-controls.h | 15 ++
include/linux/videodev2.h |2 +
utils/keytable/rc_keymaps/ati_x10 | 52
utils/keytable/rc_keymaps/behold | 68 +-
utils/keytable/rc_keymaps/nebula | 112
utils/keytable/rc_maps.cfg| 170
8 files changed, 235 insertions(+), 201 deletions(-)
---
http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=0a4eefa96c01e52fd7bcf5bf9b85ebbfdec5501a
diff --git a/contrib/freebsd/include/linux/v4l2-controls.h
b/contrib/freebsd/include/linux/v4l2-controls.h
index db526d1..e946e43 100644
--- a/contrib/freebsd/include/linux/v4l2-controls.h
+++ b/contrib/freebsd/include/linux/v4l2-controls.h
@@ -757,6 +757,15 @@ enum v4l2_auto_focus_range {
#define V4L2_CID_RDS_TX_PTY(V4L2_CID_FM_TX_CLASS_BASE + 3)
#define V4L2_CID_RDS_TX_PS_NAME
(V4L2_CID_FM_TX_CLASS_BASE + 5)
#define V4L2_CID_RDS_TX_RADIO_TEXT (V4L2_CID_FM_TX_CLASS_BASE + 6)
+#define V4L2_CID_RDS_TX_MONO_STEREO(V4L2_CID_FM_TX_CLASS_BASE + 7)
+#define V4L2_CID_RDS_TX_ARTIFICIAL_HEAD
(V4L2_CID_FM_TX_CLASS_BASE + 8)
+#define V4L2_CID_RDS_TX_COMPRESSED (V4L2_CID_FM_TX_CLASS_BASE + 9)
+#define V4L2_CID_RDS_TX_DYNAMIC_PTY(V4L2_CID_FM_TX_CLASS_BASE + 10)
+#define V4L2_CID_RDS_TX_TRAFFIC_ANNOUNCEMENT (V4L2_CID_FM_TX_CLASS_BASE + 11)
+#define V4L2_CID_RDS_TX_TRAFFIC_PROGRAM
(V4L2_CID_FM_TX_CLASS_BASE + 12)
+#define V4L2_CID_RDS_TX_MUSIC_SPEECH (V4L2_CID_FM_TX_CLASS_BASE + 13)
+#define V4L2_CID_RDS_TX_ALT_FREQS_ENABLE (V4L2_CID_FM_TX_CLASS_BASE + 14)
+#define V4L2_CID_RDS_TX_ALT_FREQS (V4L2_CID_FM_TX_CLASS_BASE + 15)
#define V4L2_CID_AUDIO_LIMITER_ENABLED (V4L2_CID_FM_TX_CLASS_BASE + 64)
#define V4L2_CID_AUDIO_LIMITER_RELEASE_TIME(V4L2_CID_FM_TX_CLASS_BASE + 65)
@@ -901,6 +910,12 @@ enum v4l2_deemphasis {
};
#define V4L2_CID_RDS_RECEPTION (V4L2_CID_FM_RX_CLASS_BASE + 2)
+#define V4L2_CID_RDS_RX_PTY(V4L2_CID_FM_RX_CLASS_BASE + 3)
+#define V4L2_CID_RDS_RX_PS_NAME
(V4L2_CID_FM_RX_CLASS_BASE + 4)
+#define V4L2_CID_RDS_RX_RADIO_TEXT (V4L2_CID_FM_RX_CLASS_BASE + 5)
+#define V4L2_CID_RDS_RX_TRAFFIC_ANNOUNCEMENT (V4L2_CID_FM_RX_CLASS_BASE + 6)
+#define V4L2_CID_RDS_RX_TRAFFIC_PROGRAM
(V4L2_CID_FM_RX_CLASS_BASE + 7)
+#define V4L2_CID_RDS_RX_MUSIC_SPEECH (V4L2_CID_FM_RX_CLASS_BASE + 8)
#define V4L2_CID_RF_TUNER_CLASS_BASE (V4L2_CTRL_CLASS_RF_TUNER |
0x900)
#define V4L2_CID_RF_TUNER_CLASS
(V4L2_CTRL_CLASS_RF_TUNER | 1)
diff --git a/contrib/freebsd/include/linux/videodev2.h
b/contrib/freebsd/include/linux/videodev2.h
index fec404e..02f2005 100644
--- a/contrib/freebsd/include/linux/videodev2.h
+++ b/contrib/freebsd/include/linux/videodev2.h
@@ -1320,6 +1320,7 @@ struct v4l2_ext_control {
char *string;
uint8_t *p_u8;
uint16_t *p_u16;
+ uint32_t *p_u32;
void *ptr;
};
} __attribute__ ((packed));
@@ -1352,6 +1353,7 @@ enum v4l2_ctrl_type {
V4L2_CTRL_COMPOUND_TYPES = 0x0100,
V4L2_CTRL_TYPE_U8= 0x0100,
V4L2_CTRL_TYPE_U16 = 0x0101,
+ V4L2_CTRL_TYPE_U32 = 0x0102,
};
/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h
index db526d1..e946e43 100644
--- a/include/linux/v4l2-controls.h
+++ b/include/linux/v4l2-controls.h
@@ -757,6 +757,15 @@ enum v4l2_auto_focus_range {
#define V4L2_CID_RDS_TX_PTY(V4L2_CID_FM_TX_CLASS_BASE + 3)
#define V4L2_CID_RDS_TX_PS_NAME
(V4L2_CID_FM_TX_CLASS_BASE + 5)
#define V4L2_CID_RDS_TX_RADIO_TEXT (V4L2_CID_FM_TX_CLASS_BASE + 6)
+#define V4L2_CID_RDS_TX_MONO_STEREO(V4L2_CID_FM_TX_CLASS_BASE + 7)
+#define V4L2_CID_RDS_TX_ARTIFICIAL_HEAD
(V4L2_CID_FM_TX_CLASS_BASE + 8)
+#define V4L2_CID_RDS_TX_COMPRESSED (V4L2_CID_FM_TX_CLASS_BASE + 9)
+#define V4L2_CID_RDS_TX_DYNAMIC_PTY(V4L2_CID_FM_TX_CLASS_BASE + 10)
+#define V4L2_CID_RDS_TX_TRAFFIC_ANNOUNCEMENT (V4L2_CID_FM_TX_CLASS_BASE + 11)
+#define V4L2_CID_RDS_TX_TRAFFIC_PROGRAM
(V4L2_CID_FM_TX_CLASS_BASE + 12)
+#define V4L2_CID_RDS_TX_MUSIC_SPEECH (V4L2
[git:v4l-utils/master] v4l-utils: sync with latest kernel headers.
This is an automatic generated email to let you know that the following patch
were queued at the
http://git.linuxtv.org/v4l-utils.git tree:
Subject: v4l-utils: sync with latest kernel headers.
Author: Hans Verkuil
Date:Wed Mar 5 21:31:04 2014 +0100
Signed-off-by: Hans Verkuil
contrib/freebsd/include/linux/v4l2-controls.h | 13 ++
contrib/freebsd/include/linux/videodev2.h | 58 ++--
include/linux/v4l2-controls.h | 13 ++
include/linux/videodev2.h | 58 ++--
utils/keytable/rc_maps.cfg| 170
5 files changed, 197 insertions(+), 115 deletions(-)
---
http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=338d1e2e72e9ae63d1a7bf3b2ac1623e32d8458c
diff --git a/contrib/freebsd/include/linux/v4l2-controls.h
b/contrib/freebsd/include/linux/v4l2-controls.h
index 2cbe605..e97101c 100644
--- a/contrib/freebsd/include/linux/v4l2-controls.h
+++ b/contrib/freebsd/include/linux/v4l2-controls.h
@@ -60,6 +60,7 @@
#define V4L2_CTRL_CLASS_IMAGE_PROC 0x009f /* Image processing
controls */
#define V4L2_CTRL_CLASS_DV 0x00a0 /* Digital Video
controls */
#define V4L2_CTRL_CLASS_FM_RX 0x00a1 /* FM Receiver controls
*/
+#define V4L2_CTRL_CLASS_RF_TUNER 0x00a2 /* RF tuner controls */
/* User-class control IDs */
@@ -376,6 +377,8 @@ enum v4l2_mpeg_video_multi_slice_mode {
#define V4L2_CID_MPEG_VIDEO_DEC_FRAME (V4L2_CID_MPEG_BASE+224)
#define V4L2_CID_MPEG_VIDEO_VBV_DELAY (V4L2_CID_MPEG_BASE+225)
#define V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER (V4L2_CID_MPEG_BASE+226)
+#define V4L2_CID_MPEG_VIDEO_MV_H_SEARCH_RANGE (V4L2_CID_MPEG_BASE+227)
+#define V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE (V4L2_CID_MPEG_BASE+228)
#define V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP(V4L2_CID_MPEG_BASE+300)
#define V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP(V4L2_CID_MPEG_BASE+301)
@@ -895,4 +898,14 @@ enum v4l2_deemphasis {
#define V4L2_CID_RDS_RECEPTION (V4L2_CID_FM_RX_CLASS_BASE + 2)
+#define V4L2_CID_RF_TUNER_CLASS_BASE (V4L2_CTRL_CLASS_RF_TUNER |
0x900)
+#define V4L2_CID_RF_TUNER_CLASS
(V4L2_CTRL_CLASS_RF_TUNER | 1)
+
+#define V4L2_CID_RF_TUNER_LNA_GAIN_AUTO
(V4L2_CID_RF_TUNER_CLASS_BASE + 1)
+#define V4L2_CID_RF_TUNER_LNA_GAIN (V4L2_CID_RF_TUNER_CLASS_BASE +
2)
+#define V4L2_CID_RF_TUNER_MIXER_GAIN_AUTO (V4L2_CID_RF_TUNER_CLASS_BASE +
3)
+#define V4L2_CID_RF_TUNER_MIXER_GAIN (V4L2_CID_RF_TUNER_CLASS_BASE +
4)
+#define V4L2_CID_RF_TUNER_IF_GAIN_AUTO (V4L2_CID_RF_TUNER_CLASS_BASE +
5)
+#define V4L2_CID_RF_TUNER_IF_GAIN (V4L2_CID_RF_TUNER_CLASS_BASE +
6)
+
#endif
diff --git a/contrib/freebsd/include/linux/videodev2.h
b/contrib/freebsd/include/linux/videodev2.h
index 5c75762..5eb1c58 100644
--- a/contrib/freebsd/include/linux/videodev2.h
+++ b/contrib/freebsd/include/linux/videodev2.h
@@ -173,6 +173,7 @@ enum v4l2_buf_type {
#endif
V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9,
V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE = 10,
+ V4L2_BUF_TYPE_SDR_CAPTURE = 11,
/* Deprecated, do not use */
V4L2_BUF_TYPE_PRIVATE = 0x80,
};
@@ -193,6 +194,8 @@ enum v4l2_tuner_type {
V4L2_TUNER_RADIO = 1,
V4L2_TUNER_ANALOG_TV = 2,
V4L2_TUNER_DIGITAL_TV= 3,
+ V4L2_TUNER_ADC = 4,
+ V4L2_TUNER_RF= 5,
};
enum v4l2_memory {
@@ -298,6 +301,8 @@ struct v4l2_capability {
#define V4L2_CAP_RADIO 0x0004 /* is a radio device */
#define V4L2_CAP_MODULATOR 0x0008 /* has a modulator */
+#define V4L2_CAP_SDR_CAPTURE 0x0010 /* Is a SDR capture device
*/
+
#define V4L2_CAP_READWRITE 0x0100 /* read/write systemcalls
*/
#define V4L2_CAP_ASYNCIO0x0200 /* async I/O */
#define V4L2_CAP_STREAMING 0x0400 /* streaming I/O ioctls */
@@ -703,24 +708,36 @@ struct v4l2_buffer {
};
/* Flags for 'flags' field */
-#define V4L2_BUF_FLAG_MAPPED 0x0001 /* Buffer is mapped (flag) */
-#define V4L2_BUF_FLAG_QUEUED 0x0002 /* Buffer is queued for processing */
-#define V4L2_BUF_FLAG_DONE 0x0004 /* Buffer is ready */
-#define V4L2_BUF_FLAG_KEYFRAME 0x0008 /* Image is a keyframe (I-frame) */
-#define V4L2_BUF_FLAG_PFRAME 0x0010 /* Image is a P-frame */
-#define V4L2_BUF_FLAG_BFRAME 0x0020 /* Image is a B-frame */
+/* Buffer is mapped (flag) */
+#define V4L2_BUF_FLAG_MAPPED 0x0001
+/* Buffer is queued for processing */
+#define V4L2_BUF_FLAG_QUEUED 0x0002
+/* Buffer is ready */
+#define V4L2_BUF_FLAG_DONE 0x0004
+/* Image is a keyframe (I-frame) */
+#define V4L2_BUF_FLAG_KEYFRAME
[git:v4l-utils/master] v4l-utils: sync with latest kernel headers.
This is an automatic generated email to let you know that the following patch
were queued at the
http://git.linuxtv.org/v4l-utils.git tree:
Subject: v4l-utils: sync with latest kernel headers.
Author: Hans Verkuil
Date:Wed Dec 5 10:41:47 2012 +0100
I had to make quite a few changes due to the introduction of the uapi
directory, lots of paths had to be changed.
Signed-off-by: Hans Verkuil
Makefile.am | 16 +-
contrib/freebsd/Makefile.am |2 +-
contrib/freebsd/bsdify.sh |2 +-
contrib/freebsd/include/linux/dvb/dmx.h |7 +-
contrib/freebsd/include/linux/dvb/version.h |2 +-
contrib/freebsd/include/linux/dvb/video.h |6 +-
contrib/freebsd/include/linux/input.h | 514 +
contrib/freebsd/include/linux/uinput.h| 66 +---
contrib/freebsd/include/linux/videodev2.h | 49 +++-
contrib/freebsd/patches/dvb-dmx-header.diff | 17 +-
contrib/freebsd/patches/dvb-video-header.diff | 14 +-
contrib/freebsd/patches/input-header.diff | 16 +-
contrib/freebsd/patches/series|1 +
contrib/freebsd/patches/uinput-header.diff| 10 +
contrib/freebsd/patches/videodev2-header.diff | 21 +-
include/linux/videodev2.h | 47 ++-
lib/libdvbv5/gen_dvb_structs.pl |2 +-
utils/keytable/Makefile.am|4 +-
utils/keytable/rc_keymaps/imon_mce|2 +-
utils/keytable/rc_keymaps/rc6_mce |2 +-
utils/keytable/rc_maps.cfg| 164
21 files changed, 251 insertions(+), 713 deletions(-)
---
http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=fe2aa5f767eba7276978a82cf62349a3cd1ff937
diff --git a/Makefile.am b/Makefile.am
index 32582f1..491c83d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,18 +12,18 @@ EXTRA_DIST = include README.lib README.lib-multi-threading
# custom targets
sync-with-kernel:
- @if [ ! -f $(KERNEL_DIR)/include/linux/videodev2.h -o \
- ! -f $(KERNEL_DIR)/include/linux/v4l2-controls.h -o \
- ! -f $(KERNEL_DIR)/include/linux/v4l2-common.h -o \
- ! -f $(KERNEL_DIR)/include/linux/ivtv.h -o \
+ @if [ ! -f $(KERNEL_DIR)/include/uapi/linux/videodev2.h -o \
+ ! -f $(KERNEL_DIR)/include/uapi/linux/v4l2-controls.h -o \
+ ! -f $(KERNEL_DIR)/include/uapi/linux/v4l2-common.h -o \
+ ! -f $(KERNEL_DIR)/include/uapi/linux/ivtv.h -o \
! -f $(KERNEL_DIR)/include/media/v4l2-chip-ident.h ]; then \
echo "Error you must set KERNEL_DIR to point to an extracted kernel
source dir"; \
exit 1; \
fi
- cp -a $(KERNEL_DIR)/include/linux/videodev2.h
$(top_srcdir)/include/linux
- cp -a $(KERNEL_DIR)/include/linux/v4l2-controls.h
$(top_srcdir)/include/linux
- cp -a $(KERNEL_DIR)/include/linux/v4l2-common.h
$(top_srcdir)/include/linux
- cp -a $(KERNEL_DIR)/include/linux/ivtv.h $(top_srcdir)/include/linux
+ cp -a $(KERNEL_DIR)/include/uapi/linux/videodev2.h
$(top_srcdir)/include/linux
+ cp -a $(KERNEL_DIR)/include/uapi/linux/v4l2-controls.h
$(top_srcdir)/include/linux
+ cp -a $(KERNEL_DIR)/include/uapi/linux/v4l2-common.h
$(top_srcdir)/include/linux
+ cp -a $(KERNEL_DIR)/include/uapi/linux/ivtv.h
$(top_srcdir)/include/linux
cp -a $(KERNEL_DIR)/include/media/v4l2-chip-ident.h
$(top_srcdir)/include/media
$(MAKE) -C utils/keytable $@
diff --git a/contrib/freebsd/Makefile.am b/contrib/freebsd/Makefile.am
index e23d161..45856bc 100644
--- a/contrib/freebsd/Makefile.am
+++ b/contrib/freebsd/Makefile.am
@@ -8,7 +8,7 @@ sync-with-kernel:
for i in input.h ivtv.h uinput.h videodev2.h v4l2-controls.h
v4l2-common.h
dvb/{audio.h,ca.h,dmx.h,frontend.h,net.h,osd.h,version.h,video.h}; do \
mkdir -p include/linux/$$(dirname $$i); \
- cp $(KERNEL_DIR)/include/linux/$$i include/linux/$$i; \
+ cp $(KERNEL_DIR)/include/uapi/linux/$$i include/linux/$$i; \
done
mkdir -p include/media
diff --git a/contrib/freebsd/bsdify.sh b/contrib/freebsd/bsdify.sh
index bbe29bb..6547b61 100755
--- a/contrib/freebsd/bsdify.sh
+++ b/contrib/freebsd/bsdify.sh
@@ -30,7 +30,7 @@ rm -rf include .pc
for i in input.h ivtv.h uinput.h videodev2.h v4l2-controls.h v4l2-common.h
dvb/{audio.h,ca.h,dmx.h,frontend.h,net.h,osd.h,version.h,video.h}; do
mkdir -p include/linux/$(dirname $i)
-cp $KERNEL_DIR/include/linux/$i include/linux/$i
+cp $KERNEL_DIR/include/uapi/linux/$i include/linux/$i
done
mkdir -p include/media
diff --git a/contrib/freebsd/include/linux/dvb/dmx.h
b/contrib/freebsd/include/linux/dvb/dmx.h
index 1c48e6b..4b3fee8 100644
--- a/contrib/freebsd/include/linux/dvb/dmx.h
+++ b/contrib/freebsd/include/linux/dvb/dmx.h
@@ -21,13 +21,14 @@
*
*/
-#ifndef _DVBDMX_H_
-#define _DVBDMX_H_
+#ifndef _UAPI_
