mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
81 lines
2.4 KiB
Diff
81 lines
2.4 KiB
Diff
|
From de47ea073936726d9a5ad843908fd3074c1fb8f0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hans Verkuil <hverkuil@xs4all.nl>
|
||
|
|
Date: Wed, 5 Aug 2020 12:57:21 +0200
|
||
|
|
Subject: [PATCH] media: i2c: imx219: Selection compliance fixes
|
||
|
|
|
||
|
|
To comply with the intended usage of the V4L2 selection target when
|
||
|
|
used to retrieve a sensor image properties, adjust the rectangles
|
||
|
|
returned by the imx219 driver.
|
||
|
|
|
||
|
|
The top/left crop coordinates of the TGT_CROP rectangle were set to
|
||
|
|
(0, 0) instead of (8, 8) which is the offset from the larger physical
|
||
|
|
pixel array rectangle. This was also a mismatch with the default values
|
||
|
|
crop rectangle value, so this is corrected. Found with v4l2-compliance.
|
||
|
|
|
||
|
|
While at it, add V4L2_SEL_TGT_CROP_BOUNDS support: CROP_DEFAULT and
|
||
|
|
CROP_BOUNDS have the same size as the non-active pixels are not readable
|
||
|
|
using the selection API. Found with v4l2-compliance.
|
||
|
|
|
||
|
|
Fixes: e6d4ef7d58aa7 ("media: i2c: imx219: Implement get_selection")
|
||
|
|
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
|
||
|
|
[reword commit message, use macros for pixel offsets]
|
||
|
|
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
|
||
|
|
---
|
||
|
|
drivers/media/i2c/imx219.c | 17 +++++++++--------
|
||
|
|
1 file changed, 9 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/media/i2c/imx219.c
|
||
|
|
+++ b/drivers/media/i2c/imx219.c
|
||
|
|
@@ -485,8 +485,8 @@ static const struct imx219_mode supporte
|
||
|
|
.width = 3280,
|
||
|
|
.height = 2464,
|
||
|
|
.crop = {
|
||
|
|
- .left = 0,
|
||
|
|
- .top = 0,
|
||
|
|
+ .left = IMX219_PIXEL_ARRAY_LEFT,
|
||
|
|
+ .top = IMX219_PIXEL_ARRAY_TOP,
|
||
|
|
.width = 3280,
|
||
|
|
.height = 2464
|
||
|
|
},
|
||
|
|
@@ -501,8 +501,8 @@ static const struct imx219_mode supporte
|
||
|
|
.width = 1920,
|
||
|
|
.height = 1080,
|
||
|
|
.crop = {
|
||
|
|
- .left = 680,
|
||
|
|
- .top = 692,
|
||
|
|
+ .left = 688,
|
||
|
|
+ .top = 700,
|
||
|
|
.width = 1920,
|
||
|
|
.height = 1080
|
||
|
|
},
|
||
|
|
@@ -517,8 +517,8 @@ static const struct imx219_mode supporte
|
||
|
|
.width = 1640,
|
||
|
|
.height = 1232,
|
||
|
|
.crop = {
|
||
|
|
- .left = 0,
|
||
|
|
- .top = 0,
|
||
|
|
+ .left = IMX219_PIXEL_ARRAY_LEFT,
|
||
|
|
+ .top = IMX219_PIXEL_ARRAY_TOP,
|
||
|
|
.width = 3280,
|
||
|
|
.height = 2464
|
||
|
|
},
|
||
|
|
@@ -533,8 +533,8 @@ static const struct imx219_mode supporte
|
||
|
|
.width = 640,
|
||
|
|
.height = 480,
|
||
|
|
.crop = {
|
||
|
|
- .left = 1000,
|
||
|
|
- .top = 752,
|
||
|
|
+ .left = 1008,
|
||
|
|
+ .top = 760,
|
||
|
|
.width = 1280,
|
||
|
|
.height = 960
|
||
|
|
},
|
||
|
|
@@ -1093,6 +1093,7 @@ static int imx219_get_selection(struct v
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
case V4L2_SEL_TGT_CROP_DEFAULT:
|
||
|
|
+ case V4L2_SEL_TGT_CROP_BOUNDS:
|
||
|
|
sel->r.top = IMX219_PIXEL_ARRAY_TOP;
|
||
|
|
sel->r.left = IMX219_PIXEL_ARRAY_LEFT;
|
||
|
|
sel->r.width = IMX219_PIXEL_ARRAY_WIDTH;
|