mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 01:49:36 +00:00
[media] v4l2-subdev: rename cropcap to g_pixelaspect
The old cropcap video op is now only used to pass the pixelaspect ratio, so rename it. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
parent
1f981a48dc
commit
ecf37493f4
3 changed files with 9 additions and 9 deletions
|
@ -761,16 +761,16 @@ static int adv7180_g_mbus_config(struct v4l2_subdev *sd,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int adv7180_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *cropcap)
|
||||
static int adv7180_g_pixelaspect(struct v4l2_subdev *sd, struct v4l2_fract *aspect)
|
||||
{
|
||||
struct adv7180_state *state = to_state(sd);
|
||||
|
||||
if (state->curr_norm & V4L2_STD_525_60) {
|
||||
cropcap->pixelaspect.numerator = 11;
|
||||
cropcap->pixelaspect.denominator = 10;
|
||||
aspect->numerator = 11;
|
||||
aspect->denominator = 10;
|
||||
} else {
|
||||
cropcap->pixelaspect.numerator = 54;
|
||||
cropcap->pixelaspect.denominator = 59;
|
||||
aspect->numerator = 54;
|
||||
aspect->denominator = 59;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -823,7 +823,7 @@ static const struct v4l2_subdev_video_ops adv7180_video_ops = {
|
|||
.g_input_status = adv7180_g_input_status,
|
||||
.s_routing = adv7180_s_routing,
|
||||
.g_mbus_config = adv7180_g_mbus_config,
|
||||
.cropcap = adv7180_cropcap,
|
||||
.g_pixelaspect = adv7180_g_pixelaspect,
|
||||
.g_tvnorms = adv7180_g_tvnorms,
|
||||
.s_stream = adv7180_s_stream,
|
||||
};
|
||||
|
|
|
@ -385,7 +385,7 @@ static int rvin_cropcap(struct file *file, void *priv,
|
|||
if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
|
||||
return -EINVAL;
|
||||
|
||||
return v4l2_subdev_call(sd, video, cropcap, crop);
|
||||
return v4l2_subdev_call(sd, video, g_pixelaspect, &crop->pixelaspect);
|
||||
}
|
||||
|
||||
static int rvin_enum_input(struct file *file, void *priv,
|
||||
|
|
|
@ -358,7 +358,7 @@ struct v4l2_mbus_frame_desc {
|
|||
* @s_stream: used to notify the driver that a video stream will start or has
|
||||
* stopped.
|
||||
*
|
||||
* @cropcap: callback for %VIDIOC_CROPCAP ioctl handler code.
|
||||
* @g_pixelaspect: callback to return the pixelaspect ratio.
|
||||
*
|
||||
* @g_parm: callback for %VIDIOC_G_PARM ioctl handler code.
|
||||
*
|
||||
|
@ -398,7 +398,7 @@ struct v4l2_subdev_video_ops {
|
|||
int (*g_tvnorms_output)(struct v4l2_subdev *sd, v4l2_std_id *std);
|
||||
int (*g_input_status)(struct v4l2_subdev *sd, u32 *status);
|
||||
int (*s_stream)(struct v4l2_subdev *sd, int enable);
|
||||
int (*cropcap)(struct v4l2_subdev *sd, struct v4l2_cropcap *cc);
|
||||
int (*g_pixelaspect)(struct v4l2_subdev *sd, struct v4l2_fract *aspect);
|
||||
int (*g_parm)(struct v4l2_subdev *sd, struct v4l2_streamparm *param);
|
||||
int (*s_parm)(struct v4l2_subdev *sd, struct v4l2_streamparm *param);
|
||||
int (*g_frame_interval)(struct v4l2_subdev *sd,
|
||||
|
|
Loading…
Reference in a new issue