starred/mpp-nyanmisaka
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2026-01-24 03:20:38 +01:00
Code Issues Projects Packages Wiki Activity Actions

fix[mpp_meta]: Add KEY_NPU_UOBJ_FLAG and KEY_NPU_SOBJ_FLAG

Browse source 
UOBJ: deliver userspace buffer for rk3588 and rk3576
SOBJ: deliver shared memory buffer for rv1126b

Sync to kmpp-develop patch with the same log:
If596371639eaedb01d6900c737d1f7fec49bf8d4

Change-Id: I8927f6341b5d3f94bf52af32c02b75cd24ad0681
Signed-off-by: timkingh.huang <timkingh.huang@rock-chips.com>
This commit is contained in:
timkingh.huang 2025-08-28 16:56:28 +08:00 • committed by Herman Chen
parent 9a6bf0e0b0
commit 6588b71f2b
5 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kmpp/base/kmpp_meta.c
View file

@ -330,7 +330,7 @@ rk_s32 kmpp_meta_dump_all(const char *caller)
KMPP_META_ACCESSOR(s32, rk_s32, TYPE_VAL_32, val_s32)
KMPP_META_ACCESSOR(s64, rk_s64, TYPE_VAL_64, val_s64)
KMPP_META_ACCESSOR(ptr, void *, TYPE_KPTR, val_ptr)
KMPP_META_ACCESSOR(ptr, void *, TYPE_UPTR, val_ptr)
rk_s32 kmpp_meta_set_obj(KmppMeta meta, KmppMetaKey key, KmppObj val)
{

9
kmpp/base/test/kmpp_meta_test.c
View file

@ -25,6 +25,7 @@ void *meta_test(void *param)
KmppShmPtr packet;
KmppShmPtr buffer;
KmppShmPtr sptr;
void *ptr;
RK_S32 val;
RK_S32 i;
@ -63,13 +64,15 @@ void *meta_test(void *param)
ret |= kmpp_meta_set_s32(meta[i], KEY_LONG_REF_IDX, 0);
ret |= kmpp_meta_set_s32(meta[i], KEY_ENC_AVERAGE_QP, 0);
ret |= kmpp_meta_set_shm(meta[i], KEY_ROI_DATA, NULL);
//ret |= kmpp_meta_set_shm(meta[i], KEY_ROI_DATA, NULL);
ret |= kmpp_meta_set_shm(meta[i], KEY_OSD_DATA, NULL);
ret |= kmpp_meta_set_shm(meta[i], KEY_OSD_DATA2, NULL);
ret |= kmpp_meta_set_shm(meta[i], KEY_USER_DATA, NULL);
ret |= kmpp_meta_set_shm(meta[i], KEY_USER_DATAS, NULL);
ret |= kmpp_meta_set_shm(meta[i], KEY_QPMAP0, NULL);
ret |= kmpp_meta_set_shm(meta[i], KEY_NPU_SOBJ_FLAG, NULL);
ret |= kmpp_meta_set_ptr(meta[i], KEY_NPU_UOBJ_FLAG, NULL);
ret |= kmpp_meta_set_s32(meta[i], KEY_ENC_MARK_LTR, 0);
ret |= kmpp_meta_set_s32(meta[i], KEY_ENC_USE_LTR, 0);
@ -94,13 +97,15 @@ void *meta_test(void *param)
ret |= kmpp_meta_get_s32(meta[i], KEY_LONG_REF_IDX, &val);
ret |= kmpp_meta_get_s32(meta[i], KEY_ENC_AVERAGE_QP, &val);
ret |= kmpp_meta_get_shm(meta[i], KEY_ROI_DATA, &sptr);
//ret |= kmpp_meta_get_shm(meta[i], KEY_ROI_DATA, &sptr);
ret |= kmpp_meta_get_shm(meta[i], KEY_OSD_DATA, &sptr);
ret |= kmpp_meta_get_shm(meta[i], KEY_OSD_DATA2, &sptr);
ret |= kmpp_meta_get_shm(meta[i], KEY_USER_DATA, &sptr);
ret |= kmpp_meta_get_shm(meta[i], KEY_USER_DATAS, &sptr);
ret |= kmpp_meta_get_shm(meta[i], KEY_QPMAP0, &buffer);
ret |= kmpp_meta_get_shm(meta[i], KEY_NPU_SOBJ_FLAG, &sptr);
ret |= kmpp_meta_get_ptr(meta[i], KEY_NPU_UOBJ_FLAG, &ptr);
ret |= kmpp_meta_get_s32(meta[i], KEY_ENC_MARK_LTR, &val);
ret |= kmpp_meta_get_s32(meta[i], KEY_ENC_USE_LTR, &val);