| Message ID | 1518082920-11309-2-git-send-email-todor.tomov@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
Hi Todor, On Thu, Feb 08, 2018 at 11:42:00AM +0200, Todor Tomov wrote: > Find the sensor mode by comparing the size of the requested image size > and the sensor mode's image size. The distance between image sizes is the > size in pixels of the non-overlapping regions between the requested size > and the frame-specified size. This logic is borrowed from et8ek8 sensor > driver. > > Signed-off-by: Todor Tomov <todor.tomov@linaro.org> > --- > drivers/media/i2c/ov5645.c | 24 +++++++++++++++--------- > 1 file changed, 15 insertions(+), 9 deletions(-) > > diff --git a/drivers/media/i2c/ov5645.c b/drivers/media/i2c/ov5645.c > index 9755562..6d06c50 100644 > --- a/drivers/media/i2c/ov5645.c > +++ b/drivers/media/i2c/ov5645.c > @@ -964,18 +964,24 @@ __ov5645_get_pad_crop(struct ov5645 *ov5645, struct v4l2_subdev_pad_config *cfg, > static const struct ov5645_mode_info * > ov5645_find_nearest_mode(unsigned int width, unsigned int height) > { > - int i; > + unsigned int max_dist_match = (unsigned int) -1; > + int i, n = 0; > > - for (i = ARRAY_SIZE(ov5645_mode_info_data) - 1; i >= 0; i--) { > - if (ov5645_mode_info_data[i].width <= width && > - ov5645_mode_info_data[i].height <= height) > - break; > + for (i = 0; i < ARRAY_SIZE(ov5645_mode_info_data); i++) { > + unsigned int dist = min(width, ov5645_mode_info_data[i].width) > + * min(height, ov5645_mode_info_data[i].height); > + > + dist = ov5645_mode_info_data[i].width * > + ov5645_mode_info_data[i].height > + + width * height - 2 * dist; Could you use v4l2_find_nearest_size()? The patch is here: <URL:https://git.linuxtv.org/sailus/media_tree.git/commit/?h=v4l2-common-size&id=83fdb8a0ab43fc86c329f63f1052e6113871a965> The pull request has been sent on it. -- Sakari Ailus sakari.ailus@linux.intel.com
diff --git a/drivers/media/i2c/ov5645.c b/drivers/media/i2c/ov5645.c index 9755562..6d06c50 100644 --- a/drivers/media/i2c/ov5645.c +++ b/drivers/media/i2c/ov5645.c @@ -964,18 +964,24 @@ __ov5645_get_pad_crop(struct ov5645 *ov5645, struct v4l2_subdev_pad_config *cfg, static const struct ov5645_mode_info * ov5645_find_nearest_mode(unsigned int width, unsigned int height) { - int i; + unsigned int max_dist_match = (unsigned int) -1; + int i, n = 0; - for (i = ARRAY_SIZE(ov5645_mode_info_data) - 1; i >= 0; i--) { - if (ov5645_mode_info_data[i].width <= width && - ov5645_mode_info_data[i].height <= height) - break; + for (i = 0; i < ARRAY_SIZE(ov5645_mode_info_data); i++) { + unsigned int dist = min(width, ov5645_mode_info_data[i].width) + * min(height, ov5645_mode_info_data[i].height); + + dist = ov5645_mode_info_data[i].width * + ov5645_mode_info_data[i].height + + width * height - 2 * dist; + + if (dist < max_dist_match) { + n = i; + max_dist_match = dist; + } } - if (i < 0) - i = 0; - - return &ov5645_mode_info_data[i]; + return &ov5645_mode_info_data[n]; } static int ov5645_set_format(struct v4l2_subdev *sd,
Find the sensor mode by comparing the size of the requested image size and the sensor mode's image size. The distance between image sizes is the size in pixels of the non-overlapping regions between the requested size and the frame-specified size. This logic is borrowed from et8ek8 sensor driver. Signed-off-by: Todor Tomov <todor.tomov@linaro.org> --- drivers/media/i2c/ov5645.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) -- 2.7.4