package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-07 01:52:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix[hal_bufs]: clear buffer when hal_bufs get failed

Browse Source 
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I9d1d4d596ecc9379727129e0ab9ee12d20a8d222
This commit is contained in:
Yandong Lin
2023-12-05 16:59:05 +08:00
committed by Herman Chen
parent d9fb399576
commit b64ba6383c
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mpp/hal/common/hal_bufs.c
View File

@@ -222,6 +222,7 @@ MPP_RET hal_bufs_setup(HalBufs bufs, RK_S32 max_cnt, RK_S32 size_cnt, size_t siz
HalBuf *hal_bufs_get_buf(HalBufs bufs, RK_S32 buf_idx) HalBuf *hal_bufs_get_buf(HalBufs bufs, RK_S32 buf_idx)
{ {
HalBufsImpl *impl = (HalBufsImpl *)bufs; HalBufsImpl *impl = (HalBufsImpl *)bufs;
RK_S32 i;
if (NULL == impl || buf_idx < 0 || buf_idx >= impl->max_cnt) { if (NULL == impl || buf_idx < 0 || buf_idx >= impl->max_cnt) {
mpp_err_f("invalid input impl %p buf_idx %d\n", impl, buf_idx); mpp_err_f("invalid input impl %p buf_idx %d\n", impl, buf_idx);
@@ -235,7 +236,6 @@ HalBuf *hal_bufs_get_buf(HalBufs bufs, RK_S32 buf_idx)
if (!(impl->valid & mask)) { if (!(impl->valid & mask)) {
MppBufferGroup group = impl->group; MppBufferGroup group = impl->group;
RK_S32 i;
for (i = 0; i < impl->size_cnt; i++) { for (i = 0; i < impl->size_cnt; i++) {
size_t size = impl->sizes[i]; size_t size = impl->sizes[i];
@@ -243,6 +243,8 @@ HalBuf *hal_bufs_get_buf(HalBufs bufs, RK_S32 buf_idx)
if (size && NULL == buf) { if (size && NULL == buf) {
mpp_buffer_get(group, &buf, size); mpp_buffer_get(group, &buf, size);
if (!buf)
goto failed;
impl->size_sum += size; impl->size_sum += size;
} }
@@ -256,4 +258,13 @@ HalBuf *hal_bufs_get_buf(HalBufs bufs, RK_S32 buf_idx)
hal_bufs_leave(); hal_bufs_leave();
return hal_buf; return hal_buf;
failed:
for (i = 0; i < impl->size_cnt; i++) {
if (hal_buf->buf[i]) {
mpp_buffer_put(hal_buf->buf[i]);
hal_buf->buf[i] = NULL;
}
}
return NULL;
} }