Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-02 01:21:26 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

video: move user define mem_ops into imgdata_ops.

Browse Source 
Signed-off-by: yaojingwei <yaojingwei@xiaomi.com>
This commit is contained in:
yaojingwei
2023-12-26 09:11:20 +08:00
committed by Xiang Xiao
parent 64aecbcc5c
commit f03a1a14f3
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/video/v4l2_cap.c
+8 -7
View File
@@ -1174,9 +1174,9 @@ static void cleanup_streamresources(FAR capture_type_inf_t *type_inf,
nxmutex_destroy(&type_inf->lock_state);
if (type_inf->bufheap != NULL)
{
if (cmng->imgdata->mem_ops && cmng->imgdata->mem_ops->mem_free)
if (cmng->imgdata->ops->free)
{
cmng->imgdata->mem_ops->mem_free(type_inf->bufheap);
cmng->imgdata->ops->free(cmng->imgdata, type_inf->bufheap);
}
else
{
@@ -2120,7 +2120,7 @@ static int capture_reqbufs(FAR struct v4l2_s *v4l2,
{
FAR capture_mng_t *cmng = (FAR capture_mng_t *)v4l2;
FAR capture_type_inf_t *type_inf;
const imgdata_mem_ops_t *mem_ops = cmng->imgdata->mem_ops;
struct imgdata_s *imgdata = cmng->imgdata;
irqstate_t flags;
int ret = OK;
@@ -2158,9 +2158,9 @@ static int capture_reqbufs(FAR struct v4l2_s *v4l2,
{
if (type_inf->bufheap != NULL)
{
if (mem_ops && mem_ops->mem_free)
if (imgdata->ops->free)
{
mem_ops->mem_free(type_inf->bufheap);
imgdata->ops->free(imgdata, type_inf->bufheap);
}
else
{
@@ -2168,9 +2168,10 @@ static int capture_reqbufs(FAR struct v4l2_s *v4l2,
}
}
if (mem_ops && mem_ops->mem_malloc)
if (imgdata->ops->alloc)
{
type_inf->bufheap = mem_ops->mem_malloc(32, reqbufs->count *
type_inf->bufheap = imgdata->ops->alloc(imgdata, 32,
reqbufs->count *
get_bufsize(&type_inf->fmt[CAPTURE_FMT_MAIN]));
}
else