From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
To: Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
Mike Isely <isely@pobox.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Hans Verkuil <hans.verkuil@cisco.com>,
Steven Toth <stoth@kernellabs.com>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Vincent Palatin <vpalatin@chromium.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Subject: [PATCH 2/8] videodev2.h: Extend struct v4l2_ext_controls
Date: Fri, 21 Aug 2015 11:29:40 +0200 [thread overview]
Message-ID: <1440149386-19783-3-git-send-email-ricardo.ribalda@gmail.com> (raw)
In-Reply-To: <1440149386-19783-1-git-send-email-ricardo.ribalda@gmail.com>
So it can be used to get the default value of a control.
Without this change it is not possible to get get the
default value of array controls.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
include/uapi/linux/videodev2.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 72fa3e490e30..2e857b19a155 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -1461,7 +1461,10 @@ struct v4l2_ext_control {
} __attribute__ ((packed));
struct v4l2_ext_controls {
- __u32 ctrl_class;
+ union {
+ __u32 ctrl_class;
+ __u32 which;
+ };
__u32 count;
__u32 error_idx;
__u32 reserved[2];
@@ -1472,6 +1475,8 @@ struct v4l2_ext_controls {
#define V4L2_CTRL_ID2CLASS(id) ((id) & 0x0fff0000UL)
#define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000)
#define V4L2_CTRL_MAX_DIMS (4)
+#define V4L2_CTRL_WHICH_CUR_VAL 0
+#define V4L2_CTRL_WHICH_DEF_VAL 0x0f000000
enum v4l2_ctrl_type {
V4L2_CTRL_TYPE_INTEGER = 1,
--
2.5.0
next prev parent reply other threads:[~2015-08-21 9:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-21 9:29 [PATCH 0/8] Support getting default values from any control Ricardo Ribalda Delgado
2015-08-21 9:29 ` [PATCH 1/8] videodev2.h: Fix typo in comment Ricardo Ribalda Delgado
2015-08-21 9:29 ` Ricardo Ribalda Delgado [this message]
2015-08-21 9:29 ` [PATCH 3/8] media/v4l2-core: struct struct v4l2_ext_controls param which Ricardo Ribalda Delgado
2015-08-21 10:11 ` Hans Verkuil
2015-08-21 9:29 ` [PATCH 4/8] usb/uvc: Support for V4L2_CTRL_WHICH_DEF_VAL Ricardo Ribalda Delgado
2015-08-21 9:29 ` [PATCH 5/8] media/usb/pvrusb2: " Ricardo Ribalda Delgado
2015-08-21 9:29 ` [PATCH 6/8] media/pci/saa7164-encoder " Ricardo Ribalda Delgado
2015-08-21 9:29 ` [PATCH 7/8] media/pci/saa7164-vbi " Ricardo Ribalda Delgado
2015-08-21 9:29 ` [PATCH 8/8] Docbook: media: Document changes on struct v4l2_ext_controls Ricardo Ribalda Delgado
2015-08-21 11:31 ` Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1440149386-19783-3-git-send-email-ricardo.ribalda@gmail.com \
--to=ricardo.ribalda@gmail.com \
--cc=hans.verkuil@cisco.com \
--cc=isely@pobox.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@osg.samsung.com \
--cc=sakari.ailus@linux.intel.com \
--cc=stoth@kernellabs.com \
--cc=vpalatin@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome