Commit Graph

47 Commits

Author SHA1 Message Date
Herman Chen
6d059f65bf [osal]: Change mpp_env string interface
Set get environment string parameter to const char to avoid modification.

Change-Id: Ib5308407fcac2fa58b194fb8df33380efc1487f9
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
2018-08-03 17:44:55 +08:00
Randy Li
a78598dab5 [osal]: add new buffer type for DMA import buffer
This buffer type is used for the buffer coming from the
application, the application should make sure those
buffers are the dma buffer.

Change-Id: I2c8491f4dea77e5d7ae8d9157b0a1eda204f4bd6
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2018-04-27 17:20:32 +08:00
Herman Chen
321b95ad4d [allocator]: Use auto detect on Android and Linux
There is case that Android 7.1+3.10 kernel without drm and also
Android 7.1+4.4 kernel with both drm and ion.
Use the runtime function to support both of them.

This patch needs more test.

Change-Id: I53f0a30abf057f8e0e6e122e09782896d4789168
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
2017-12-18 15:15:07 +08:00
sliver.chen
5a830697a8 [osal]: force mpp use drm buffer when HAVE_DRM are defined.
Force allocator use drm buffer,otherwise user will get a tuntime error
when they use kernel without /dev/ion.

Change-Id: I8151b743a9b19a03716dec3bdb909ce91b6af0b6
Signed-off-by: sliver.chen <sliver.chen@rock-chips.com>
2017-11-08 17:13:36 +08:00
Randy Li
5fa4ff0d48 [osal]: match system implementation with compiler marco
It would make the build system more simple, and the cross
toolchains would do the rest to you.

Toolchains like buildroot default not enable the __gnu_linux__
marco in the pre-processor will surfure from the systsm unknown
problem. You should enable the marco in building toolchains
or have a look on those scripts in build directory.

Change-Id: I8f6af3391aa3d94d602ec8d84ba5e43839859169
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2017-05-04 14:29:29 +08:00
Herman Chen
e2f0da0a89 [allocator]: Transform allocator normal to std
1. Use allocator std to replace default normal allocator on all OS.
2. Use wrapper to simplify mpp_allocator.

Change-Id: I13314a9eec3c5b39bc5ad8ddb3033ac2da79ba8f
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
2016-12-15 17:20:14 +08:00
Jung Zhao
deb649610c [drm]: add macro control in os_allocator.c
1. fix compiling error of previous commit
2. can enable drm on x86 pc linux platform

Change-Id: I06271fe0efcaa7de2531c7fb3e21bf9c75781beb
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
2016-10-07 17:37:05 +08:00
Lin Kesheng
60373a6973 [all]: format code
use fromdos to change file type, remove ^M in code.

Change-Id: I000202dc51fcff57cc0771455baebea595115b1d
Signed-off-by: Lin Kesheng <lks@rock-chips.com>
2016-09-08 15:21:02 +08:00
Jung Zhao
70e2ebdb2b [drm]: add android drm allocator support
1. enable drm allocator in android
2. modify size calculating when alloc

Todo: wait for new interface of kernel to decide
use whether drm or ion as allocator

Change-Id: Ia6791d91d113b238be77088ae747012fb786d683
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
2016-08-29 14:26:49 +08:00
ChenHengming
c9d4080335 [mpp_buffer]: fix mpp_buffer_test error on Android for normal buffer can not be import/release
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@971 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-07-01 04:48:52 +00:00
ChenHengming
c0866a76f9 [comment]: fix company name hand writing error
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@906 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-06-13 09:42:31 +00:00
ChenHengming
788ae5dd63 [osal]: remove extra header in os_allocator.c
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@859 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-06-01 10:51:07 +00:00
ChenHengming
d4b871ef15 [oasl]: move ion allocator to new directory for linux reuse
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@808 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-05-24 08:41:18 +00:00
ChenHengming
eca41f1d49 [android]: remove compile warning
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@744 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-05-12 09:54:47 +00:00
ChenSiyong
526b4c9388 [android os alloc] no used posix_memalign in android may be cause mem leak,when mem no align
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@720 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-05-11 04:35:00 +00:00
DingWei
a9b5219f97 [h264d] 1.h264d_init picbuf => refpic; astyle format
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@591 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-03-18 03:51:32 +00:00
ChenHengming
38adb66e64 [android]: add ion heap detect type for rk3188 which do not have dts
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@587 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-03-17 07:54:48 +00:00
ChenHengming
8813d376c8 [android]: detect ion heap using sysfs proc infomation
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@562 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-01-30 07:39:33 +00:00
ChenHengming
41ab4b3b05 [android]: set default android ion heap to vmalloc heap
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@553 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-01-29 02:18:51 +00:00
ChenHengming
75c4f0b8ac [android]: use new ioctl to detect heap status
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@551 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-01-28 01:18:05 +00:00
ChenHengming
569d932fa1 [android]: add default heap mask to avoid racing condition
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@550 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-01-27 03:42:22 +00:00
ChenHengming
90f94f05ba [android]: add ion heap detection to android os_allocator
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@549 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-01-27 03:15:47 +00:00
ChenSiyong
be686dfd38 [android ion all]: fix allocator_ctx_ion no free when alloc close
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@522 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-01-05 03:02:46 +00:00
ChenHengming
d4924d3143 [ion_allocator]: dup fd when import ion handle, do not use the original handle
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@379 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-10-13 21:08:44 +00:00
ChenHengming
e3f49b11aa [allocator]: add import and release function to os/mpp allocator
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@339 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-10-09 21:59:41 +00:00
ChenHengming
d9644ded0e [mpp_log]: change mpp_dbg to _mpp_dbg, redefine new mpp_dbg
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@174 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-28 01:55:19 +00:00
ChenHengming
8249f27074 [astyle]: format coding style
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@170 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-27 08:05:56 +00:00
ChenHengming
11a263d3a6 [osal/android]: fix ion heap id on 5.1
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@147 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-21 07:23:29 +00:00
ChenHengming
8848e46814 [mpp_buffer]: add ion to mpp_buffer test, start debug ion error path
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@145 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-21 06:49:35 +00:00
ChenHengming
aa58d818ce [osal]: add ion on android os_allocator
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@144 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-21 03:45:18 +00:00
ChenHengming
15eb6c5893 [osal/mpp_buffer]: remove MppBufferData and add MppBufferInfo for user interface, tested on window and linux
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@142 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-21 02:48:01 +00:00
ChenHengming
805db6b02d [osal]: add NORMAL path on android
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@140 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-20 10:31:45 +00:00
ChenHengming
505e4dd8ae [osal]: add allocator type to MppBufferAllocator, passed on window and linux
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@139 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-20 10:03:38 +00:00
ChenHengming
e679ce5d19 [astyle]: astyle format
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@138 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-20 09:42:06 +00:00
ChenHengming
2ac248839b [osal]: change mpp_buffer working flow and buffer limitation interface
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@136 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-20 09:39:01 +00:00
ChenHengming
77632b3fa8 [android]: add ion open/close function
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@135 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-20 03:53:32 +00:00
ChenHengming
2e5aafaf44 [osal]: add normal mode mpp_buffer path to test and fix a lot of bug
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@134 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-20 03:23:36 +00:00
ChenHengming
e78f44b2fb [osal]: fix os_allocator on Android
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@133 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-20 01:39:59 +00:00
ChenHengming
f22f5635ab [osal]: add mpp_allocator and os_allocator for mpp_buffer
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@130 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-19 10:37:38 +00:00
ChenHengming
e07bf014e2 [osal]: rename os_malloc.h to os_mem.h
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@99 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-13 09:22:51 +00:00
ChenHengming
e80180c728 [mpp_mem]: add mpp_realloc function
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@98 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-13 09:15:31 +00:00
ChenHengming
3057548e07 [format]: use astyle to format all source file
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@96 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-13 02:26:39 +00:00
ChenHengming
367fa3d4e7 [mpp_mem]: rename os_malloc to os_men
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@64 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-07 10:17:51 +00:00
ChenHengming
1fe9a769fc [rk_env]: add default value to env_get function
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@35 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-05 08:46:46 +00:00
ChenHengming
e3c0fc8412 [os_env/android]: add android os_env implementation
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@33 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-05 07:55:35 +00:00
ChenHengming
0fe3d16246 [rk_malloc]: add rk_malloc on Android
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@29 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-05 02:26:32 +00:00
ChenHengming
f4b2a20b30 [osal/android]: add log functioin on Android
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@24 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-04 07:25:51 +00:00