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

[mpp_service]: Enlarge offset request buffer cnt

Browse Source 
NOTE: realloc may change the buffer base. This will invalid the pointer
which point to the old buffer base.
This issue will make 4 tile H.265 encoding with multi osd generate
error stream.

Change-Id: I764ee9b2097687ae9d5f2bcc8d2ff5987a636844
Signed-off-by: sayon.chen <sayon.chen@rock-chips.com>
This commit is contained in:
sayon.chen
2022-10-09 18:28:57 +08:00
committed by Herman Chen
parent 9b860cd250
commit 1f8ec3b78d
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osal/driver/inc/mpp_service_impl.h
View File

@@ -20,7 +20,7 @@
#include "mpp_device.h" #include "mpp_device.h"
#include "mpp_service.h" #include "mpp_service.h"
#define MAX_REG_OFFSET 32 #define MAX_REG_OFFSET 64
#define MAX_RCB_OFFSET 32 #define MAX_RCB_OFFSET 32
#define MAX_INFO_COUNT 16 #define MAX_INFO_COUNT 16

4
osal/driver/mpp_service.c
View File

@@ -215,6 +215,8 @@ RegOffsetInfo *mpp_service_next_reg_offset(MppDevMppService *p)
RegOffsetInfo *info = NULL; RegOffsetInfo *info = NULL;
if (p->reg_offset_count + p->reg_offset_pos >= p->reg_offset_max) { if (p->reg_offset_count + p->reg_offset_pos >= p->reg_offset_max) {
RegOffsetInfo *orig = p->reg_offset_info;
mpp_dev_dbg_msg("enlarge reg offset count %d -> %d\n", mpp_dev_dbg_msg("enlarge reg offset count %d -> %d\n",
p->reg_offset_max, p->reg_offset_max * 2); p->reg_offset_max, p->reg_offset_max * 2);
p->reg_offset_info = mpp_realloc(p->reg_offset_info, RegOffsetInfo, p->reg_offset_max * 2); p->reg_offset_info = mpp_realloc(p->reg_offset_info, RegOffsetInfo, p->reg_offset_max * 2);
@@ -222,6 +224,8 @@ RegOffsetInfo *mpp_service_next_reg_offset(MppDevMppService *p)
mpp_err_f("failed to enlarge request buffer\n"); mpp_err_f("failed to enlarge request buffer\n");
return NULL; return NULL;
} }
if (orig != p->reg_offset_info)
mpp_logw_f("enlarge reg offset buffer and get different pointer\n");
p->reg_offset_max *= 2; p->reg_offset_max *= 2;
} }