diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 22:17:10 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 22:17:10 +0000 |
| commit | 623a87e654939d74358a2b8256042acbca1bce7c (patch) | |
| tree | e46bc5246f19b7457549cdad2e31cb897f1b7ddb /linux | |
| parent | 43dca0776fdb9e71778253c95a60177a2ab6a52e (diff) | |
| download | mediapointer-dvb-s2-623a87e654939d74358a2b8256042acbca1bce7c.tar.gz mediapointer-dvb-s2-623a87e654939d74358a2b8256042acbca1bce7c.tar.bz2 | |
Sensor orientation reporting
From: Adam Baker <linux@baker-net.org.uk>
Add support to the SQ-905 driver to pass back to user space the
sensor orientation information obtained from the camera during init.
Modifies gspca and the videodev2.h header to create the necessary
API.
Signed-off-by: Adam Baker <linux@baker-net.org.uk>
[mchehab@redhat.com: Changed "Output is" to "Frames are" at the comments, as suggested at LMML]
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/gspca/gspca.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/gspca/gspca.h | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/gspca/sq905.c | 6 | ||||
| -rw-r--r-- | linux/include/linux/videodev2.h | 5 |
4 files changed, 13 insertions, 0 deletions
diff --git a/linux/drivers/media/video/gspca/gspca.c b/linux/drivers/media/video/gspca/gspca.c index 93c35d083..cfd27161b 100644 --- a/linux/drivers/media/video/gspca/gspca.c +++ b/linux/drivers/media/video/gspca/gspca.c @@ -1144,6 +1144,7 @@ static int vidioc_enum_input(struct file *file, void *priv, if (input->index != 0) return -EINVAL; input->type = V4L2_INPUT_TYPE_CAMERA; + input->status = gspca_dev->cam.input_flags; strncpy(input->name, gspca_dev->sd_desc->name, sizeof input->name); return 0; diff --git a/linux/drivers/media/video/gspca/gspca.h b/linux/drivers/media/video/gspca/gspca.h index e4d4cf6ce..58e8ff021 100644 --- a/linux/drivers/media/video/gspca/gspca.h +++ b/linux/drivers/media/video/gspca/gspca.h @@ -56,6 +56,7 @@ struct cam { * - cannot be > MAX_NURBS * - when 0 and bulk_size != 0 means * 1 URB and submit done by subdriver */ + u32 input_flags; /* value for ENUM_INPUT status flags */ }; struct gspca_dev; diff --git a/linux/drivers/media/video/gspca/sq905.c b/linux/drivers/media/video/gspca/sq905.c index 04e3ae57a..2e1cdf068 100644 --- a/linux/drivers/media/video/gspca/sq905.c +++ b/linux/drivers/media/video/gspca/sq905.c @@ -360,6 +360,12 @@ static int sd_init(struct gspca_dev *gspca_dev) gspca_dev->cam.nmodes = ARRAY_SIZE(sq905_mode); if (!(ident & SQ905_HIRES_MASK)) gspca_dev->cam.nmodes--; + + if (ident & SQ905_ORIENTATION_MASK) + gspca_dev->cam.input_flags = V4L2_IN_ST_VFLIP; + else + gspca_dev->cam.input_flags = V4L2_IN_ST_VFLIP | + V4L2_IN_ST_HFLIP; return 0; } diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 87590454f..82f9e723e 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -737,6 +737,11 @@ struct v4l2_input { #define V4L2_IN_ST_NO_SIGNAL 0x00000002 #define V4L2_IN_ST_NO_COLOR 0x00000004 +/* field 'status' - sensor orientation */ +/* If sensor is mounted upside down set both bits */ +#define V4L2_IN_ST_HFLIP 0x00000010 /* Frames are flipped horizontally */ +#define V4L2_IN_ST_VFLIP 0x00000020 /* Frames are flipped vertically */ + /* field 'status' - analog */ #define V4L2_IN_ST_NO_H_LOCK 0x00000100 /* No horizontal sync lock */ #define V4L2_IN_ST_COLOR_KILL 0x00000200 /* Color killer is active */ |