From: Adam Baker <linux@baker-net.org.uk>
To: linux-media@vger.kernel.org, Hans de Goede <j.w.r.degoede@hhs.nl>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>,
"Jean-Francois Moine" <moinejf@free.fr>,
kilgota@banach.math.auburn.edu, Hans Verkuil <hverkuil@xs4all.nl>
Subject: [PATCH v2 4/4] Add support to libv4l to use orientation from VIDIOC_ENUMINPUT
Date: Sun, 29 Mar 2009 23:28:09 +0100 [thread overview]
Message-ID: <200903292328.09957.linux@baker-net.org.uk> (raw)
In-Reply-To: <200903292325.16499.linux@baker-net.org.uk>
Add check to libv4l of the sensor orientation as reported by
VIDIOC_ENUMINPUT
Signed-off-by: Adam Baker <linux@baker-net.org.uk>
---
diff -r a647c2dfa989 v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert.c
--- a/v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert.c Tue Jan 20 11:25:54 2009 +0100
+++ b/v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert.c Sun Mar 29 22:59:56 2009 +0100
@@ -29,6 +29,11 @@
#define MIN(a,b) (((a)<(b))?(a):(b))
#define ARRAY_SIZE(x) ((int)sizeof(x)/(int)sizeof((x)[0]))
+/* Workaround this potentially being missing from videodev2.h */
+#ifndef V4L2_IN_ST_VFLIP
+#define V4L2_IN_ST_VFLIP 0x00000020 /* Output is flipped vertically */
+#endif
+
/* Note for proper functioning of v4lconvert_enum_fmt the first entries in
supported_src_pixfmts must match with the entries in supported_dst_pixfmts */
#define SUPPORTED_DST_PIXFMTS \
@@ -134,6 +139,7 @@
int i, j;
struct v4lconvert_data *data = calloc(1, sizeof(struct v4lconvert_data));
struct v4l2_capability cap;
+ struct v4l2_input input;
if (!data)
return NULL;
@@ -161,6 +167,13 @@
/* Check if this cam has any special flags */
data->flags = v4lconvert_get_flags(data->fd);
+ if ((syscall(SYS_ioctl, fd, VIDIOC_G_INPUT, &input.index) == 0) &&
+ (syscall(SYS_ioctl, fd, VIDIOC_ENUMINPUT, &input) == 0)) {
+ /* Don't yet support independent HFLIP and VFLIP so getting
+ * image the right way up is highest priority. */
+ if (input.status & V4L2_IN_ST_VFLIP)
+ data->flags |= V4LCONVERT_ROTATE_180;
+ }
if (syscall(SYS_ioctl, fd, VIDIOC_QUERYCAP, &cap) == 0) {
if (!strcmp((char *)cap.driver, "uvcvideo"))
data->flags |= V4LCONVERT_IS_UVC;
next prev parent reply other threads:[~2009-03-29 22:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-29 22:09 [PATCH v2 0/4] Sensor orientation reporting Adam Baker
2009-03-29 22:17 ` [PATCH v2 1/4] " Adam Baker
2009-03-29 22:22 ` [PATCH v2 2/4] Specify SHELL in documentation Makefile Adam Baker
2009-03-29 22:25 ` [PATCH v2 3/4] Document the orientation flags in ENUMINPUT Adam Baker
2009-03-29 22:28 ` Adam Baker [this message]
2009-03-30 8:30 ` [PATCH v2 4/4] Add support to libv4l to use orientation from VIDIOC_ENUMINPUT Hans de Goede
2009-04-05 12:12 ` Mauro Carvalho Chehab
2009-04-10 11:34 ` Hans de Goede
2009-03-29 22:55 ` [PATCH v2 1/4] Sensor orientation reporting Hans Verkuil
2009-03-29 23:58 ` Theodore Kilgore
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=200903292328.09957.linux@baker-net.org.uk \
--to=linux@baker-net.org.uk \
--cc=hverkuil@xs4all.nl \
--cc=j.w.r.degoede@hhs.nl \
--cc=kilgota@banach.math.auburn.edu \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=moinejf@free.fr \
/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