From 8ebb8eb139f1f54c533c413c5ea533f5d10c8c0f Mon Sep 17 00:00:00 2001 From: ChenHengming Date: Fri, 9 Oct 2015 23:38:46 +0000 Subject: [PATCH] [mpp_buffer]: change buffer group function name to internal/external git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@342 6e48237b-75ef-9749-8fc9-41990f28c85a --- inc/mpp_buffer.h | 4 ++-- mpp/codec/dec/h265/test/h265d_parser_test.c | 4 ++-- mpp/hal/rkdec/h265d/hal_h265d_reg.c | 6 +++--- test/mpp_buffer_test.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/inc/mpp_buffer.h b/inc/mpp_buffer.h index 0aa38210..f1f61170 100644 --- a/inc/mpp_buffer.h +++ b/inc/mpp_buffer.h @@ -184,10 +184,10 @@ typedef struct MppBufferInfo_t { #define mpp_buffer_get(...) \ 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__) -#define mpp_buffer_group_limited_get(...) \ +#define mpp_buffer_group_get_external(...) \ mpp_buffer_group_get(MODULE_TAG, MPP_BUFFER_EXTERNAL, ## __VA_ARGS__) #ifdef __cplusplus diff --git a/mpp/codec/dec/h265/test/h265d_parser_test.c b/mpp/codec/dec/h265/test/h265d_parser_test.c index 2d9c427d..570b3b4d 100644 --- a/mpp/codec/dec/h265/test/h265d_parser_test.c +++ b/mpp/codec/dec/h265/test/h265d_parser_test.c @@ -323,7 +323,7 @@ RK_S32 hevc_parser_test(ParserDemoCmdContext_t *cmd) return MPP_ERR_UNKNOW; } 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) { mpp_err("h265d mpp_buffer_group_get failed\n"); return ret; @@ -332,7 +332,7 @@ RK_S32 hevc_parser_test(ParserDemoCmdContext_t *cmd) } 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) { mpp_err("h265d mpp_buffer_group_get failed\n"); return ret; diff --git a/mpp/hal/rkdec/h265d/hal_h265d_reg.c b/mpp/hal/rkdec/h265d/hal_h265d_reg.c index fd02b487..2308f1df 100644 --- a/mpp/hal/rkdec/h265d/hal_h265d_reg.c +++ b/mpp/hal/rkdec/h265d/hal_h265d_reg.c @@ -270,10 +270,10 @@ MPP_RET hal_h265d_init(void *hal, MppHalCfg *cfg) if (reg_cxt->group == NULL) { #ifdef ANDROID - mpp_err("mpp_buffer_group_normal_get used ion in"); - ret = mpp_buffer_group_normal_get(®_cxt->group, MPP_BUFFER_TYPE_ION); + mpp_err("mpp_buffer_group_get_internal used ion in"); + ret = mpp_buffer_group_get_internal(®_cxt->group, MPP_BUFFER_TYPE_ION); #else - ret = mpp_buffer_group_normal_get(®_cxt->group, MPP_BUFFER_TYPE_NORMAL); + ret = mpp_buffer_group_get_internal(®_cxt->group, MPP_BUFFER_TYPE_NORMAL); #endif if (MPP_OK != ret) { mpp_err("h265d mpp_buffer_group_get failed\n"); diff --git a/test/mpp_buffer_test.c b/test/mpp_buffer_test.c index d7d0ba5d..a6e139a8 100644 --- a/test/mpp_buffer_test.c +++ b/test/mpp_buffer_test.c @@ -43,7 +43,7 @@ int main() memset(commit_buffer, 0, sizeof(commit_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) { mpp_err("mpp_buffer_test mpp_buffer_group_get failed\n"); goto MPP_BUFFER_failed; @@ -102,7 +102,7 @@ int main() 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) { mpp_err("mpp_buffer_test mpp_buffer_group_get failed\n"); goto MPP_BUFFER_failed;