Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[media] ivtv: replace crop by selection 



Replace the old g/s_crop ioctls by the new g/s_selection ioctls.
This solves a v4l2-compliance failure, and it is something that needs
to be done anyway to eventually be able to remove the old g/s_crop
ioctl ops.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 4db4ca74

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

+69 −46
Original line number Diff line number Diff line
@@ -816,80 +816,103 @@ static int ivtv_cropcap(struct file *file, void *fh, struct v4l2_cropcap *cropca 
{

	struct ivtv_open_id *id = fh2id(fh);

	struct ivtv *itv = id->itv;

	struct yuv_playback_info *yi = &itv->yuv_info;

	int streamtype;



	streamtype = id->type;



	if (cropcap->type != V4L2_BUF_TYPE_VIDEO_OUTPUT)

		return -EINVAL;

	cropcap->bounds.top = cropcap->bounds.left = 0;

	cropcap->bounds.width = 720;

	if (cropcap->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {

		cropcap->bounds.height = itv->is_50hz ? 576 : 480;

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

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

	} else if (streamtype == IVTV_DEC_STREAM_TYPE_YUV) {

		if (yi->track_osd) {

			cropcap->bounds.width = yi->osd_full_w;

			cropcap->bounds.height = yi->osd_full_h;

		} else {

			cropcap->bounds.width = 720;

			cropcap->bounds.height =

					itv->is_out_50hz ? 576 : 480;

		}

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

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

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

	} else {

		cropcap->bounds.height = itv->is_out_50hz ? 576 : 480;

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

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

		return -EINVAL;

	}

	cropcap->defrect = cropcap->bounds;

	return 0;

}



static int ivtv_s_crop(struct file *file, void *fh, const struct v4l2_crop *crop)

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

			    struct v4l2_selection *sel)

{

	struct ivtv_open_id *id = fh2id(fh);

	struct ivtv *itv = id->itv;

	struct yuv_playback_info *yi = &itv->yuv_info;

	int streamtype;

	struct v4l2_rect r = { 0, 0, 720, 0 };

	int streamtype = id->type;



	if (sel->type != V4L2_BUF_TYPE_VIDEO_OUTPUT ||

	    !(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))

		return -EINVAL;



	if (sel->target != V4L2_SEL_TGT_COMPOSE)

		return -EINVAL;





	if (sel->type != V4L2_BUF_TYPE_VIDEO_OUTPUT ||

	    !(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))

		return -EINVAL;



	streamtype = id->type;

	r.height = itv->is_out_50hz ? 576 : 480;

	if (streamtype == IVTV_DEC_STREAM_TYPE_YUV && yi->track_osd) {

		r.width = yi->osd_full_w;

		r.height = yi->osd_full_h;

	}

	sel->r.width = clamp(sel->r.width, 16U, r.width);

	sel->r.height = clamp(sel->r.height, 16U, r.height);

	sel->r.left = clamp_t(unsigned, sel->r.left, 0, r.width - sel->r.width);

	sel->r.top = clamp_t(unsigned, sel->r.top, 0, r.height - sel->r.height);



	if (crop->type == V4L2_BUF_TYPE_VIDEO_OUTPUT &&

	    (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) {

	if (streamtype == IVTV_DEC_STREAM_TYPE_YUV) {

			yi->main_rect = crop->c;

		yi->main_rect = sel->r;

		return 0;

		} else {

	}

	if (!ivtv_vapi(itv, CX2341X_OSD_SET_FRAMEBUFFER_WINDOW, 4,

				crop->c.width, crop->c.height, crop->c.left, crop->c.top)) {

				itv->main_rect = crop->c;

			sel->r.width, sel->r.height, sel->r.left, sel->r.top)) {

		itv->main_rect = sel->r;

		return 0;

	}

		}

		return -EINVAL;

	}

	return -EINVAL;

}



static int ivtv_g_crop(struct file *file, void *fh, struct v4l2_crop *crop)

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

			    struct v4l2_selection *sel)

{

	struct ivtv_open_id *id = fh2id(fh);

	struct ivtv *itv = id->itv;

	struct yuv_playback_info *yi = &itv->yuv_info;

	int streamtype;

	struct v4l2_rect r = { 0, 0, 720, 0 };

	int streamtype = id->type;



	streamtype = id->type;

	if (sel->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {

		switch (sel->target) {

		case V4L2_SEL_TGT_CROP_DEFAULT:

		case V4L2_SEL_TGT_CROP_BOUNDS:

			sel->r.top = sel->r.left = 0;

			sel->r.width = 720;

			sel->r.height = itv->is_50hz ? 576 : 480;

			return 0;

		default:

			return -EINVAL;

		}

	}



	if (crop->type == V4L2_BUF_TYPE_VIDEO_OUTPUT &&

	    (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) {

	if (sel->type != V4L2_BUF_TYPE_VIDEO_OUTPUT ||

	    !(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))

		return -EINVAL;



	switch (sel->target) {

	case V4L2_SEL_TGT_COMPOSE:

		if (streamtype == IVTV_DEC_STREAM_TYPE_YUV)

			crop->c = yi->main_rect;

			sel->r = yi->main_rect;

		else

			crop->c = itv->main_rect;

			sel->r = itv->main_rect;

		return 0;

	case V4L2_SEL_TGT_COMPOSE_DEFAULT:

	case V4L2_SEL_TGT_COMPOSE_BOUNDS:

		r.height = itv->is_out_50hz ? 576 : 480;

		if (streamtype == IVTV_DEC_STREAM_TYPE_YUV && yi->track_osd) {

			r.width = yi->osd_full_w;

			r.height = yi->osd_full_h;

		}

		sel->r = r;

		return 0;

	}

	return -EINVAL;
@@ -1837,8 +1860,8 @@ static const struct v4l2_ioctl_ops ivtv_ioctl_ops = { 
	.vidioc_enum_output   		    = ivtv_enum_output,

	.vidioc_enumaudout   		    = ivtv_enumaudout,

	.vidioc_cropcap       		    = ivtv_cropcap,

	.vidioc_s_crop       		    = ivtv_s_crop,

	.vidioc_g_crop       		    = ivtv_g_crop,

	.vidioc_s_selection		    = ivtv_s_selection,

	.vidioc_g_selection		    = ivtv_g_selection,

	.vidioc_g_input      		    = ivtv_g_input,

	.vidioc_s_input      		    = ivtv_s_input,

	.vidioc_g_output     		    = ivtv_g_output,