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

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

[media] ivtv/cx18: fix inverted pixel aspect ratio 



These two drivers reported the pixel aspect ratio the wrong way around.
This caused qv4l2 to scale the image incorrectly.

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

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

+2 −2
Original line number Diff line number Diff line
@@ -453,8 +453,8 @@ static int cx18_cropcap(struct file *file, void *fh, 


	if (cropcap->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;

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

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

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

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

	return 0;

}

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

+4 −4
Original line number Diff line number Diff line
@@ -831,11 +831,11 @@ static int ivtv_cropcap(struct file *file, void *fh, struct v4l2_cropcap *cropca 
	struct ivtv *itv = id->itv;



	if (cropcap->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {

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

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

		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 ? 59 : 10;

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

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

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

	} else {

		return -EINVAL;

	}