From 8f69da955873f5e33b60ff117856a2bf1309a336 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Tue, 19 Mar 2013 09:53:29 -0300 Subject: [media] hdpvr: add g/querystd, remove deprecated current_norm Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/media/usb/hdpvr/hdpvr-video.c | 62 ++++++++++++++++++++++++++++------- drivers/media/usb/hdpvr/hdpvr.h | 5 ++- 2 files changed, 54 insertions(+), 13 deletions(-) diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c index e14bf494f10..042f204972a 100644 --- a/drivers/media/usb/hdpvr/hdpvr-video.c +++ b/drivers/media/usb/hdpvr/hdpvr-video.c @@ -550,12 +550,50 @@ static int vidioc_s_std(struct file *file, void *private_data, struct hdpvr_device *dev = video_drvdata(file); u8 std_type = 1; - if (std & (V4L2_STD_NTSC | V4L2_STD_PAL_60)) + if (dev->options.video_input == HDPVR_COMPONENT) + return -ENODATA; + if (dev->status != STATUS_IDLE) + return -EBUSY; + if (std & V4L2_STD_525_60) std_type = 0; + dev->cur_std = std; + dev->width = 720; + dev->height = std_type ? 576 : 480; return hdpvr_config_call(dev, CTRL_VIDEO_STD_TYPE, std_type); } +static int vidioc_g_std(struct file *file, void *private_data, + v4l2_std_id *std) +{ + struct hdpvr_device *dev = video_drvdata(file); + + if (dev->options.video_input == HDPVR_COMPONENT) + return -ENODATA; + *std = dev->cur_std; + return 0; +} + +static int vidioc_querystd(struct file *file, void *fh, v4l2_std_id *a) +{ + struct hdpvr_device *dev = video_drvdata(file); + struct hdpvr_video_info *vid_info; + + if (dev->options.video_input == HDPVR_COMPONENT) + return -ENODATA; + *a = V4L2_STD_ALL; + vid_info = get_video_info(dev); + if (vid_info == NULL) + return 0; + if (vid_info->width == 720 && + (vid_info->height == 480 || vid_info->height == 576)) { + *a = (vid_info->height == 480) ? + V4L2_STD_525_60 : V4L2_STD_625_50; + } + kfree(vid_info); + return 0; +} + static const char *iname[] = { [HDPVR_COMPONENT] = "Component", [HDPVR_SVIDEO] = "S-Video", @@ -565,7 +603,6 @@ static const char *iname[] = { static int vidioc_enum_input(struct file *file, void *priv, struct v4l2_input *i) { - struct hdpvr_device *dev = video_drvdata(file); unsigned int n; n = i->index; @@ -579,7 +616,8 @@ static int vidioc_enum_input(struct file *file, void *priv, i->audioset = 1<std = dev->video_dev->tvnorms; + i->capabilities = n ? V4L2_IN_CAP_STD : V4L2_IN_CAP_DV_TIMINGS; + i->std = n ? V4L2_STD_ALL : 0; return 0; } @@ -597,8 +635,11 @@ static int vidioc_s_input(struct file *file, void *private_data, return -EBUSY; retval = hdpvr_config_call(dev, CTRL_VIDEO_INPUT_VALUE, index+1); - if (!retval) + if (!retval) { dev->options.video_input = index; + dev->video_dev->tvnorms = + index != HDPVR_COMPONENT ? V4L2_STD_ALL : 0; + } return retval; } @@ -776,7 +817,6 @@ static int hdpvr_s_ctrl(struct v4l2_ctrl *ctrl) static int vidioc_enum_fmt_vid_cap(struct file *file, void *private_data, struct v4l2_fmtdesc *f) { - if (f->index != 0) return -EINVAL; @@ -874,6 +914,8 @@ static int vidioc_try_encoder_cmd(struct file *filp, void *priv, static const struct v4l2_ioctl_ops hdpvr_ioctl_ops = { .vidioc_querycap = vidioc_querycap, .vidioc_s_std = vidioc_s_std, + .vidioc_g_std = vidioc_g_std, + .vidioc_querystd = vidioc_querystd, .vidioc_enum_input = vidioc_enum_input, .vidioc_g_input = vidioc_g_input, .vidioc_s_input = vidioc_s_input, @@ -916,13 +958,6 @@ static const struct video_device hdpvr_video_template = { .fops = &hdpvr_fops, .release = hdpvr_device_release, .ioctl_ops = &hdpvr_ioctl_ops, - .tvnorms = - V4L2_STD_NTSC | V4L2_STD_SECAM | V4L2_STD_PAL_B | - V4L2_STD_PAL_G | V4L2_STD_PAL_H | V4L2_STD_PAL_I | - V4L2_STD_PAL_D | V4L2_STD_PAL_M | V4L2_STD_PAL_N | - V4L2_STD_PAL_60, - .current_norm = V4L2_STD_NTSC | V4L2_STD_PAL_M | - V4L2_STD_PAL_60, }; static const struct v4l2_ctrl_ops hdpvr_ctrl_ops = { @@ -937,6 +972,9 @@ int hdpvr_register_videodev(struct hdpvr_device *dev, struct device *parent, bool ac3 = dev->flags & HDPVR_FLAG_AC3_CAP; int res; + dev->cur_std = V4L2_STD_525_60; + dev->width = 720; + dev->height = 480; v4l2_ctrl_handler_init(hdl, 11); if (dev->fw_ver > 0x15) { v4l2_ctrl_new_std(hdl, &hdpvr_ctrl_ops, diff --git a/drivers/media/usb/hdpvr/hdpvr.h b/drivers/media/usb/hdpvr/hdpvr.h index 1c1298138f0..050c6b9fec5 100644 --- a/drivers/media/usb/hdpvr/hdpvr.h +++ b/drivers/media/usb/hdpvr/hdpvr.h @@ -78,6 +78,8 @@ struct hdpvr_device { struct v4l2_ctrl *video_bitrate; struct v4l2_ctrl *video_bitrate_peak; }; + /* v4l2 format */ + uint width, height; /* the max packet size of the bulk endpoint */ size_t bulk_in_size; @@ -87,8 +89,9 @@ struct hdpvr_device { /* holds the current device status */ __u8 status; - /* holds the cureent set options */ + /* holds the current set options */ struct hdpvr_options options; + v4l2_std_id cur_std; uint flags; -- cgit v1.2.3