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

[osal]: fix mpp_allocator handwriting error

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@878 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2016-06-06 12:19:38 +00:00
parent fe50b2ba45
commit fa0d33ab9f
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mpp/base/mpp_buffer_impl.cpp
View File

@@ -127,7 +127,7 @@ MPP_RET deinit_group_no_lock(MppBufferGroupImpl *group)
group->count_used = 0; group->count_used = 0;
} }
mpp_alloctor_put(&group->allocator); mpp_allocator_put(&group->allocator);
list_del_init(&group->list_group); list_del_init(&group->list_group);
mpp_free(group); mpp_free(group);
service.group_count--; service.group_count--;
@@ -383,7 +383,7 @@ MPP_RET mpp_buffer_group_init(MppBufferGroupImpl **group, const char *tag, const
} while (p->group_id != service.group_id); } while (p->group_id != service.group_id);
service.group_count++; service.group_count++;
mpp_alloctor_get(&p->allocator, &p->alloc_api, type); mpp_allocator_get(&p->allocator, &p->alloc_api, type);
*group = p; *group = p;
@@ -540,7 +540,7 @@ MppBufferService::MppBufferService()
group_id++; group_id++;
group_count++; group_count++;
mpp_alloctor_get(&p->allocator, &p->alloc_api, MPP_BUFFER_TYPE_ION); mpp_allocator_get(&p->allocator, &p->alloc_api, MPP_BUFFER_TYPE_ION);
mLegacyGroup = p; mLegacyGroup = p;
} }

4
osal/inc/mpp_allocator.h
View File

@@ -36,8 +36,8 @@ typedef struct MppAllocatorApi_t {
extern "C" { extern "C" {
#endif #endif
MPP_RET mpp_alloctor_get(MppAllocator *allocator, MppAllocatorApi **api, MppBufferType type); MPP_RET mpp_allocator_get(MppAllocator *allocator, MppAllocatorApi **api, MppBufferType type);
MPP_RET mpp_alloctor_put(MppAllocator *allocator); MPP_RET mpp_allocator_put(MppAllocator *allocator);
#ifdef __cplusplus #ifdef __cplusplus
} }

8
osal/mpp_allocator.cpp
View File

@@ -109,7 +109,7 @@ static MppAllocatorApi mpp_allocator_api = {
mpp_allocator_release, mpp_allocator_release,
}; };
MPP_RET mpp_alloctor_get(MppAllocator *allocator, MppAllocatorApi **api, MppBufferType type) MPP_RET mpp_allocator_get(MppAllocator *allocator, MppAllocatorApi **api, MppBufferType type)
{ {
if (NULL == allocator || NULL == api || type >= MPP_BUFFER_TYPE_BUTT) { if (NULL == allocator || NULL == api || type >= MPP_BUFFER_TYPE_BUTT) {
mpp_err_f("invalid input: allocator %p api %p type %d\n", mpp_err_f("invalid input: allocator %p api %p type %d\n",
@@ -119,7 +119,7 @@ MPP_RET mpp_alloctor_get(MppAllocator *allocator, MppAllocatorApi **api, MppBuff
MppAllocatorImpl *p = mpp_malloc(MppAllocatorImpl, 1); MppAllocatorImpl *p = mpp_malloc(MppAllocatorImpl, 1);
if (NULL == p) { if (NULL == p) {
mpp_err("mpp_alloctor_get failed to malloc allocator context\n"); mpp_err("mpp_allocator_get failed to malloc allocator context\n");
return MPP_ERR_NULL_PTR; return MPP_ERR_NULL_PTR;
} else } else
p->type = type; p->type = type;
@@ -140,7 +140,7 @@ MPP_RET mpp_alloctor_get(MppAllocator *allocator, MppAllocatorApi **api, MppBuff
*allocator = p; *allocator = p;
*api = &mpp_allocator_api; *api = &mpp_allocator_api;
} else { } else {
mpp_err("mpp_alloctor_get type %d failed\n", type); mpp_err("mpp_allocator_get type %d failed\n", type);
mpp_free(p); mpp_free(p);
*allocator = NULL; *allocator = NULL;
*api = NULL; *api = NULL;
@@ -149,7 +149,7 @@ MPP_RET mpp_alloctor_get(MppAllocator *allocator, MppAllocatorApi **api, MppBuff
return ret; return ret;
} }
MPP_RET mpp_alloctor_put(MppAllocator *allocator) MPP_RET mpp_allocator_put(MppAllocator *allocator)
{ {
if (NULL == allocator) { if (NULL == allocator) {
mpp_err_f("invalid input: allocator %p\n", allocator); mpp_err_f("invalid input: allocator %p\n", allocator);