diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2011-11-22 06:23:19 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-16 06:36:28 -0500 |
commit | 047a01fdc807ffa461db87e2d30d6d28f95c091a (patch) | |
tree | 5c34875861d97bf2bf41f06e718b9bbc0b1c1e0a /drivers/media/video/omap | |
parent | 20c9fe895a2356924a31a1238f75cf0d05704593 (diff) |
[media] omap_vout: add missing OVERLAY_OUTPUT cap and set V4L2_FBUF_FLAG_OVERLAY
The omap_vout driver has an output overlay, but never advertised that
capability.
The driver should also set the V4L2_FBUF_FLAG_OVERLAY flag.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
CC: Archit Taneja <archit@ti.com>
CC: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/omap')
-rw-r--r-- | drivers/media/video/omap/omap_vout.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c index 00d6d192b88c..1e7c0d6205e6 100644 --- a/drivers/media/video/omap/omap_vout.c +++ b/drivers/media/video/omap/omap_vout.c | |||
@@ -1046,7 +1046,8 @@ static int vidioc_querycap(struct file *file, void *fh, | |||
1046 | strlcpy(cap->driver, VOUT_NAME, sizeof(cap->driver)); | 1046 | strlcpy(cap->driver, VOUT_NAME, sizeof(cap->driver)); |
1047 | strlcpy(cap->card, vout->vfd->name, sizeof(cap->card)); | 1047 | strlcpy(cap->card, vout->vfd->name, sizeof(cap->card)); |
1048 | cap->bus_info[0] = '\0'; | 1048 | cap->bus_info[0] = '\0'; |
1049 | cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT; | 1049 | cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT | |
1050 | V4L2_CAP_VIDEO_OUTPUT_OVERLAY; | ||
1050 | 1051 | ||
1051 | return 0; | 1052 | return 0; |
1052 | } | 1053 | } |
@@ -1828,7 +1829,9 @@ static int vidioc_g_fbuf(struct file *file, void *fh, | |||
1828 | ovid = &vout->vid_info; | 1829 | ovid = &vout->vid_info; |
1829 | ovl = ovid->overlays[0]; | 1830 | ovl = ovid->overlays[0]; |
1830 | 1831 | ||
1831 | a->flags = 0x0; | 1832 | /* The video overlay must stay within the framebuffer and can't be |
1833 | positioned independently. */ | ||
1834 | a->flags = V4L2_FBUF_FLAG_OVERLAY; | ||
1832 | a->capability = V4L2_FBUF_CAP_LOCAL_ALPHA | V4L2_FBUF_CAP_CHROMAKEY | 1835 | a->capability = V4L2_FBUF_CAP_LOCAL_ALPHA | V4L2_FBUF_CAP_CHROMAKEY |
1833 | | V4L2_FBUF_CAP_SRC_CHROMAKEY; | 1836 | | V4L2_FBUF_CAP_SRC_CHROMAKEY; |
1834 | 1837 | ||