199ccba5e4
k_mem_pool_malloc reserves some space for block descriptor at the start of the data block, causing misalignement of returned video buffer. In our context we want to return a video buffer with aligment matching the video buffer poll alignment config. Fix that by using the simpler k_mem_pool_alloc function. Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
66 lines
1.3 KiB
C
66 lines
1.3 KiB
C
/*
|
|
* Copyright (c) 2019, Linaro Limited
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
#include <zephyr.h>
|
|
|
|
#include <drivers/video.h>
|
|
|
|
K_MEM_POOL_DEFINE(video_buffer_pool,
|
|
CONFIG_VIDEO_BUFFER_POOL_ALIGN,
|
|
CONFIG_VIDEO_BUFFER_POOL_SZ_MAX,
|
|
CONFIG_VIDEO_BUFFER_POOL_NUM_MAX,
|
|
CONFIG_VIDEO_BUFFER_POOL_ALIGN);
|
|
|
|
static struct video_buffer video_buf[CONFIG_VIDEO_BUFFER_POOL_NUM_MAX];
|
|
static struct k_mem_block video_block[CONFIG_VIDEO_BUFFER_POOL_NUM_MAX];
|
|
|
|
struct video_buffer *video_buffer_alloc(size_t size)
|
|
{
|
|
struct video_buffer *vbuf = NULL;
|
|
struct k_mem_block *block;
|
|
int i;
|
|
|
|
/* find available video buffer */
|
|
for (i = 0; i < ARRAY_SIZE(video_buf); i++) {
|
|
if (video_buf[i].buffer == NULL) {
|
|
vbuf = &video_buf[i];
|
|
block = &video_block[i];
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (vbuf == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
/* Alloc buffer memory */
|
|
if (k_mem_pool_alloc(&video_buffer_pool, block, size, K_FOREVER)) {
|
|
return NULL;
|
|
}
|
|
|
|
vbuf->buffer = block->data;
|
|
vbuf->size = size;
|
|
vbuf->bytesused = 0;
|
|
|
|
return vbuf;
|
|
}
|
|
|
|
void video_buffer_release(struct video_buffer *vbuf)
|
|
{
|
|
struct k_mem_block *block = NULL;
|
|
int i;
|
|
|
|
/* vbuf to block */
|
|
for (i = 0; i < ARRAY_SIZE(video_buf); i++) {
|
|
if (video_block[i].data == vbuf->buffer) {
|
|
block = &video_block[i];
|
|
break;
|
|
}
|
|
}
|
|
|
|
vbuf->buffer = NULL;
|
|
k_mem_pool_free(block);
|
|
}
|