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

[mpp_meta]: fix possible error in mpp_meta and mpp_buffer

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@1034 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2016-07-16 10:12:11 +00:00
parent a31103d3f0
commit 947da74b5d
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mpp/base/mpp_buffer_impl.cpp
View File

@@ -677,7 +677,7 @@ void MppBufferService::destroy_group(MppBufferGroupImpl *group)
misc_ion_int = NULL; misc_ion_int = NULL;
} else { } else {
/* if only legacy group left dump the legacy group */ /* if only legacy group left dump the legacy group */
if (group_count == 1 && misc_ion_int->buffer_count) { if (group_count == 1 && misc_ion_int && misc_ion_int->buffer_count) {
mpp_log("found legacy group has buffer remain, start dumping\n"); mpp_log("found legacy group has buffer remain, start dumping\n");
mpp_buffer_group_dump(misc_ion_int); mpp_buffer_group_dump(misc_ion_int);
abort(); abort();

25
mpp/base/mpp_meta.cpp
View File

@@ -114,6 +114,7 @@ public:
MppMetaNode *get_node(MppMetaImpl *meta, RK_S32 index); MppMetaNode *get_node(MppMetaImpl *meta, RK_S32 index);
void put_node(MppMetaNode *node); void put_node(MppMetaNode *node);
MppMetaNode *find_node(MppMetaImpl *meta, RK_S32 index);
}; };
MppMetaService::MppMetaService() MppMetaService::MppMetaService()
@@ -182,7 +183,7 @@ MppMetaImpl *MppMetaService::get_meta(const char *tag, const char *caller)
void MppMetaService::put_meta(MppMetaImpl *meta) void MppMetaService::put_meta(MppMetaImpl *meta)
{ {
while (meta->node_count) { while (!list_empty(&meta->list_node)) {
MppMetaNode *node = list_entry(meta->list_node.next, MppMetaNode, list_meta); MppMetaNode *node = list_entry(meta->list_node.next, MppMetaNode, list_meta);
put_node(node); put_node(node);
meta->node_count--; meta->node_count--;
@@ -192,19 +193,27 @@ void MppMetaService::put_meta(MppMetaImpl *meta)
mpp_free(meta); mpp_free(meta);
} }
MppMetaNode *MppMetaService::get_node(MppMetaImpl *meta, RK_S32 type_id) MppMetaNode *MppMetaService::find_node(MppMetaImpl *meta, RK_S32 type_id)
{ {
MppMetaNode *node = NULL; MppMetaNode *node = NULL;
if (meta->node_count) { if (meta->node_count) {
MppMetaNode *n, *pos; MppMetaNode *n, *pos;
list_for_each_entry_safe(pos, n, &meta->list_node, MppMetaNode, list_node) { list_for_each_entry_safe(pos, n, &meta->list_node, MppMetaNode, list_meta) {
if (pos->type_id == type_id) { if (pos->type_id == type_id) {
node = pos; node = pos;
break; break;
} }
} }
} else { }
return node;
}
MppMetaNode *MppMetaService::get_node(MppMetaImpl *meta, RK_S32 type_id)
{
MppMetaNode *node = find_node(meta, type_id);
if (NULL == node) {
node = mpp_malloc(MppMetaNode, 1); node = mpp_malloc(MppMetaNode, 1);
if (node) { if (node) {
INIT_LIST_HEAD(&node->list_meta); INIT_LIST_HEAD(&node->list_meta);
@@ -236,13 +245,13 @@ void MppMetaService::put_node(MppMetaNode *node)
// TODO: may be we need to release MppFrame / MppPacket / MppBuffer here // TODO: may be we need to release MppFrame / MppPacket / MppBuffer here
switch (meta_defs[node->type_id].type) { switch (meta_defs[node->type_id].type) {
case MPP_META_TYPE_FRAME : { case MPP_META_TYPE_FRAME : {
mpp_frame_deinit(&node->val.frame); // mpp_frame_deinit(&node->val.frame);
} break; } break;
case MPP_META_TYPE_PACKET : { case MPP_META_TYPE_PACKET : {
mpp_packet_deinit(&node->val.packet); // mpp_packet_deinit(&node->val.packet);
} break; } break;
case MPP_META_TYPE_BUFFER : { case MPP_META_TYPE_BUFFER : {
mpp_buffer_put(node->val.buffer); //mpp_buffer_put(node->val.buffer);
} break; } break;
default : { default : {
} break; } break;
@@ -304,7 +313,7 @@ static MPP_RET get_val_by_key(MppMetaImpl *meta, MppMetaKey key, MppMetaType typ
if (index < 0) if (index < 0)
return ret; return ret;
MppMetaNode *node = service->get_node(meta, index); MppMetaNode *node = service->find_node(meta, index);
if (node) { if (node) {
*val = node->val; *val = node->val;
ret = MPP_OK; ret = MPP_OK;