Commit 5200ab6a authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: vidioc_cropcap -> vidioc_g_pixelaspect 



Now vidioc_cropcap is only used to return the pixelaspect, so
rename it accordingly.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Tested-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent ed3e2749

drivers/media/pci/bt8xx/bttv-driver.c

+5 −7
Original line number Diff line number Diff line
@@ -2792,19 +2792,17 @@ static int bttv_g_tuner(struct file *file, void *priv, 
	return 0;

}



static int bttv_cropcap(struct file *file, void *priv,

				struct v4l2_cropcap *cap)

static int bttv_g_pixelaspect(struct file *file, void *priv,

			      int type, struct v4l2_fract *f)

{

	struct bttv_fh *fh = priv;

	struct bttv *btv = fh->btv;



	if (cap->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&

	    cap->type != V4L2_BUF_TYPE_VIDEO_OVERLAY)

	if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;



	/* defrect and bounds are set via g_selection */

	cap->pixelaspect = bttv_tvnorms[btv->tvnorm].cropcap.pixelaspect;



	*f = bttv_tvnorms[btv->tvnorm].cropcap.pixelaspect;

	return 0;

}
@@ -3162,7 +3160,7 @@ static const struct v4l2_ioctl_ops bttv_ioctl_ops = { 
	.vidioc_g_fmt_vbi_cap           = bttv_g_fmt_vbi_cap,

	.vidioc_try_fmt_vbi_cap         = bttv_try_fmt_vbi_cap,

	.vidioc_s_fmt_vbi_cap           = bttv_s_fmt_vbi_cap,

	.vidioc_cropcap                 = bttv_cropcap,

	.vidioc_g_pixelaspect           = bttv_g_pixelaspect,

	.vidioc_reqbufs                 = bttv_reqbufs,

	.vidioc_querybuf                = bttv_querybuf,

	.vidioc_qbuf                    = bttv_qbuf,

drivers/media/pci/cobalt/cobalt-v4l2.c

+6 −4
Original line number Diff line number Diff line
@@ -1077,20 +1077,22 @@ static int cobalt_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a) 
	return 0;

}



static int cobalt_cropcap(struct file *file, void *fh, struct v4l2_cropcap *cc)

static int cobalt_g_pixelaspect(struct file *file, void *fh,

				int type, struct v4l2_fract *f)

{

	struct cobalt_stream *s = video_drvdata(file);

	struct v4l2_dv_timings timings;

	int err = 0;



	if (cc->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

	if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;



	if (s->input == 1)

		timings = cea1080p60;

	else

		err = v4l2_subdev_call(s->sd, video, g_dv_timings, &timings);

	if (!err)

		cc->pixelaspect = v4l2_dv_timings_aspect_ratio(&timings);

		*f = v4l2_dv_timings_aspect_ratio(&timings);

	return err;

}
@@ -1132,7 +1134,7 @@ static const struct v4l2_ioctl_ops cobalt_ioctl_ops = { 
	.vidioc_log_status		= cobalt_log_status,

	.vidioc_streamon		= vb2_ioctl_streamon,

	.vidioc_streamoff		= vb2_ioctl_streamoff,

	.vidioc_cropcap			= cobalt_cropcap,

	.vidioc_g_pixelaspect		= cobalt_g_pixelaspect,

	.vidioc_g_selection		= cobalt_g_selection,

	.vidioc_enum_input		= cobalt_enum_input,

	.vidioc_g_input			= cobalt_g_input,

drivers/media/pci/cx18/cx18-ioctl.c

+7 −6
Original line number Diff line number Diff line
@@ -441,15 +441,16 @@ static int cx18_enum_input(struct file *file, void *fh, struct v4l2_input *vin) 
	return cx18_get_input(cx, vin->index, vin);

}



static int cx18_cropcap(struct file *file, void *fh,

			struct v4l2_cropcap *cropcap)

static int cx18_g_pixelaspect(struct file *file, void *fh,

			      int type, struct v4l2_fract *f)

{

	struct cx18 *cx = fh2id(fh)->cx;



	if (cropcap->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

	if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;

	cropcap->pixelaspect.numerator = cx->is_50hz ? 54 : 11;

	cropcap->pixelaspect.denominator = cx->is_50hz ? 59 : 10;



	f->numerator = cx->is_50hz ? 54 : 11;

	f->denominator = cx->is_50hz ? 59 : 10;

	return 0;

}
@@ -1079,7 +1080,7 @@ static const struct v4l2_ioctl_ops cx18_ioctl_ops = { 
	.vidioc_g_audio                 = cx18_g_audio,

	.vidioc_enumaudio               = cx18_enumaudio,

	.vidioc_enum_input              = cx18_enum_input,

	.vidioc_cropcap                 = cx18_cropcap,

	.vidioc_g_pixelaspect           = cx18_g_pixelaspect,

	.vidioc_g_selection             = cx18_g_selection,

	.vidioc_g_input                 = cx18_g_input,

	.vidioc_s_input                 = cx18_s_input,

drivers/media/pci/cx23885/cx23885-video.c

+6 −6
Original line number Diff line number Diff line
@@ -668,17 +668,17 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv, 
	return 0;

}



static int vidioc_cropcap(struct file *file, void *priv,

			  struct v4l2_cropcap *cc)

static int vidioc_g_pixelaspect(struct file *file, void *priv,

				int type, struct v4l2_fract *f)

{

	struct cx23885_dev *dev = video_drvdata(file);

	bool is_50hz = dev->tvnorm & V4L2_STD_625_50;



	if (cc->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

	if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;



	cc->pixelaspect.numerator = is_50hz ? 54 : 11;

	cc->pixelaspect.denominator = is_50hz ? 59 : 10;

	f->numerator = is_50hz ? 54 : 11;

	f->denominator = is_50hz ? 59 : 10;



	return 0;

}
@@ -1139,7 +1139,7 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { 
	.vidioc_dqbuf         = vb2_ioctl_dqbuf,

	.vidioc_streamon      = vb2_ioctl_streamon,

	.vidioc_streamoff     = vb2_ioctl_streamoff,

	.vidioc_cropcap       = vidioc_cropcap,

	.vidioc_g_pixelaspect = vidioc_g_pixelaspect,

	.vidioc_g_selection   = vidioc_g_selection,

	.vidioc_s_std         = vidioc_s_std,

	.vidioc_g_std         = vidioc_g_std,

drivers/media/pci/ivtv/ivtv-ioctl.c

+9 −8
Original line number Diff line number Diff line
@@ -829,17 +829,18 @@ static int ivtv_enum_output(struct file *file, void *fh, struct v4l2_output *vou 
	return ivtv_get_output(itv, vout->index, vout);

}



static int ivtv_cropcap(struct file *file, void *fh, struct v4l2_cropcap *cropcap)

static int ivtv_g_pixelaspect(struct file *file, void *fh,

			      int type, struct v4l2_fract *f)

{

	struct ivtv_open_id *id = fh2id(fh);

	struct ivtv *itv = id->itv;



	if (cropcap->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {

		cropcap->pixelaspect.numerator = itv->is_50hz ? 54 : 11;

		cropcap->pixelaspect.denominator = itv->is_50hz ? 59 : 10;

	} else if (cropcap->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {

		cropcap->pixelaspect.numerator = itv->is_out_50hz ? 54 : 11;

		cropcap->pixelaspect.denominator = itv->is_out_50hz ? 59 : 10;

	if (type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {

		f->numerator = itv->is_50hz ? 54 : 11;

		f->denominator = itv->is_50hz ? 59 : 10;

	} else if (type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {

		f->numerator = itv->is_out_50hz ? 54 : 11;

		f->denominator = itv->is_out_50hz ? 59 : 10;

	} else {

		return -EINVAL;

	}
@@ -1923,7 +1924,7 @@ static const struct v4l2_ioctl_ops ivtv_ioctl_ops = { 
	.vidioc_enum_input		    = ivtv_enum_input,

	.vidioc_enum_output		    = ivtv_enum_output,

	.vidioc_enumaudout		    = ivtv_enumaudout,

	.vidioc_cropcap			    = ivtv_cropcap,

	.vidioc_g_pixelaspect		    = ivtv_g_pixelaspect,

	.vidioc_s_selection		    = ivtv_s_selection,

	.vidioc_g_selection		    = ivtv_g_selection,

	.vidioc_g_input			    = ivtv_g_input,

CRA Git | Maintained and supported by SUSTech CRA and CCSE