[git:v4l-utils/master] v4l-utils: sync with media_tree master

2019-08-14 Thread Sean Young
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

2019-08-09 Thread Hans Verkuil
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

2018-08-02 Thread Hans Verkuil
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 

[git:v4l-utils/master] v4l-utils: sync with media_tree master branch

2018-07-25 Thread Hans Verkuil
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),