Hi,
Sorry for the delayed response.
> ________________________________________
> From: Laurent Pinchart [laurent.pinchart@xxxxxxxxxxxxxxxx]
> Sent: Thursday, September 08, 2011 10:51 PM
> To: Ravi, Deepthy
> Cc: linux-media@xxxxxxxxxxxxxxx; tony@xxxxxxxxxxx; linux@xxxxxxxxxxxxxxxx; linux-omap@xxxxxxxxxxxxxxx; linux-arm-kernel@xxxxxxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; mchehab@xxxxxxxxxxxxx; g.liakhovetski@xxxxxx; Hiremath, Vaibhav
> Subject: Re: [PATCH 4/8] ispvideo: Add support for G/S/ENUM_STD ioctl
>
> Hi,
>
> Thanks for the patch.
>
> On Thursday 08 September 2011 15:35:22 Deepthy Ravi wrote:
>> From: Vaibhav Hiremath <hvaibhav@xxxxxx>
>>
>> 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.
>
> Why so ? Shouldn't it be queried on the subdev output pad directly ?
>
[Deepthy Ravi] Because standard v4l2 application for analog devices will call these std ioctls on the streaming device node. So it's done on /dev/video to make the existing apllication work.
>> Signed-off-by: Vaibhav Hiremath <hvaibhav@xxxxxx>
>> Signed-off-by: Deepthy Ravi <deepthy.ravi@xxxxxx>
>> ---
>> 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;
>> };
>
> --
> Regards,
>
> Laurent Pinchart
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
