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

drivers: video: video_stm32_dcmi: Use video buffers for DCMI buffer. #84446

Merged
merged 1 commit into from
Jan 28, 2025
Merged

drivers: video: video_stm32_dcmi: Use video buffers for DCMI buffer. #84446

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 12 additions & 10 deletions drivers/video/video_stm32_dcmi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@

LOG_MODULE_REGISTER(video_stm32_dcmi, CONFIG_VIDEO_LOG_LEVEL);

K_HEAP_DEFINE(video_stm32_buffer_pool, CONFIG_VIDEO_BUFFER_POOL_SZ_MAX);
#if CONFIG_VIDEO_BUFFER_POOL_NUM_MAX < 2
#error "The minimum required number of buffers for video_stm32 is 2"
#endif

typedef void (*irq_config_func_t)(const struct device *dev);

Expand All @@ -43,7 +45,7 @@ struct video_stm32_dcmi_data {
uint32_t height;
uint32_t width;
uint32_t pitch;
uint8_t *buffer;
struct video_buffer *vbuf;
};

struct video_stm32_dcmi_config {
Expand Down Expand Up @@ -75,7 +77,7 @@ void HAL_DCMI_FrameEventCallback(DCMI_HandleTypeDef *hdcmi)
}

vbuf->timestamp = k_uptime_get_32();
memcpy(vbuf->buffer, dev_data->buffer, vbuf->bytesused);
memcpy(vbuf->buffer, dev_data->vbuf->buffer, vbuf->bytesused);

k_fifo_put(&dev_data->fifo_out, vbuf);

Expand Down Expand Up @@ -244,16 +246,16 @@ static int video_stm32_dcmi_stream_start(const struct device *dev)
{
struct video_stm32_dcmi_data *data = dev->data;
const struct video_stm32_dcmi_config *config = dev->config;
size_t buffer_size = data->pitch * data->height;

data->buffer = k_heap_alloc(&video_stm32_buffer_pool, buffer_size, K_NO_WAIT);
if (data->buffer == NULL) {
LOG_ERR("Failed to allocate DCMI buffer for image. Size %d bytes", buffer_size);
data->vbuf = k_fifo_get(&data->fifo_in, K_NO_WAIT);

if (data->vbuf == NULL) {
LOG_ERR("Failed to dequeue a DCMI buffer.");
iabdalkader marked this conversation as resolved.
Show resolved Hide resolved
return -ENOMEM;
}

int err = HAL_DCMI_Start_DMA(&data->hdcmi, DCMI_MODE_CONTINUOUS,
(uint32_t)data->buffer, buffer_size / 4);
(uint32_t)data->vbuf->buffer, data->vbuf->bytesused / 4);
if (err != HAL_OK) {
LOG_ERR("Failed to start DCMI DMA");
return -EIO;
Expand All @@ -276,8 +278,8 @@ static int video_stm32_dcmi_stream_stop(const struct device *dev)
return -EIO;
}

/* Release the buffer allocated in stream_start */
k_heap_free(&video_stm32_buffer_pool, data->buffer);
/* Release the video buffer allocated in stream_start */
k_fifo_put(&data->fifo_in, data->vbuf);
iabdalkader marked this conversation as resolved.
Show resolved Hide resolved

err = HAL_DCMI_Stop(&data->hdcmi);
if (err != HAL_OK) {
Expand Down
Loading