[git:v4l-utils/master] v4l-utils: sync with media_tree master
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 Author: Hans Verkuil Date:Tue Jun 8 14:22:29 2021 +0200 This will update v4l2-controls.h, adding _BITUL support Signed-off-by: Hans Verkuil contrib/freebsd/include/linux/v4l2-controls.h | 4 include/linux/v4l2-controls.h | 4 2 files changed, 8 insertions(+) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=d54759c5860386e759f830151760a6bdd5b509cf diff --git a/contrib/freebsd/include/linux/v4l2-controls.h b/contrib/freebsd/include/linux/v4l2-controls.h index e329974d3bef..9db08be6186c 100644 --- a/contrib/freebsd/include/linux/v4l2-controls.h +++ b/contrib/freebsd/include/linux/v4l2-controls.h @@ -53,6 +53,10 @@ #include #include +#ifndef _BITUL +#define _BITUL(x)(1U << (x)) +#endif + /* Control classes */ #define V4L2_CTRL_CLASS_USER 0x0098 /* Old-style 'user' controls */ #define V4L2_CTRL_CLASS_CODEC 0x0099 /* Stateful codec controls */ diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h index e329974d3bef..9db08be6186c 100644 --- a/include/linux/v4l2-controls.h +++ b/include/linux/v4l2-controls.h @@ -53,6 +53,10 @@ #include #include +#ifndef _BITUL +#define _BITUL(x)(1U << (x)) +#endif + /* Control classes */ #define V4L2_CTRL_CLASS_USER 0x0098 /* Old-style 'user' controls */ #define V4L2_CTRL_CLASS_CODEC 0x0099 /* Stateful codec controls */ ___ 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 media_tree/master
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 Author: Hans Verkuil Date:Fri Jun 4 08:44:13 2021 +0200 Update headers from latest media_tree/master kernel. Signed-off-by: Hans Verkuil contrib/freebsd/include/linux/v4l2-controls.h | 23 --- include/linux/cec-funcs.h | 2 +- include/linux/v4l2-controls.h | 23 --- 3 files changed, 25 insertions(+), 23 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=c379af4ae1b99ebbe40bcefc5447c2bf9ad15a06 diff --git a/contrib/freebsd/include/linux/v4l2-controls.h b/contrib/freebsd/include/linux/v4l2-controls.h index 62d0cd6db66b..e329974d3bef 100644 --- a/contrib/freebsd/include/linux/v4l2-controls.h +++ b/contrib/freebsd/include/linux/v4l2-controls.h @@ -50,6 +50,7 @@ #ifndef __LINUX_V4L2_CONTROLS_H #define __LINUX_V4L2_CONTROLS_H +#include #include /* Control classes */ @@ -1600,30 +1601,30 @@ struct v4l2_ctrl_h264_decode_params { #define V4L2_FWHT_VERSION 3 /* Set if this is an interlaced format */ -#define V4L2_FWHT_FL_IS_INTERLACED BIT(0) +#define V4L2_FWHT_FL_IS_INTERLACED _BITUL(0) /* Set if this is a bottom-first (NTSC) interlaced format */ -#define V4L2_FWHT_FL_IS_BOTTOM_FIRST BIT(1) +#define V4L2_FWHT_FL_IS_BOTTOM_FIRST _BITUL(1) /* Set if each 'frame' contains just one field */ -#define V4L2_FWHT_FL_IS_ALTERNATE BIT(2) +#define V4L2_FWHT_FL_IS_ALTERNATE _BITUL(2) /* * If V4L2_FWHT_FL_IS_ALTERNATE was set, then this is set if this * 'frame' is the bottom field, else it is the top field. */ -#define V4L2_FWHT_FL_IS_BOTTOM_FIELD BIT(3) +#define V4L2_FWHT_FL_IS_BOTTOM_FIELD _BITUL(3) /* Set if the Y' plane is uncompressed */ -#define V4L2_FWHT_FL_LUMA_IS_UNCOMPRESSED BIT(4) +#define V4L2_FWHT_FL_LUMA_IS_UNCOMPRESSED _BITUL(4) /* Set if the Cb plane is uncompressed */ -#define V4L2_FWHT_FL_CB_IS_UNCOMPRESSEDBIT(5) +#define V4L2_FWHT_FL_CB_IS_UNCOMPRESSED_BITUL(5) /* Set if the Cr plane is uncompressed */ -#define V4L2_FWHT_FL_CR_IS_UNCOMPRESSEDBIT(6) +#define V4L2_FWHT_FL_CR_IS_UNCOMPRESSED_BITUL(6) /* Set if the chroma plane is full height, if cleared it is half height */ -#define V4L2_FWHT_FL_CHROMA_FULL_HEIGHTBIT(7) +#define V4L2_FWHT_FL_CHROMA_FULL_HEIGHT_BITUL(7) /* Set if the chroma plane is full width, if cleared it is half width */ -#define V4L2_FWHT_FL_CHROMA_FULL_WIDTH BIT(8) +#define V4L2_FWHT_FL_CHROMA_FULL_WIDTH _BITUL(8) /* Set if the alpha plane is uncompressed */ -#define V4L2_FWHT_FL_ALPHA_IS_UNCOMPRESSED BIT(9) +#define V4L2_FWHT_FL_ALPHA_IS_UNCOMPRESSED _BITUL(9) /* Set if this is an I Frame */ -#define V4L2_FWHT_FL_I_FRAME BIT(10) +#define V4L2_FWHT_FL_I_FRAME _BITUL(10) /* A 4-values flag - the number of components - 1 */ #define V4L2_FWHT_FL_COMPONENTS_NUM_MSKGENMASK(18, 16) diff --git a/include/linux/cec-funcs.h b/include/linux/cec-funcs.h index 9932239b7f4e..0385d0e7e0d3 100644 --- a/include/linux/cec-funcs.h +++ b/include/linux/cec-funcs.h @@ -1665,7 +1665,7 @@ static __inline__ void cec_ops_report_current_latency(const struct cec_msg *msg, if (*audio_out_compensated == 3 && msg->len >= 7) *audio_out_delay = msg->msg[6]; else - *audio_out_delay = 0; + *audio_out_delay = 1; } static __inline__ void cec_msg_request_current_latency(struct cec_msg *msg, diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h index 62d0cd6db66b..e329974d3bef 100644 --- a/include/linux/v4l2-controls.h +++ b/include/linux/v4l2-controls.h @@ -50,6 +50,7 @@ #ifndef __LINUX_V4L2_CONTROLS_H #define __LINUX_V4L2_CONTROLS_H +#include #include /* Control classes */ @@ -1600,30 +1601,30 @@ struct v4l2_ctrl_h264_decode_params { #define V4L2_FWHT_VERSION 3 /* Set if this is an interlaced format */ -#define V4L2_FWHT_FL_IS_INTERLACED BIT(0) +#define V4L2_FWHT_FL_IS_INTERLACED _BITUL(0) /* Set if this is a bottom-first (NTSC) interlaced format */ -#define V4L2_FWHT_FL_IS_BOTTOM_FIRST BIT(1) +#define V4L2_FWHT_FL_IS_BOTTOM_FIRST _BITUL(1) /* Set if each 'frame' contains just one field */ -#define V4L2_FWHT_FL_IS_ALTERNATE BIT(2) +#define V4L2_FWHT_FL_IS_ALTERNATE _BITUL(2) /* * If V4L2_FWHT_FL_IS_ALTERNATE was set, then this is set if this * 'frame' is the bottom field, else it is the top field. */ -#define V4L2_FWHT_FL_IS_BOTTOM_FIELD BIT(3) +#define V4L2_FWHT_FL_IS_BOTTOM_FIELD _
[git:v4l-utils/master] v4l-utils: sync with media_tree master
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 Author: Hans Verkuil Date:Thu Dec 3 12:13:49 2020 +0100 The FWHT stateless codec API is now an official public API, so this required a few changes. Signed-off-by: Hans Verkuil contrib/freebsd/include/linux/input-event-codes.h | 4 + contrib/freebsd/include/linux/v4l2-controls.h | 871 +- contrib/freebsd/include/linux/videodev2.h | 25 +- include/linux/bpf.h | 669 - include/linux/lirc.h | 4 +- include/linux/media-bus-format.h | 8 + include/linux/v4l2-controls.h | 871 +- include/linux/videodev2.h | 25 +- sync-with-kernel.sh | 1 - utils/common/codec-fwht.c | 13 +- utils/common/codec-fwht.h | 32 - utils/common/codec-v4l2-fwht.c| 88 +-- utils/common/fwht-ctrls.h | 31 - utils/common/v4l2-pix-formats.h | 2 + utils/keytable/parse.h| 4 + utils/keytable/rc_maps.cfg| 1 + utils/v4l2-compliance/v4l2-test-controls.cpp | 7 +- utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 5 +- 18 files changed, 2097 insertions(+), 564 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=24b88169ff86674aa18b5897cbd1e608a603fa79 ___ 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 media_tree master
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 Author: Hans Verkuil Date:Sat Sep 26 12:08:05 2020 +0200 Signed-off-by: Hans Verkuil contrib/freebsd/include/linux/v4l2-controls.h | 17 + contrib/freebsd/include/linux/videodev2.h | 6 ++ include/linux/v4l2-controls.h | 17 + include/linux/v4l2-mediabus.h | 15 +-- include/linux/v4l2-subdev.h | 10 +- include/linux/videodev2.h | 6 ++ 6 files changed, 68 insertions(+), 3 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=f8cf8346321c9f437ae27a676b44bda53cb103b5 diff --git a/contrib/freebsd/include/linux/v4l2-controls.h b/contrib/freebsd/include/linux/v4l2-controls.h index 146263de249d..bc9829d6a47d 100644 --- a/contrib/freebsd/include/linux/v4l2-controls.h +++ b/contrib/freebsd/include/linux/v4l2-controls.h @@ -649,6 +649,23 @@ enum v4l2_mpeg_video_vp9_profile { V4L2_MPEG_VIDEO_VP9_PROFILE_2 = 2, V4L2_MPEG_VIDEO_VP9_PROFILE_3 = 3, }; +#define V4L2_CID_MPEG_VIDEO_VP9_LEVEL (V4L2_CID_MPEG_BASE+513) +enum v4l2_mpeg_video_vp9_level { + V4L2_MPEG_VIDEO_VP9_LEVEL_1_0 = 0, + V4L2_MPEG_VIDEO_VP9_LEVEL_1_1 = 1, + V4L2_MPEG_VIDEO_VP9_LEVEL_2_0 = 2, + V4L2_MPEG_VIDEO_VP9_LEVEL_2_1 = 3, + V4L2_MPEG_VIDEO_VP9_LEVEL_3_0 = 4, + V4L2_MPEG_VIDEO_VP9_LEVEL_3_1 = 5, + V4L2_MPEG_VIDEO_VP9_LEVEL_4_0 = 6, + V4L2_MPEG_VIDEO_VP9_LEVEL_4_1 = 7, + V4L2_MPEG_VIDEO_VP9_LEVEL_5_0 = 8, + V4L2_MPEG_VIDEO_VP9_LEVEL_5_1 = 9, + V4L2_MPEG_VIDEO_VP9_LEVEL_5_2 = 10, + V4L2_MPEG_VIDEO_VP9_LEVEL_6_0 = 11, + V4L2_MPEG_VIDEO_VP9_LEVEL_6_1 = 12, + V4L2_MPEG_VIDEO_VP9_LEVEL_6_2 = 13, +}; /* CIDs for HEVC encoding. */ diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h index 2b038865f7f8..ba4900fcf153 100644 --- a/contrib/freebsd/include/linux/videodev2.h +++ b/contrib/freebsd/include/linux/videodev2.h @@ -805,6 +805,7 @@ struct v4l2_pix_format { /* Flags */ #define V4L2_PIX_FMT_FLAG_PREMUL_ALPHA 0x0001 +#define V4L2_PIX_FMT_FLAG_SET_CSC 0x0002 /* * F O R M A T E N U M E R A T I O N @@ -824,6 +825,11 @@ struct v4l2_fmtdesc { #define V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM0x0004 #define V4L2_FMT_FLAG_DYN_RESOLUTION 0x0008 #define V4L2_FMT_FLAG_ENC_CAP_FRAME_INTERVAL 0x0010 +#define V4L2_FMT_FLAG_CSC_COLORSPACE 0x0020 +#define V4L2_FMT_FLAG_CSC_XFER_FUNC0x0040 +#define V4L2_FMT_FLAG_CSC_YCBCR_ENC0x0080 +#define V4L2_FMT_FLAG_CSC_HSV_ENC V4L2_FMT_FLAG_CSC_YCBCR_ENC +#define V4L2_FMT_FLAG_CSC_QUANTIZATION 0x0100 /* Frame Size and frame rate enumeration */ /* diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h index 146263de249d..bc9829d6a47d 100644 --- a/include/linux/v4l2-controls.h +++ b/include/linux/v4l2-controls.h @@ -649,6 +649,23 @@ enum v4l2_mpeg_video_vp9_profile { V4L2_MPEG_VIDEO_VP9_PROFILE_2 = 2, V4L2_MPEG_VIDEO_VP9_PROFILE_3 = 3, }; +#define V4L2_CID_MPEG_VIDEO_VP9_LEVEL (V4L2_CID_MPEG_BASE+513) +enum v4l2_mpeg_video_vp9_level { + V4L2_MPEG_VIDEO_VP9_LEVEL_1_0 = 0, + V4L2_MPEG_VIDEO_VP9_LEVEL_1_1 = 1, + V4L2_MPEG_VIDEO_VP9_LEVEL_2_0 = 2, + V4L2_MPEG_VIDEO_VP9_LEVEL_2_1 = 3, + V4L2_MPEG_VIDEO_VP9_LEVEL_3_0 = 4, + V4L2_MPEG_VIDEO_VP9_LEVEL_3_1 = 5, + V4L2_MPEG_VIDEO_VP9_LEVEL_4_0 = 6, + V4L2_MPEG_VIDEO_VP9_LEVEL_4_1 = 7, + V4L2_MPEG_VIDEO_VP9_LEVEL_5_0 = 8, + V4L2_MPEG_VIDEO_VP9_LEVEL_5_1 = 9, + V4L2_MPEG_VIDEO_VP9_LEVEL_5_2 = 10, + V4L2_MPEG_VIDEO_VP9_LEVEL_6_0 = 11, + V4L2_MPEG_VIDEO_VP9_LEVEL_6_1 = 12, + V4L2_MPEG_VIDEO_VP9_LEVEL_6_2 = 13, +}; /* CIDs for HEVC encoding. */ diff --git a/include/linux/v4l2-mediabus.h b/include/linux/v4l2-mediabus.h index 0fb5bfbec871..846dadfbfc64 100644 --- a/include/linux/v4l2-mediabus.h +++ b/include/linux/v4l2-mediabus.h @@ -16,6 +16,8 @@ #include #include +#define V4L2_MBUS_FRAMEFMT_SET_CSC 0x0001 + /** * struct v4l2_mbus_framefmt - frame format on the media bus * @width: image width @@ -24,8 +26,11 @@ * @field: used interlacing type (from enum v4l2_field) * @colorspace:colorspace of the data (from enum v4l2_colorspace) * @ycbcr_enc: YCbCr encoding of the data (from enum v4l2_ycbcr_encoding) + * @hsv_enc: HSV encoding of the data (from enum v4l2_hsv_encoding) * @quantization: quantization of the data (from enum v4l2_quanti
[git:v4l-utils/master] v4l-utils: sync with media_tree master
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 Author: Hans Verkuil Date:Wed Sep 9 16:50:24 2020 +0200 Signed-off-by: Hans Verkuil contrib/freebsd/include/linux/v4l2-controls.h | 8 ++ include/linux/bpf.h | 10 include/linux/v4l2-controls.h | 8 ++ utils/common/v4l2-tpg-core.c | 37 ++- utils/common/v4l2-tpg.patch | 3 ++- 5 files changed, 42 insertions(+), 24 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=4b97a54ce65f5fa9d534c9a49de1e429aeebeae9 diff --git a/contrib/freebsd/include/linux/v4l2-controls.h b/contrib/freebsd/include/linux/v4l2-controls.h index eeb6d644c4f1..146263de249d 100644 --- a/contrib/freebsd/include/linux/v4l2-controls.h +++ b/contrib/freebsd/include/linux/v4l2-controls.h @@ -375,6 +375,7 @@ enum v4l2_mpeg_video_aspect { enum v4l2_mpeg_video_bitrate_mode { V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0, V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1, + V4L2_MPEG_VIDEO_BITRATE_MODE_CQ = 2, }; #define V4L2_CID_MPEG_VIDEO_BITRATE(V4L2_CID_MPEG_BASE+207) #define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK (V4L2_CID_MPEG_BASE+208) @@ -740,6 +741,13 @@ enum v4l2_cid_mpeg_video_hevc_size_of_length_field { #define V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L6_BR (V4L2_CID_MPEG_BASE + 642) #define V4L2_CID_MPEG_VIDEO_REF_NUMBER_FOR_PFRAMES (V4L2_CID_MPEG_BASE + 643) #define V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR (V4L2_CID_MPEG_BASE + 644) +#define V4L2_CID_MPEG_VIDEO_CONSTANT_QUALITY (V4L2_CID_MPEG_BASE + 645) +#define V4L2_CID_MPEG_VIDEO_FRAME_SKIP_MODE(V4L2_CID_MPEG_BASE + 646) +enum v4l2_mpeg_video_frame_skip_mode { + V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED= 0, + V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_LEVEL_LIMIT = 1, + V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT = 2, +}; /* MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */ #define V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index faf7df1dc0ba..b21cc6af0e4a 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -767,7 +767,7 @@ union bpf_attr { * * Also, note that **bpf_trace_printk**\ () is slow, and should * only be used for debugging purposes. For this reason, a notice - * bloc (spanning several lines) is printed to kernel logs and + * block (spanning several lines) is printed to kernel logs and * states that the helper should not be used "for production use" * the first time this helper is used (or more precisely, when * **trace_printk**\ () buffers are allocated). For passing values @@ -1033,14 +1033,14 @@ union bpf_attr { * * int ret; * struct bpf_tunnel_key key = {}; - * + * * ret = bpf_skb_get_tunnel_key(skb, &key, sizeof(key), 0); * if (ret < 0) * return TC_ACT_SHOT; // drop packet - * + * * if (key.remote_ipv4 != 0x0a01) * return TC_ACT_SHOT; // drop packet - * + * * return TC_ACT_OK; // accept packet * * This interface can also be used with all encapsulation devices @@ -1147,7 +1147,7 @@ union bpf_attr { * Description * Retrieve the realm or the route, that is to say the * **tclassid** field of the destination for the *skb*. The - * indentifier retrieved is a user-provided tag, similar to the + * identifier retrieved is a user-provided tag, similar to the * one used with the net_cls cgroup (see description for * **bpf_get_cgroup_classid**\ () helper), but here this tag is * held by a route (a destination entry), not by a task. diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h index eeb6d644c4f1..146263de249d 100644 --- a/include/linux/v4l2-controls.h +++ b/include/linux/v4l2-controls.h @@ -375,6 +375,7 @@ enum v4l2_mpeg_video_aspect { enum v4l2_mpeg_video_bitrate_mode { V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0, V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1, + V4L2_MPEG_VIDEO_BITRATE_MODE_CQ = 2, }; #define V4L2_CID_MPEG_VIDEO_BITRATE(V4L2_CID_MPEG_BASE+207) #define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK (V4L2_CID_MPEG_BASE+208) @@ -740,6 +741,13 @@ enum v4l2_cid_mpeg_video_hevc_size_of_length_field { #define V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L6_BR (V4L2_CID_MPEG_BA
[git:v4l-utils/master] v4l-utils: sync with media_tree master
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 Author: Sean Young Date:Wed Aug 14 10:35:23 2019 +0100 Signed-off-by: Sean Young utils/keytable/parse.h| 9 - utils/keytable/rc_keymaps/imon_rsc.toml | 4 ++-- utils/keytable/rc_keymaps_userspace/imon_rsc.toml | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=59d6c0b4a5605b4dbb4020f3b9cba7de87d9fdce diff --git a/utils/keytable/parse.h b/utils/keytable/parse.h index a78d86dcfddc..e08dfbc657fe 100644 --- a/utils/keytable/parse.h +++ b/utils/keytable/parse.h @@ -151,6 +151,7 @@ struct parse_event key_events[] = { {"KEY_SCALE", 120}, {"KEY_KPCOMMA", 121}, {"KEY_HANGEUL", 122}, + {"KEY_HANGUEL", 122}, {"KEY_HANJA", 123}, {"KEY_YEN", 124}, {"KEY_LEFTMETA", 125}, @@ -181,7 +182,9 @@ struct parse_event key_events[] = { {"KEY_WWW", 150}, {"KEY_MSDOS", 151}, {"KEY_COFFEE", 152}, + {"KEY_SCREENLOCK", 152}, {"KEY_ROTATE_DISPLAY", 153}, + {"KEY_DIRECTION", 153}, {"KEY_CYCLEWINDOWS", 154}, {"KEY_MAIL", 155}, {"KEY_BOOKMARKS", 156}, @@ -268,8 +271,10 @@ struct parse_event key_events[] = { {"KEY_VIDEO_PREV", 242}, {"KEY_BRIGHTNESS_CYCLE", 243}, {"KEY_BRIGHTNESS_AUTO", 244}, + {"KEY_BRIGHTNESS_ZERO", 244}, {"KEY_DISPLAY_OFF", 245}, {"KEY_WWAN", 246}, + {"KEY_WIMAX", 246}, {"KEY_RFKILL", 247}, {"KEY_MICMUTE", 248}, {"BTN_MISC", 0x100}, @@ -363,9 +368,11 @@ struct parse_event key_events[] = { {"KEY_SUBTITLE", 0x172}, {"KEY_ANGLE", 0x173}, {"KEY_FULL_SCREEN", 0x174}, + {"KEY_ZOOM", 0x174}, {"KEY_MODE", 0x175}, {"KEY_KEYBOARD", 0x176}, {"KEY_ASPECT_RATIO", 0x177}, + {"KEY_SCREEN", 0x177}, {"KEY_PC", 0x178}, {"KEY_TV", 0x179}, {"KEY_TV2", 0x17a}, @@ -422,6 +429,7 @@ struct parse_event key_events[] = { {"KEY_ADDRESSBOOK", 0x1ad}, {"KEY_MESSENGER", 0x1ae}, {"KEY_DISPLAYTOGGLE", 0x1af}, + {"KEY_BRIGHTNESS_TOGGLE", 0x1af}, {"KEY_SPELLCHECK", 0x1b0}, {"KEY_LOGOFF", 0x1b1}, {"KEY_DOLLAR", 0x1b2}, @@ -582,7 +590,6 @@ struct parse_event key_events[] = { {"BTN_TRIGGER_HAPPY38", 0x2e5}, {"BTN_TRIGGER_HAPPY39", 0x2e6}, {"BTN_TRIGGER_HAPPY40", 0x2e7}, - {"KEY_MAX", 0x2ff}, { NULL, 0} }; struct parse_event rel_events[] = { diff --git a/utils/keytable/rc_keymaps/imon_rsc.toml b/utils/keytable/rc_keymaps/imon_rsc.toml index 4f20a54e50a7..173028c7a494 100644 --- a/utils/keytable/rc_keymaps/imon_rsc.toml +++ b/utils/keytable/rc_keymaps/imon_rsc.toml @@ -18,7 +18,7 @@ variant = "necx" 0x80105c = "KEY_NUMERIC_9" 0x801081 = "KEY_SCREEN" 0x80105d = "KEY_NUMERIC_0" -0x801082 = "KEY_MAX" +0x801082 = "KEY_ZOOM" 0x801048 = "KEY_ESC" 0x80104b = "KEY_MEDIA" 0x801083 = "KEY_MENU" @@ -45,6 +45,6 @@ variant = "necx" 0x80104e = "KEY_STOP" 0x801052 = "KEY_REWIND" 0x801053 = "KEY_FASTFORWARD" -0x801089 = "KEY_ZOOM" +0x801089 = "KEY_FULL_SCREEN" [[protocols]] protocol = "imon_rsc" diff --git a/utils/keytable/rc_keymaps_userspace/imon_rsc.toml b/utils/keytable/rc_keymaps_userspace/imon_rsc.toml index 4f20a54e50a7..173028c7a494 100644 --- a/utils/keytable/rc_keymaps_userspace/imon_rsc.toml +++ b/utils/keytable/rc_keymaps_userspace/imon_rsc.toml @@ -18,7 +18,7 @@ variant = "necx" 0x80105c = "KEY_NUMERIC_9" 0x801081 = "KEY_SCREEN" 0x80105d = "KEY_NUMERIC_0" -0x801082 = "KEY_MAX" +0x801082 = "KEY_ZOOM" 0x801048 = "KEY_ESC" 0x80104b = "KEY_MEDIA" 0x801083 = "KEY_MENU" @@ -45,6 +45,6 @@ variant = "necx" 0x80104e = "KEY_STOP" 0x801052 = "KEY_REWIND" 0x801053 = "KEY_FASTFORWARD" -0x801089 = "KEY_ZOOM" +0x801089 = "KEY_FULL_SCREEN" [[protocols]] protocol = "imon_rsc" ___ 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 media_tree master
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 Author: Hans Verkuil Date:Fri Aug 9 10:01:04 2019 +0200 Update to the latest code. Signed-off-by: Hans Verkuil utils/common/codec-v4l2-fwht.c | 30 -- utils/keytable/parse.h | 9 + 2 files changed, 29 insertions(+), 10 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=2168ec6c18549944eafc99e99c844ecaa03da175 diff --git a/utils/common/codec-v4l2-fwht.c b/utils/common/codec-v4l2-fwht.c index 01e7f09efc4e..3c93d9232c3c 100644 --- a/utils/common/codec-v4l2-fwht.c +++ b/utils/common/codec-v4l2-fwht.c @@ -29,11 +29,15 @@ static const struct v4l2_fwht_pixfmt_info v4l2_fwht_pixfmts[] = { { V4L2_PIX_FMT_HSV24, 3, 3, 1, 3, 3, 1, 1, 3, 1, FWHT_FL_PIXENC_HSV}, { V4L2_PIX_FMT_BGR32, 4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB}, { V4L2_PIX_FMT_XBGR32, 4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB}, + { V4L2_PIX_FMT_ABGR32, 4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB}, { V4L2_PIX_FMT_RGB32, 4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB}, { V4L2_PIX_FMT_XRGB32, 4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB}, - { V4L2_PIX_FMT_HSV32, 4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_HSV}, { V4L2_PIX_FMT_ARGB32, 4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB}, - { V4L2_PIX_FMT_ABGR32, 4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB}, + { V4L2_PIX_FMT_BGRX32, 4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB}, + { V4L2_PIX_FMT_BGRA32, 4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB}, + { V4L2_PIX_FMT_RGBX32, 4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_RGB}, + { V4L2_PIX_FMT_RGBA32, 4, 4, 1, 4, 4, 1, 1, 4, 1, FWHT_FL_PIXENC_RGB}, + { V4L2_PIX_FMT_HSV32, 4, 4, 1, 4, 4, 1, 1, 3, 1, FWHT_FL_PIXENC_HSV}, { V4L2_PIX_FMT_GREY,1, 1, 1, 1, 0, 1, 1, 1, 1, FWHT_FL_PIXENC_RGB}, }; @@ -193,6 +197,28 @@ static int prepare_raw_frame(struct fwht_raw_frame *rf, rf->luma++; rf->alpha = rf->cr + 1; break; + case V4L2_PIX_FMT_BGRX32: + rf->cb = rf->luma + 1; + rf->cr = rf->cb + 2; + rf->luma += 2; + break; + case V4L2_PIX_FMT_BGRA32: + rf->alpha = rf->luma; + rf->cb = rf->luma + 1; + rf->cr = rf->cb + 2; + rf->luma += 2; + break; + case V4L2_PIX_FMT_RGBX32: + rf->cr = rf->luma; + rf->cb = rf->cr + 2; + rf->luma++; + break; + case V4L2_PIX_FMT_RGBA32: + rf->alpha = rf->luma + 3; + rf->cr = rf->luma; + rf->cb = rf->cr + 2; + rf->luma++; + break; default: return -EINVAL; } diff --git a/utils/keytable/parse.h b/utils/keytable/parse.h index e08dfbc657fe..a78d86dcfddc 100644 --- a/utils/keytable/parse.h +++ b/utils/keytable/parse.h @@ -151,7 +151,6 @@ struct parse_event key_events[] = { {"KEY_SCALE", 120}, {"KEY_KPCOMMA", 121}, {"KEY_HANGEUL", 122}, - {"KEY_HANGUEL", 122}, {"KEY_HANJA", 123}, {"KEY_YEN", 124}, {"KEY_LEFTMETA", 125}, @@ -182,9 +181,7 @@ struct parse_event key_events[] = { {"KEY_WWW", 150}, {"KEY_MSDOS", 151}, {"KEY_COFFEE", 152}, - {"KEY_SCREENLOCK", 152}, {"KEY_ROTATE_DISPLAY", 153}, - {"KEY_DIRECTION", 153}, {"KEY_CYCLEWINDOWS", 154}, {"KEY_MAIL", 155}, {"KEY_BOOKMARKS", 156}, @@ -271,10 +268,8 @@ struct parse_event key_events[] = { {"KEY_VIDEO_PREV", 242}, {"KEY_BRIGHTNESS_CYCLE", 243}, {"KEY_BRIGHTNESS_AUTO", 244}, - {"KEY_BRIGHTNESS_ZERO", 244}, {"KEY_DISPLAY_OFF", 245}, {"KEY_WWAN", 246}, - {"KEY_WIMAX", 246}, {"KEY_RFKILL", 247}, {"KEY_MICMUTE", 248}, {"BTN_MISC", 0x100}, @@ -368,11 +363,9 @@ struct parse_event key_events[] = { {"KEY_SUBTITLE", 0x172}, {"KEY_ANGLE", 0x173}, {"KEY_FULL_SCREEN", 0x174}, - {"KEY_ZOOM", 0x174}, {"KEY_MODE", 0x175}, {"KEY_KEYBOARD", 0x176}, {"KEY_ASPECT_RATIO", 0x177}, - {"KEY_SCREEN", 0x177}, {"KEY_PC", 0x178}, {"KEY_TV", 0x179}, {"KEY_TV2", 0x17a}, @@ -429,7 +422,6 @@ struct parse_event key_events[] = { {"KEY_ADDRESSBOOK", 0x1ad}, {"KEY_MESSENGER", 0x1ae}, {"KEY_DISPLAYTOGGLE", 0x1af}, - {"KEY_BRIGHTNESS_TOGGLE", 0x1af}, {"KEY_SPELLCHECK", 0x1b0}, {"KEY_LOGOFF", 0x1b1}, {"KEY_DOLLAR", 0x1b2}, @@ -590,6 +582,7 @@ struct parse_event key_events[] = { {"BTN_TRIGGER_HAPPY38", 0x2e5}, {"BTN_TRIGGER_HAPPY39", 0x2e6},
[git:v4l-utils/master] v4l-utils: sync with media_tree master repo
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 Date:Thu Aug 2 18:48:59 2018 +0200 Main change: removal of VIDIOC_RESERVED. Signed-off-by: Hans Verkuil 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_Y10BPACKv4l2_fourcc('Y', '1', '0', 'B') /* 10 Greyscale bit-packed */ +#define V4L2_PIX_FMT_Y10Pv4l2_fourcc('Y', '1', '0', 'P') /* 10 Greyscale, MIPI RAW10 packed */ /* Palette formats */ #define V4L2_PIX_FMT_PAL8v4l2_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,
[git:v4l-utils/master] v4l-utils: sync with media_tree master branch
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 branch Author: Hans Verkuil Date:Wed Jul 25 14:44:35 2018 +0200 Update to the latest media public API. Signed-off-by: Hans Verkuil contrib/freebsd/include/linux/v4l2-controls.h | 20 +++-- contrib/freebsd/include/linux/videodev2.h | 1 + contrib/test/ioctl-test.h | 4 +++ contrib/test/ioctl_32.h | 4 +++ contrib/test/ioctl_64.h | 4 +++ contrib/xc3028-firmware/tuner-xc2028-types.h | 2 +- include/linux/cec.h | 2 ++ include/linux/media.h | 41 +-- include/linux/v4l2-controls.h | 20 +++-- include/linux/v4l2-subdev.h | 4 +++ include/linux/videodev2.h | 1 + utils/common/v4l2-tpg-core.c | 15 ++ utils/common/v4l2-tpg.h | 2 ++ 13 files changed, 102 insertions(+), 18 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=6452647903618a848b3eabbca4288abb766ad1dd diff --git a/contrib/freebsd/include/linux/v4l2-controls.h b/contrib/freebsd/include/linux/v4l2-controls.h index 8d473c979b61..e4ee10ee917d 100644 --- a/contrib/freebsd/include/linux/v4l2-controls.h +++ b/contrib/freebsd/include/linux/v4l2-controls.h @@ -188,7 +188,7 @@ enum v4l2_colorfx { /* The base for the imx driver controls. * We reserve 16 controls for this driver. */ -#define V4L2_CID_USER_IMX_BASE (V4L2_CID_USER_BASE + 0x1090) +#define V4L2_CID_USER_IMX_BASE (V4L2_CID_USER_BASE + 0x10b0) /* MPEG-class control IDs */ /* The MPEG controls are applicable to all codec controls @@ -587,7 +587,23 @@ enum v4l2_vp8_golden_frame_sel { #define V4L2_CID_MPEG_VIDEO_VPX_MAX_QP (V4L2_CID_MPEG_BASE+508) #define V4L2_CID_MPEG_VIDEO_VPX_I_FRAME_QP (V4L2_CID_MPEG_BASE+509) #define V4L2_CID_MPEG_VIDEO_VPX_P_FRAME_QP (V4L2_CID_MPEG_BASE+510) -#define V4L2_CID_MPEG_VIDEO_VPX_PROFILE (V4L2_CID_MPEG_BASE+511) + +#define V4L2_CID_MPEG_VIDEO_VP8_PROFILE (V4L2_CID_MPEG_BASE+511) +enum v4l2_mpeg_video_vp8_profile { + V4L2_MPEG_VIDEO_VP8_PROFILE_0 = 0, + V4L2_MPEG_VIDEO_VP8_PROFILE_1 = 1, + V4L2_MPEG_VIDEO_VP8_PROFILE_2 = 2, + V4L2_MPEG_VIDEO_VP8_PROFILE_3 = 3, +}; +/* Deprecated alias for compatibility reasons. */ +#define V4L2_CID_MPEG_VIDEO_VPX_PROFILEV4L2_CID_MPEG_VIDEO_VP8_PROFILE +#define V4L2_CID_MPEG_VIDEO_VP9_PROFILE (V4L2_CID_MPEG_BASE+512) +enum v4l2_mpeg_video_vp9_profile { + V4L2_MPEG_VIDEO_VP9_PROFILE_0 = 0, + V4L2_MPEG_VIDEO_VP9_PROFILE_1 = 1, + V4L2_MPEG_VIDEO_VP9_PROFILE_2 = 2, + V4L2_MPEG_VIDEO_VP9_PROFILE_3 = 3, +}; /* CIDs for HEVC encoding. */ diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h index 4993560ecba6..84e60c6d3485 100644 --- a/contrib/freebsd/include/linux/videodev2.h +++ b/contrib/freebsd/include/linux/videodev2.h @@ -666,6 +666,7 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_VP8 v4l2_fourcc('V', 'P', '8', '0') /* VP8 */ #define V4L2_PIX_FMT_VP9 v4l2_fourcc('V', 'P', '9', '0') /* VP9 */ #define V4L2_PIX_FMT_HEVC v4l2_fourcc('H', 'E', 'V', 'C') /* HEVC aka H.265 */ +#define V4L2_PIX_FMT_FWHT v4l2_fourcc('F', 'W', 'H', 'T') /* Fast Walsh Hadamard Transform (vicodec) */ /* Vendor-specific formats */ #define V4L2_PIX_FMT_CPIA1v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */ diff --git a/contrib/test/ioctl-test.h b/contrib/test/ioctl-test.h index 82df4d7aad6b..d6d10251ca2a 100644 --- a/contrib/test/ioctl-test.h +++ b/contrib/test/ioctl-test.h @@ -180,6 +180,7 @@ static const struct { ioc(video, VIDIOC_STREAMOFF), /* int */ ioc(video, VIDIOC_STREAMON), /* int */ ioc(subdev, VIDIOC_SUBDEV_DV_TIMINGS_CAP), /* struct v4l2_dv_timings_cap */ + ioc(subdev, VIDIOC_SUBDEV_ENUMSTD), /* struct v4l2_standard */ ioc(subdev, VIDIOC_SUBDEV_ENUM_DV_TIMINGS), /* struct v4l2_enum_dv_timings */ ioc(subdev, VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL), /* struct v4l2_subdev_frame_interval_enum */ ioc(subdev, VIDIOC_SUBDEV_ENUM_FRAME_SIZE),