From fa0d33ab9fd385481df2a932d8439631144f1c21 Mon Sep 17 00:00:00 2001 From: ChenHengming Date: Mon, 6 Jun 2016 12:19:38 +0000 Subject: [PATCH] [osal]: fix mpp_allocator handwriting error git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@878 6e48237b-75ef-9749-8fc9-41990f28c85a --- mpp/base/mpp_buffer_impl.cpp | 6 +++--- osal/inc/mpp_allocator.h | 4 ++-- osal/mpp_allocator.cpp | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mpp/base/mpp_buffer_impl.cpp b/mpp/base/mpp_buffer_impl.cpp index 3e4c0fe3..d82c86b9 100644 --- a/mpp/base/mpp_buffer_impl.cpp +++ b/mpp/base/mpp_buffer_impl.cpp @@ -127,7 +127,7 @@ MPP_RET deinit_group_no_lock(MppBufferGroupImpl *group) group->count_used = 0; } - mpp_alloctor_put(&group->allocator); + mpp_allocator_put(&group->allocator); list_del_init(&group->list_group); mpp_free(group); 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); service.group_count++; - mpp_alloctor_get(&p->allocator, &p->alloc_api, type); + mpp_allocator_get(&p->allocator, &p->alloc_api, type); *group = p; @@ -540,7 +540,7 @@ MppBufferService::MppBufferService() group_id++; 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; } diff --git a/osal/inc/mpp_allocator.h b/osal/inc/mpp_allocator.h index ab680ad3..a958d5eb 100644 --- a/osal/inc/mpp_allocator.h +++ b/osal/inc/mpp_allocator.h @@ -36,8 +36,8 @@ typedef struct MppAllocatorApi_t { extern "C" { #endif -MPP_RET mpp_alloctor_get(MppAllocator *allocator, MppAllocatorApi **api, MppBufferType type); -MPP_RET mpp_alloctor_put(MppAllocator *allocator); +MPP_RET mpp_allocator_get(MppAllocator *allocator, MppAllocatorApi **api, MppBufferType type); +MPP_RET mpp_allocator_put(MppAllocator *allocator); #ifdef __cplusplus } diff --git a/osal/mpp_allocator.cpp b/osal/mpp_allocator.cpp index 0855ef8f..46c66f96 100644 --- a/osal/mpp_allocator.cpp +++ b/osal/mpp_allocator.cpp @@ -109,7 +109,7 @@ static MppAllocatorApi mpp_allocator_api = { 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) { 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); 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; } else p->type = type; @@ -140,7 +140,7 @@ MPP_RET mpp_alloctor_get(MppAllocator *allocator, MppAllocatorApi **api, MppBuff *allocator = p; *api = &mpp_allocator_api; } else { - mpp_err("mpp_alloctor_get type %d failed\n", type); + mpp_err("mpp_allocator_get type %d failed\n", type); mpp_free(p); *allocator = NULL; *api = NULL; @@ -149,7 +149,7 @@ MPP_RET mpp_alloctor_get(MppAllocator *allocator, MppAllocatorApi **api, MppBuff return ret; } -MPP_RET mpp_alloctor_put(MppAllocator *allocator) +MPP_RET mpp_allocator_put(MppAllocator *allocator) { if (NULL == allocator) { mpp_err_f("invalid input: allocator %p\n", allocator);