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

[osal/android]: fix ion heap id on 5.1

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@147 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2015-08-21 07:23:29 +00:00
parent 9e5b83bc72
commit 11a263d3a6
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osal/android/os_allocator.c
View File

@@ -28,7 +28,7 @@
#include "mpp_log.h"
typedef struct {
RK_U32 alignment;
RK_U32 alignment;
} allocator_ctx_normal;
MPP_RET os_allocator_normal_open(void **ctx, size_t alignment)
@@ -169,8 +169,9 @@ static int ion_map(int fd, ion_user_handle_t handle, size_t length, int prot,
}
typedef struct {
RK_U32 alignment;
RK_S32 ion_device;
RK_U32 alignment;
RK_S32 ion_device;
RK_U32 heap_id;
} allocator_ctx_ion;
MPP_RET os_allocator_ion_open(void **ctx, size_t alignment)
@@ -201,6 +202,7 @@ MPP_RET os_allocator_ion_open(void **ctx, size_t alignment)
} else {
p->alignment = alignment;
p->ion_device = fd;
p->heap_id = ION_HEAP_TYPE_SYSTEM_CONTIG; /* ION_HEAP_TYPE_CARVEOUT */
*ctx = p;
}
@@ -219,7 +221,7 @@ MPP_RET os_allocator_ion_alloc(void *ctx, MppBufferInfo *info)
p = (allocator_ctx_ion *)ctx;
ret = ion_alloc(p->ion_device, info->size, p->alignment,
ION_HEAP_TYPE_CARVEOUT, 0,
p->heap_id, 0,
(ion_user_handle_t *)&info->hnd);
if (ret) {
mpp_err("os_allocator_ion_alloc ion_alloc failed ret %d\n", ret);