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

[mpp_buffer]: change buffer group function name to internal/external

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@342 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2015-10-09 23:38:46 +00:00
parent ea3f8b6f0d
commit 8ebb8eb139
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
inc/mpp_buffer.h
View File

@@ -184,10 +184,10 @@ typedef struct MppBufferInfo_t {
#define mpp_buffer_get(...) \ #define mpp_buffer_get(...) \
mpp_buffer_get_with_tag(MODULE_TAG, ## __VA_ARGS__) mpp_buffer_get_with_tag(MODULE_TAG, ## __VA_ARGS__)
#define mpp_buffer_group_normal_get(...) \ #define mpp_buffer_group_get_internal(...) \
mpp_buffer_group_get(MODULE_TAG, MPP_BUFFER_INTERNAL, ## __VA_ARGS__) mpp_buffer_group_get(MODULE_TAG, MPP_BUFFER_INTERNAL, ## __VA_ARGS__)
#define mpp_buffer_group_limited_get(...) \ #define mpp_buffer_group_get_external(...) \
mpp_buffer_group_get(MODULE_TAG, MPP_BUFFER_EXTERNAL, ## __VA_ARGS__) mpp_buffer_group_get(MODULE_TAG, MPP_BUFFER_EXTERNAL, ## __VA_ARGS__)
#ifdef __cplusplus #ifdef __cplusplus

4
mpp/codec/dec/h265/test/h265d_parser_test.c
View File

@@ -323,7 +323,7 @@ RK_S32 hevc_parser_test(ParserDemoCmdContext_t *cmd)
return MPP_ERR_UNKNOW; return MPP_ERR_UNKNOW;
} }
if (mFrameGroup == NULL) { if (mFrameGroup == NULL) {
ret = mpp_buffer_group_normal_get(&mFrameGroup, MPP_BUFFER_TYPE_ION); ret = mpp_buffer_group_get_internal(&mFrameGroup, MPP_BUFFER_TYPE_ION);
if (MPP_OK != ret) { if (MPP_OK != ret) {
mpp_err("h265d mpp_buffer_group_get failed\n"); mpp_err("h265d mpp_buffer_group_get failed\n");
return ret; return ret;
@@ -332,7 +332,7 @@ RK_S32 hevc_parser_test(ParserDemoCmdContext_t *cmd)
} }
if (mStreamGroup == NULL) { if (mStreamGroup == NULL) {
ret = mpp_buffer_group_normal_get(&mStreamGroup, MPP_BUFFER_TYPE_ION); ret = mpp_buffer_group_get_internal(&mStreamGroup, MPP_BUFFER_TYPE_ION);
if (MPP_OK != ret) { if (MPP_OK != ret) {
mpp_err("h265d mpp_buffer_group_get failed\n"); mpp_err("h265d mpp_buffer_group_get failed\n");
return ret; return ret;

6
mpp/hal/rkdec/h265d/hal_h265d_reg.c
View File

@@ -270,10 +270,10 @@ MPP_RET hal_h265d_init(void *hal, MppHalCfg *cfg)
if (reg_cxt->group == NULL) { if (reg_cxt->group == NULL) {
#ifdef ANDROID #ifdef ANDROID
mpp_err("mpp_buffer_group_normal_get used ion in"); mpp_err("mpp_buffer_group_get_internal used ion in");
ret = mpp_buffer_group_normal_get(&reg_cxt->group, MPP_BUFFER_TYPE_ION); ret = mpp_buffer_group_get_internal(&reg_cxt->group, MPP_BUFFER_TYPE_ION);
#else #else
ret = mpp_buffer_group_normal_get(&reg_cxt->group, MPP_BUFFER_TYPE_NORMAL); ret = mpp_buffer_group_get_internal(&reg_cxt->group, MPP_BUFFER_TYPE_NORMAL);
#endif #endif
if (MPP_OK != ret) { if (MPP_OK != ret) {
mpp_err("h265d mpp_buffer_group_get failed\n"); mpp_err("h265d mpp_buffer_group_get failed\n");

4
test/mpp_buffer_test.c
View File

@@ -43,7 +43,7 @@ int main()
memset(commit_buffer, 0, sizeof(commit_buffer)); memset(commit_buffer, 0, sizeof(commit_buffer));
memset(normal_buffer, 0, sizeof(normal_buffer)); memset(normal_buffer, 0, sizeof(normal_buffer));
ret = mpp_buffer_group_limited_get(&group, MPP_BUFFER_TYPE_NORMAL); ret = mpp_buffer_group_get_external(&group, MPP_BUFFER_TYPE_NORMAL);
if (MPP_OK != ret) { if (MPP_OK != ret) {
mpp_err("mpp_buffer_test mpp_buffer_group_get failed\n"); mpp_err("mpp_buffer_test mpp_buffer_group_get failed\n");
goto MPP_BUFFER_failed; goto MPP_BUFFER_failed;
@@ -102,7 +102,7 @@ int main()
mpp_log("mpp_buffer_test normal mode start\n"); mpp_log("mpp_buffer_test normal mode start\n");
ret = mpp_buffer_group_normal_get(&group, MPP_BUFFER_TYPE_ION); ret = mpp_buffer_group_get_internal(&group, MPP_BUFFER_TYPE_ION);
if (MPP_OK != ret) { if (MPP_OK != ret) {
mpp_err("mpp_buffer_test mpp_buffer_group_get failed\n"); mpp_err("mpp_buffer_test mpp_buffer_group_get failed\n");
goto MPP_BUFFER_failed; goto MPP_BUFFER_failed;