Commit e95a1915 authored by Mike Isely's avatar Mike Isely Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (4375): Eliminate hardcoded limits in VIDIOC_[S|TRY]_FMT for pvrusb2 



The pvrusb2 implementation for VIDIOC_[S|TRY]_FMT was hardcoding
limits on the range for allowed resolution, but it would be much
better if we instead just queried the internal control for these
values.  This then opens the door for the driver to adjust these
limits based on the detected hardware.

Signed-off-by: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 434449f4

drivers/media/video/pvrusb2/pvrusb2-v4l2.c

+19 −17
Original line number Diff line number Diff line
@@ -459,18 +459,26 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file, 
		ret = 0;

		switch(vf->type) {

		case V4L2_BUF_TYPE_VIDEO_CAPTURE: {

			int lmin,lmax;

			struct pvr2_ctrl *hcp,*vcp;

			int h = vf->fmt.pix.height;

			int w = vf->fmt.pix.width;

			hcp = pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_HRES);

			vcp = pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_VRES);



			if (h < 200) {

				h = 200;

			} else if (h > 625) {

				h = 625;

			lmin = pvr2_ctrl_get_min(hcp);

			lmax = pvr2_ctrl_get_max(hcp);

			if (h < lmin) {

				h = lmin;

			} else if (h > lmax) {

				h = lmax;

			}

			if (w < 320) {

				w = 320;

			} else if (w > 720) {

				w = 720;

			lmin = pvr2_ctrl_get_min(vcp);

			lmax = pvr2_ctrl_get_max(vcp);

			if (w < lmin) {

				w = lmin;

			} else if (w > lmax) {

				w = lmax;

			}



			memcpy(vf, &pvr_format[PVR_FORMAT_PIX],
@@ -479,14 +487,8 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file, 
			vf->fmt.pix.height = h;



			if (cmd == VIDIOC_S_FMT) {

				pvr2_ctrl_set_value(

					pvr2_hdw_get_ctrl_by_id(hdw,

								PVR2_CID_HRES),

					vf->fmt.pix.width);

				pvr2_ctrl_set_value(

					pvr2_hdw_get_ctrl_by_id(hdw,

								PVR2_CID_VRES),

					vf->fmt.pix.height);

				pvr2_ctrl_set_value(hcp,vf->fmt.pix.width);

				pvr2_ctrl_set_value(vcp,vf->fmt.pix.height);

			}

		} break;

		case V4L2_BUF_TYPE_VBI_CAPTURE: