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

feat[mpp_meta]: Add frame / meta dup function

Browse source 
Add dup function for mpp_frame and mpp_meta.
NOTE: The buffer in MppFrame is not dup.

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: I4965bc6016c8ffca4b72bbd49e2653eab06c7591
This commit is contained in:
Herman Chen 2025-11-06 15:34:45 +08:00
parent 52f005f2df
commit 2771f34e76
5 changed files with 141 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inc/mpp_meta.h
View file

@ -174,6 +174,7 @@ extern "C" {
MPP_RET mpp_meta_get_with_tag(MppMeta *meta, const char *tag, const char *caller);
MPP_RET mpp_meta_put(MppMeta meta);
RK_S32 mpp_meta_size(MppMeta meta);
MppMeta mpp_meta_dup(MppMeta meta);
MPP_RET mpp_meta_set_s32(MppMeta meta, MppMetaKey key, RK_S32 val);
MPP_RET mpp_meta_set_s64(MppMeta meta, MppMetaKey key, RK_S64 val);

3
mpp/base/inc/mpp_frame_impl.h
View file

@ -199,7 +199,8 @@ struct MppFrameImpl_t {
extern "C" {
#endif
MPP_RET mpp_frame_copy(MppFrame frame, MppFrame next);
MppFrame mpp_frame_dup(MppFrame src);
MPP_RET mpp_frame_copy(MppFrame dst, MppFrame src);
MPP_RET mpp_frame_info_cmp(MppFrame frame0, MppFrame frame1);
RK_U32 mpp_frame_get_fbc_offset(MppFrame frame);
RK_U32 mpp_frame_get_fbc_stride(MppFrame frame);

5
mpp/base/inc/mpp_meta_impl.h
View file

@ -58,6 +58,11 @@ RK_S32 mpp_meta_size(MppMeta meta);
MPP_RET mpp_meta_dump(MppMeta meta);
MPP_RET mpp_meta_inc_ref(MppMeta meta);
RK_S32 mpp_meta_s32_read(MppMeta meta, RK_S32 index, RK_S32 *val);
extern RK_S32 meta_hdr_offset_index;
extern RK_S32 meta_hdr_size_index;
#ifdef __cplusplus
}
#endif

24
mpp/base/mpp_frame.c
View file

@ -220,6 +220,30 @@ MppStopwatch mpp_frame_get_stopwatch(const MppFrame frame)
return p->stopwatch;
}
MppFrame mpp_frame_dup(MppFrame src)
{
MppFrameImpl *p = (MppFrameImpl *)src;
MppFrameImpl *ret;
MppFrame frame = NULL;
if (check_is_mpp_frame(src)) {
mpp_err_f("invalid input src %p\n", src);
return NULL;
}
mpp_frame_init(&frame);
if (!frame)
return NULL;
ret = (MppFrameImpl *)frame;
memcpy(ret, p, sizeof(MppFrameImpl));
if (p->meta)
ret->meta = mpp_meta_dup(p->meta);
return frame;
}
MPP_RET mpp_frame_copy(MppFrame dst, MppFrame src)
{
MppFrameImpl *p = (MppFrameImpl *)dst;

167
mpp/base/mpp_meta.c
View file

@ -172,6 +172,9 @@ static RK_U32 mpp_meta_debug = 0;
static RK_S32 user_data_index = -1;
static RK_S32 user_datas_index = -1;
RK_S32 meta_hdr_offset_index = -1;
RK_S32 meta_hdr_size_index = -1;
static void put_meta(MppMetaSrv *srv, MppMetaImpl *meta);
static inline RK_S32 get_index_of_key(MppMetaKey key, MppMetaType type, const char *caller);
#define get_index_of_key_f(key, type) get_index_of_key(key, type, __FUNCTION__);
@ -203,6 +206,8 @@ static void mpp_meta_srv_init()
mpp_trie_add_info(srv->trie, NULL, NULL, 0);
user_data_index = get_index_of_key_f(KEY_USER_DATA, TYPE_UPTR);
user_datas_index = get_index_of_key_f(KEY_USER_DATAS, TYPE_UPTR);
meta_hdr_offset_index = get_index_of_key_f(KEY_HDR_META_OFFSET, TYPE_VAL_32);
meta_hdr_size_index = get_index_of_key_f(KEY_HDR_META_SIZE, TYPE_VAL_32);
}
pool_meta = mpp_mem_pool_init_f("MppMeta", sizeof(MppMetaImpl) +
@ -393,64 +398,6 @@ RK_S32 mpp_meta_size(MppMeta meta)
return MPP_FETCH_ADD(&impl->node_count, 0);
}
MPP_RET mpp_meta_dump(MppMeta meta)
{
MppMetaSrv *srv = get_srv_meta_f();
MppMetaImpl *impl = (MppMetaImpl *)meta;
MppTrieInfo *root;
if (!impl) {
mpp_err_f("found NULL input\n");
return MPP_ERR_NULL_PTR;
}
mpp_logi("dumping meta %d node count %d\n", impl->meta_id, impl->node_count);
if (!srv || !srv->trie)
return MPP_NOK;
root = mpp_trie_get_info_first(srv->trie);
if (root) {
MppTrieInfo *node = root;
const char *key = NULL;
char log_str[256];
RK_S32 pos;
do {
if (mpp_trie_info_is_self(node))
continue;
key = mpp_trie_info_name(node);
pos = snprintf(log_str, sizeof(log_str) - 1, "key %c%c%c%c - ",
key[0], key[1], key[2], key[3]);
switch (key[4]) {
case '3' : {
snprintf(log_str + pos, sizeof(log_str) - pos - 1, "s32 - %d",
impl->vals[node->index].val_s32);
} break;
case '6' : {
snprintf(log_str + pos, sizeof(log_str) - pos - 1, "s64 - %lld",
impl->vals[node->index].val_s64);
} break;
case 'k' :
case 'u' :
case 's' : {
snprintf(log_str + pos, sizeof(log_str) - pos - 1, "ptr - %p",
impl->vals[node->index].val_ptr);
} break;
default : {
} break;
}
mpp_logi("%s\n", log_str);
} while ((node = mpp_trie_get_info_next(srv->trie, node)));
}
return MPP_OK;
}
static MPP_RET set_user_data(MppMetaImpl *impl, void *user_data)
{
MppEncUserData *src = (MppEncUserData *)user_data;
@ -576,6 +523,90 @@ static MPP_RET get_user_datas(MppMetaImpl *impl, void **val)
return MPP_NOK;
}
MppMeta mpp_meta_dup(MppMeta meta)
{
MppMetaSrv *srv = get_srv_meta_f();
MppMetaImpl *impl = (MppMetaImpl *)meta;
MppMetaImpl *ret;
if (!srv || !meta)
return NULL;
ret = get_meta(srv, impl->tag, __FUNCTION__);
if (ret) {
memcpy(ret->vals, impl->vals, meta_key_count * sizeof(MppMetaVal));
if (ret->user_data.len) {
memset(&ret->user_data, 0, sizeof(ret->user_data));
set_user_data(ret, (void *)(intptr_t)&impl->user_data);
}
if (ret->user_data_set.count) {
memset(&ret->user_data, 0, sizeof(ret->user_data));
set_user_datas(impl, (void *)(intptr_t)&impl->user_data_set);
}
ret->node_count = impl->node_count;
}
return ret;
}
MPP_RET mpp_meta_dump(MppMeta meta)
{
MppMetaSrv *srv = get_srv_meta_f();
MppMetaImpl *impl = (MppMetaImpl *)meta;
MppTrieInfo *root;
if (!impl) {
mpp_err_f("found NULL input\n");
return MPP_ERR_NULL_PTR;
}
mpp_logi("dumping meta %d node count %d\n", impl->meta_id, impl->node_count);
if (!srv || !srv->trie)
return MPP_NOK;
root = mpp_trie_get_info_first(srv->trie);
if (root) {
MppTrieInfo *node = root;
const char *key = NULL;
char log_str[256];
RK_S32 pos;
do {
if (mpp_trie_info_is_self(node))
continue;
key = mpp_trie_info_name(node);
pos = snprintf(log_str, sizeof(log_str) - 1, "key %c%c%c%c - ",
key[0], key[1], key[2], key[3]);
switch (key[4]) {
case '3' : {
snprintf(log_str + pos, sizeof(log_str) - pos - 1, "s32 - %d",
impl->vals[node->index].val_s32);
} break;
case '6' : {
snprintf(log_str + pos, sizeof(log_str) - pos - 1, "s64 - %lld",
impl->vals[node->index].val_s64);
} break;
case 'k' :
case 'u' :
case 's' : {
snprintf(log_str + pos, sizeof(log_str) - pos - 1, "ptr - %p",
impl->vals[node->index].val_ptr);
} break;
default : {
} break;
}
mpp_logi("%s\n", log_str);
} while ((node = mpp_trie_get_info_next(srv->trie, node)));
}
return MPP_OK;
}
#define MPP_META_ACCESSOR(func_type, arg_type, key_type, key_field) \
MPP_RET mpp_meta_set_##func_type(MppMeta meta, MppMetaKey key, arg_type val) \
{ \
@ -663,3 +694,23 @@ MPP_META_ACCESSOR(ptr, void *, TYPE_UPTR, val_ptr)
MPP_META_ACCESSOR(frame, MppFrame, TYPE_SPTR, frame)
MPP_META_ACCESSOR(packet, MppPacket, TYPE_SPTR, packet)
MPP_META_ACCESSOR(buffer, MppBuffer, TYPE_SPTR, buffer)
RK_S32 mpp_meta_s32_read(MppMeta meta, RK_S32 index, RK_S32 *val)
{
MppMetaImpl *impl = (MppMetaImpl *)meta;
MppMetaVal *meta_val;
MPP_RET ret = MPP_NOK;
if (!impl || index < 0 || index >= meta_key_count) {
mpp_err_f("found NULL input meta %p index %d\n", meta, index);
return MPP_ERR_NULL_PTR;
}
meta_val = &impl->vals[index];
if (meta_val->state == (META_VAL_VALID | META_VAL_READY)) {
*val = meta_val->val_s32;
ret = MPP_OK;
}
return ret;
}