From: deepthy.ravi@ti.com (Deepthy Ravi)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/8] ispvideo: Add support for G/S/ENUM_STD ioctl
Date: Thu, 8 Sep 2011 19:05:22 +0530 [thread overview]
Message-ID: <1315488922-16152-1-git-send-email-deepthy.ravi@ti.com> (raw)
From: Vaibhav Hiremath <hvaibhav@ti.com>
In order to support TVP5146 (for that matter any video decoder),
it is important to support G/S/ENUM_STD ioctl on /dev/videoX
device node.
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Deepthy Ravi <deepthy.ravi@ti.com>
---
drivers/media/video/omap3isp/ispvideo.c | 98 ++++++++++++++++++++++++++++++-
drivers/media/video/omap3isp/ispvideo.h | 1 +
2 files changed, 98 insertions(+), 1 deletions(-)
diff --git a/drivers/media/video/omap3isp/ispvideo.c b/drivers/media/video/omap3isp/ispvideo.c
index d5b8236..ff0ffed 100644
--- a/drivers/media/video/omap3isp/ispvideo.c
+++ b/drivers/media/video/omap3isp/ispvideo.c
@@ -37,6 +37,7 @@
#include <plat/iovmm.h>
#include <plat/omap-pm.h>
+#include <media/tvp514x.h>
#include "ispvideo.h"
#include "isp.h"
@@ -1136,7 +1137,97 @@ isp_video_g_input(struct file *file, void *fh, unsigned int *input)
static int
isp_video_s_input(struct file *file, void *fh, unsigned int input)
{
- return input == 0 ? 0 : -EINVAL;
+ struct isp_video *video = video_drvdata(file);
+ struct media_entity *entity = &video->video.entity;
+ struct media_entity_graph graph;
+ struct v4l2_subdev *subdev;
+ struct v4l2_routing route;
+ int ret = 0;
+
+ media_entity_graph_walk_start(&graph, entity);
+ while ((entity = media_entity_graph_walk_next(&graph))) {
+ if (media_entity_type(entity) ==
+ MEDIA_ENT_T_V4L2_SUBDEV) {
+ subdev = media_entity_to_v4l2_subdev(entity);
+ if (subdev != NULL) {
+ if (input == 0)
+ route.input = INPUT_CVBS_VI4A;
+ else
+ route.input = INPUT_SVIDEO_VI2C_VI1C;
+ route.output = 0;
+ ret = v4l2_subdev_call(subdev, video, s_routing,
+ route.input, route.output, 0);
+ if (ret < 0 && ret != -ENOIOCTLCMD)
+ return ret;
+ }
+ }
+ }
+
+ return 0;
+}
+
+static int isp_video_querystd(struct file *file, void *fh, v4l2_std_id *a)
+{
+ struct isp_video_fh *vfh = to_isp_video_fh(fh);
+ struct isp_video *video = video_drvdata(file);
+ struct media_entity *entity = &video->video.entity;
+ struct media_entity_graph graph;
+ struct v4l2_subdev *subdev;
+ int ret = 0;
+
+ media_entity_graph_walk_start(&graph, entity);
+ while ((entity = media_entity_graph_walk_next(&graph))) {
+ if (media_entity_type(entity) ==
+ MEDIA_ENT_T_V4L2_SUBDEV) {
+ subdev = media_entity_to_v4l2_subdev(entity);
+ if (subdev != NULL) {
+ ret = v4l2_subdev_call(subdev, video, querystd,
+ a);
+ if (ret < 0 && ret != -ENOIOCTLCMD)
+ return ret;
+ }
+ }
+ }
+
+ vfh->standard.id = *a;
+ return 0;
+}
+
+static int isp_video_g_std(struct file *file, void *fh, v4l2_std_id *norm)
+{
+ struct isp_video_fh *vfh = to_isp_video_fh(fh);
+ struct isp_video *video = video_drvdata(file);
+
+ mutex_lock(&video->mutex);
+ *norm = vfh->standard.id;
+ mutex_unlock(&video->mutex);
+
+ return 0;
+}
+
+static int isp_video_s_std(struct file *file, void *fh, v4l2_std_id *norm)
+{
+ struct isp_video *video = video_drvdata(file);
+ struct media_entity *entity = &video->video.entity;
+ struct media_entity_graph graph;
+ struct v4l2_subdev *subdev;
+ int ret = 0;
+
+ media_entity_graph_walk_start(&graph, entity);
+ while ((entity = media_entity_graph_walk_next(&graph))) {
+ if (media_entity_type(entity) ==
+ MEDIA_ENT_T_V4L2_SUBDEV) {
+ subdev = media_entity_to_v4l2_subdev(entity);
+ if (subdev != NULL) {
+ ret = v4l2_subdev_call(subdev, core, s_std,
+ *norm);
+ if (ret < 0 && ret != -ENOIOCTLCMD)
+ return ret;
+ }
+ }
+ }
+
+ return 0;
}
static const struct v4l2_ioctl_ops isp_video_ioctl_ops = {
@@ -1161,6 +1252,9 @@ static const struct v4l2_ioctl_ops isp_video_ioctl_ops = {
.vidioc_enum_input = isp_video_enum_input,
.vidioc_g_input = isp_video_g_input,
.vidioc_s_input = isp_video_s_input,
+ .vidioc_querystd = isp_video_querystd,
+ .vidioc_g_std = isp_video_g_std,
+ .vidioc_s_std = isp_video_s_std,
};
/* -----------------------------------------------------------------------------
@@ -1325,6 +1419,8 @@ int omap3isp_video_register(struct isp_video *video, struct v4l2_device *vdev)
printk(KERN_ERR "%s: could not register video device (%d)\n",
__func__, ret);
+ video->video.tvnorms = V4L2_STD_NTSC | V4L2_STD_PAL;
+ video->video.current_norm = V4L2_STD_NTSC;
return ret;
}
diff --git a/drivers/media/video/omap3isp/ispvideo.h b/drivers/media/video/omap3isp/ispvideo.h
index 53160aa..bb8feb6 100644
--- a/drivers/media/video/omap3isp/ispvideo.h
+++ b/drivers/media/video/omap3isp/ispvideo.h
@@ -182,6 +182,7 @@ struct isp_video_fh {
struct isp_video *video;
struct isp_video_queue queue;
struct v4l2_format format;
+ struct v4l2_standard standard;
struct v4l2_fract timeperframe;
};
--
1.7.0.4
next reply other threads:[~2011-09-08 13:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-08 13:35 Deepthy Ravi [this message]
2011-09-08 17:21 ` [PATCH 4/8] ispvideo: Add support for G/S/ENUM_STD ioctl Laurent Pinchart
2011-09-16 13:00 ` Ravi, Deepthy
2011-09-16 13:06 ` Laurent Pinchart
2011-09-19 15:31 ` Hiremath, Vaibhav
2011-09-27 18:06 ` Laurent Pinchart
2011-09-28 6:10 ` Hiremath, Vaibhav
2011-09-28 9:28 ` Sakari Ailus
2011-09-27 22:31 ` Mauro Carvalho Chehab
2011-09-27 22:49 ` Gary Thomas
2011-09-28 9:58 ` Mauro Carvalho Chehab
2011-09-08 21:38 ` Sakari Ailus
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=1315488922-16152-1-git-send-email-deepthy.ravi@ti.com \
--to=deepthy.ravi@ti.com \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).