Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

drivers: video: gc2145: Include set_resolution() in the format caps check #78731

Merged
merged 3 commits into from
Sep 28, 2024
Merged

drivers: video: gc2145: Include set_resolution() in the format caps check #78731

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54a1792
drivers: video: gc2145: check format compatibility before applying
josuah Sep 19, 2024
c325ac7
drivers: video: gc2145: return 0 at the end of functions
josuah Sep 19, 2024
ea5086f
drivers: video: gc2145: set_fmt: branch on failure rather than success
josuah Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 24 additions & 21 deletions drivers/video/gc2145.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ static int gc2145_set_window(const struct device *dev, uint16_t reg, uint16_t x,
return ret;
}

return ret;
return 0;
}

static int gc2145_set_output_format(const struct device *dev, int output_format)
Expand Down Expand Up @@ -1023,7 +1023,7 @@ static int gc2145_set_fmt(const struct device *dev, enum video_endpoint_id ep,
struct video_format *fmt)
{
struct gc2145_data *drv_data = dev->data;
uint16_t width, height;
enum resolutions res = RESOLUTIONS_MAX;
int ret;

/* We only support RGB565 formats */
Expand All @@ -1032,14 +1032,24 @@ static int gc2145_set_fmt(const struct device *dev, enum video_endpoint_id ep,
return -ENOTSUP;
}

width = fmt->width;
height = fmt->height;

if (memcmp(&drv_data->fmt, fmt, sizeof(drv_data->fmt)) == 0) {
/* nothing to do */
return 0;
}

/* Check if camera is capable of handling given format */
for (int i = 0; i == ARRAY_SIZE(fmts); i++) {
if (fmts[i].width_min == fmt->width && fmts[i].height_min == fmt->height &&
fmts[i].pixelformat == fmt->pixelformat) {
res = (enum resolutions)i;
break;
}
}
if (res == RESOLUTIONS_MAX) {
LOG_ERR("Image format not supported");
return -ENOTSUP;
}

drv_data->fmt = *fmt;

/* Set output format */
Expand All @@ -1049,22 +1059,14 @@ static int gc2145_set_fmt(const struct device *dev, enum video_endpoint_id ep,
return ret;
}

/* Check if camera is capable of handling given format */
for (int i = 0; i < ARRAY_SIZE(fmts); i++) {
if (fmts[i].width_min == width && fmts[i].height_min == height &&
fmts[i].pixelformat == fmt->pixelformat) {
/* Set window size */
ret = gc2145_set_resolution(dev, (enum resolutions)i);
if (ret < 0) {
LOG_ERR("Failed to set the resolution");
}
return ret;
}
/* Set window size */
ret = gc2145_set_resolution(dev, res);
if (ret < 0) {
LOG_ERR("Failed to set the resolution");
return ret;
}

/* Camera is not capable of handling given format */
LOG_ERR("Image format not supported\n");
return -ENOTSUP;
return 0;
}

static int gc2145_get_fmt(const struct device *dev, enum video_endpoint_id ep,
Expand Down Expand Up @@ -1154,9 +1156,10 @@ static int gc2145_init(const struct device *dev)
ret = gc2145_set_fmt(dev, VIDEO_EP_OUT, &fmt);
if (ret) {
LOG_ERR("Unable to configure default format");
return -EIO;
return ret;
}
return ret;

return 0;
}

/* Unique Instance */
Expand Down
Loading