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

[allocator]: Fix compiler warnings

Browse Source 
Change-Id: I52554a3ca45747c13a7821a04bb1c01e45d9d44c
Signed-off-by: Randy Li <randy.li@rock-chips.com>
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Randy Li
2017-03-10 12:10:40 +08:00
committed by Herman Chen
parent ee41717331
commit 6e32081214
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
osal/mpp_allocator.cpp
View File

@@ -35,7 +35,9 @@ typedef enum OsAllocatorApiId_e {
ALLOC_API_BUTT,
} OsAllocatorApiId;
static MPP_RET mpp_allocator_api_wrapper(MppAllocator allocator, MppBufferInfo *info, OsAllocatorApiId id)
static MPP_RET mpp_allocator_api_wrapper(MppAllocator allocator,
MppBufferInfo *info,
OsAllocatorApiId id)
{
if (NULL == allocator || NULL == info || id >= ALLOC_API_BUTT) {
mpp_err_f("invalid input: allocator %p info %p id %d\n",
@@ -77,42 +79,44 @@ static MPP_RET mpp_allocator_api_wrapper(MppAllocator allocator, MppBufferInfo *
return ret;
}
MPP_RET mpp_allocator_alloc(MppAllocator allocator, MppBufferInfo *info)
static MPP_RET mpp_allocator_alloc(MppAllocator allocator, MppBufferInfo *info)
{
return mpp_allocator_api_wrapper(allocator, info, ALLOC_API_ALLOC);
}
MPP_RET mpp_allocator_free(MppAllocator allocator, MppBufferInfo *info)
static MPP_RET mpp_allocator_free(MppAllocator allocator, MppBufferInfo *info)
{
return mpp_allocator_api_wrapper(allocator, info, ALLOC_API_FREE);
}
MPP_RET mpp_allocator_import(MppAllocator allocator, MppBufferInfo *info)
static MPP_RET mpp_allocator_import(MppAllocator allocator, MppBufferInfo *info)
{
return mpp_allocator_api_wrapper(allocator, info, ALLOC_API_IMPORT);
}
MPP_RET mpp_allocator_release(MppAllocator allocator, MppBufferInfo *info)
static MPP_RET mpp_allocator_release(MppAllocator allocator,
MppBufferInfo *info)
{
return mpp_allocator_api_wrapper(allocator, info, ALLOC_API_RELEASE);
}
MPP_RET mpp_allocator_mmap(MppAllocator allocator, MppBufferInfo *info)
static MPP_RET mpp_allocator_mmap(MppAllocator allocator, MppBufferInfo *info)
{
return mpp_allocator_api_wrapper(allocator, info, ALLOC_API_MMAP);
}
static MppAllocatorApi mpp_allocator_api = {
sizeof(mpp_allocator_api),
1,
mpp_allocator_alloc,
mpp_allocator_free,
mpp_allocator_import,
mpp_allocator_release,
mpp_allocator_mmap,
.size = sizeof(mpp_allocator_api),
.version = 1,
.alloc = mpp_allocator_alloc,
.free = mpp_allocator_free,
.import = mpp_allocator_import,
.release = mpp_allocator_release,
.mmap = mpp_allocator_mmap,
};
MPP_RET mpp_allocator_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",