dasharo/zephyr
0
0
Fork 0
mirror of https://github.com/Dasharo/zephyr.git synced 2026-03-06 14:57:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

video: mt9m114: YUV pixel format support

Browse Source 
Added YUV pixel support to mt9m114 camera

Signed-off-by: Jeronimo Agullo <jeronimoagullo97@gmail.com>
This commit is contained in:
Jeronimo Agullo
2023-03-16 14:10:28 +01:00
committed by Carles Cufí
parent 8300e670e9
commit e64129d910
3 changed files with 53 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
drivers/video/mt9m114.c
View File

@@ -48,6 +48,10 @@ LOG_MODULE_REGISTER(mt9m114);
#define MT9M114_SYS_STATE_STANDBY 0x52
#define MT9M114_SYS_STATE_LEAVE_STANDBY 0x54
/* Camera output format */
#define MT9M114_CAM_OUTPUT_FORMAT_FORMAT_YUV (0 << 8)
#define MT9M114_CAM_OUTPUT_FORMAT_FORMAT_RGB (1 << 8)
struct mt9m114_config {
struct i2c_dt_spec i2c;
};
@@ -256,17 +260,43 @@ static int mt9m114_set_state(const struct device *dev, uint8_t state)
return 0;
}
static int mt9m114_set_output_format(const struct device *dev,
int pixel_format)
{
int ret = 0;
uint16_t output_format;
if (pixel_format == VIDEO_PIX_FMT_YUYV) {
output_format = (MT9M114_CAM_OUTPUT_FORMAT_FORMAT_YUV | (1U << 1U));
} else if (pixel_format == VIDEO_PIX_FMT_RGB565) {
output_format = (MT9M114_CAM_OUTPUT_FORMAT_FORMAT_RGB | (1U << 1U));
} else {
LOG_ERR("Image format not supported");
return -ENOTSUP;
}
ret = mt9m114_write_reg(dev, MT9M114_CAM_OUTPUT_FORMAT,
sizeof(output_format), &output_format);
return ret;
}
static int mt9m114_set_fmt(const struct device *dev,
enum video_endpoint_id ep,
struct video_format *fmt)
{
struct mt9m114_data *drv_data = dev->data;
uint16_t output_format;
int ret;
/* we only support one format for now (VGA RGB565) */
if (fmt->pixelformat != VIDEO_PIX_FMT_RGB565 || fmt->height != 480 ||
fmt->width != 640) {
/* we support RGB565 and YUV output pixel formats for now */
if (fmt->pixelformat != VIDEO_PIX_FMT_RGB565 && fmt->pixelformat != VIDEO_PIX_FMT_YUYV) {
LOG_ERR("Unsupported output pixel format");
return -ENOTSUP;
}
/* we only support one format size for now (VGA) */
if (fmt->height != 480 || fmt->width != 640) {
LOG_ERR("Unsupported output size format");
return -ENOTSUP;
}
@@ -285,9 +315,7 @@ static int mt9m114_set_fmt(const struct device *dev,
}
/* Set output format */
output_format = ((1U << 8U) | (1U << 1U)); /* RGB565 */
ret = mt9m114_write_reg(dev, MT9M114_CAM_OUTPUT_FORMAT,
sizeof(output_format), &output_format);
ret = mt9m114_set_output_format(dev, fmt->pixelformat);
if (ret) {
LOG_ERR("Unable to set output format");
return ret;
@@ -320,16 +348,20 @@ static int mt9m114_stream_stop(const struct device *dev)
return mt9m114_set_state(dev, MT9M114_SYS_STATE_ENTER_SUSPEND);
}
#define MT9M114_VIDEO_FORMAT_CAP(width, height, format) \
{ \
.pixelformat = (format), \
.width_min = (width), \
.width_max = (width), \
.height_min = (height), \
.height_max = (height), \
.width_step = 0, \
.height_step = 0 \
}
static const struct video_format_cap fmts[] = {
{
.pixelformat = VIDEO_PIX_FMT_RGB565,
.width_min = 640,
.width_max = 640,
.height_min = 480,
.height_max = 480,
.width_step = 0,
.height_step = 0,
},
MT9M114_VIDEO_FORMAT_CAP(640, 480, VIDEO_PIX_FMT_RGB565), /* VGA RGB565 */
MT9M114_VIDEO_FORMAT_CAP(640, 480, VIDEO_PIX_FMT_YUYV), /* VGA YUYV */
{ 0 }
};

2
drivers/video/video_mcux_csi.c
View File

@@ -43,6 +43,7 @@ static inline unsigned int video_pix_fmt_bpp(uint32_t pixelformat)
case VIDEO_PIX_FMT_RGGB8:
return 1;
case VIDEO_PIX_FMT_RGB565:
case VIDEO_PIX_FMT_YUYV:
return 2;
default:
return 0;
@@ -172,6 +173,7 @@ static int video_mcux_csi_get_fmt(const struct device *dev,
return video_mcux_csi_set_fmt(dev, ep, fmt);
}
fmt->pixelformat = data->pixelformat;
fmt->height = data->csi_config.height;
fmt->width = data->csi_config.width;

3
include/zephyr/drivers/video.h
View File

@@ -569,6 +569,9 @@ void video_buffer_release(struct video_buffer *buf);
/* RGB formats */
#define VIDEO_PIX_FMT_RGB565 video_fourcc('R', 'G', 'B', 'P') /* 16 RGB-5-6-5 */
/* YUV formats */
#define VIDEO_PIX_FMT_YUYV video_fourcc('Y', 'U', 'Y', 'V') /* 16 Y0-Cb0 Y1-Cr0 */
/* JPEG formats */
#define VIDEO_PIX_FMT_JPEG video_fourcc('J', 'P', 'E', 'G') /* 8 JPEG */