[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: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/pci/cx18/cx18-ioctl.c b/drivers/media/pci/cx18/cx18-ioctl.c
index 55525af1f4826d617f12a4c74ae5b4af68fd61d7..eeb741c7db1b2fe2e724a6c60f7202a94feedfc2 100644 (file)
--- a/drivers/media/pci/cx18/cx18-ioctl.c
+++ b/drivers/media/pci/cx18/cx18-ioctl.c
@@ -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;
 }
 

diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c
index 2c54cb824b0b9e0360566bf6efe09234da0bcd43..2dc4b20f3ac0a80773167a6a8ef52d5a042581c5 100644 (file)
--- a/drivers/media/pci/ivtv/ivtv-ioctl.c
+++ b/drivers/media/pci/ivtv/ivtv-ioctl.c
@@ -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;
        }