starred/mpp-nyanmisaka
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2026-01-24 01:20:40 +01:00
Code Issues Projects Packages Wiki Activity Actions

chore[mpp]: Rename some enum and macro

Browse source 
1. Rename enum MppCfgType_e
2. Rename enum CfgType_e
3. Rename macro MPP_CFG_SET_xxx and MPP_CFG_GET_xxx

Signed-off-by: xiaoxu.chen <xiaoxu.chen@rock-chips.com>
Change-Id: I2056ac6bd17f480eff9cb6442bc0de85e0a0e0a9
This commit is contained in:
xiaoxu.chen 2025-10-28 16:35:39 +08:00 • committed by Herman Chen
parent 47f66b60a3
commit 647da8e0d1
7 changed files with 126 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mpp/base/inc/mpp_cfg_io.h
View file

@ -18,12 +18,12 @@ typedef enum MppCfgType_e {
/* leaf type must with name */
MPP_CFG_TYPE_BOOL,
MPP_CFG_TYPE_S32,
MPP_CFG_TYPE_U32,
MPP_CFG_TYPE_S64,
MPP_CFG_TYPE_U64,
MPP_CFG_TYPE_F32,
MPP_CFG_TYPE_F64,
MPP_CFG_TYPE_s32,
MPP_CFG_TYPE_u32,
MPP_CFG_TYPE_s64,
MPP_CFG_TYPE_u64,
MPP_CFG_TYPE_f32,
MPP_CFG_TYPE_f64,
MPP_CFG_TYPE_STRING,
MPP_CFG_TYPE_RAW,

12
mpp/base/mpp_cfg.c
View file

@ -128,7 +128,7 @@ MPP_RET check_cfg_info(MppCfgInfo *node, const char *name, CfgType type,
MPP_RET ret = MPP_OK;
switch (type) {
case CFG_FUNC_TYPE_St : {
case CFG_FUNC_TYPE_st : {
if (cfg_type != type) {
show_cfg_info_err(node, type, func, name);
ret = MPP_NOK;
@ -138,21 +138,21 @@ MPP_RET check_cfg_info(MppCfgInfo *node, const char *name, CfgType type,
ret = MPP_NOK;
}
} break;
case CFG_FUNC_TYPE_Ptr : {
case CFG_FUNC_TYPE_ptr : {
if (cfg_type != type) {
show_cfg_info_err(node, type, func, name);
ret = MPP_NOK;
}
} break;
case CFG_FUNC_TYPE_S32 :
case CFG_FUNC_TYPE_U32 : {
case CFG_FUNC_TYPE_s32 :
case CFG_FUNC_TYPE_u32 : {
if (cfg_size != sizeof(RK_S32)) {
show_cfg_info_err(node, type, func, name);
ret = MPP_NOK;
}
} break;
case CFG_FUNC_TYPE_S64 :
case CFG_FUNC_TYPE_U64 : {
case CFG_FUNC_TYPE_s64 :
case CFG_FUNC_TYPE_u64 : {
if (cfg_size != sizeof(RK_S64)) {
show_cfg_info_err(node, type, func, name);
ret = MPP_NOK;

112
mpp/base/mpp_cfg_io.c
View file

@ -111,12 +111,12 @@ static const char *strof_type(MppCfgType type)
[MPP_CFG_TYPE_INVALID] = "invalid",
[MPP_CFG_TYPE_NULL] = "null",
[MPP_CFG_TYPE_BOOL] = "bool",
[MPP_CFG_TYPE_S32] = "s32",
[MPP_CFG_TYPE_U32] = "u32",
[MPP_CFG_TYPE_S64] = "s64",
[MPP_CFG_TYPE_U64] = "u64",
[MPP_CFG_TYPE_F32] = "f32",
[MPP_CFG_TYPE_F64] = "f64",
[MPP_CFG_TYPE_s32] = "s32",
[MPP_CFG_TYPE_u32] = "u32",
[MPP_CFG_TYPE_s64] = "s64",
[MPP_CFG_TYPE_u64] = "u64",
[MPP_CFG_TYPE_f32] = "f32",
[MPP_CFG_TYPE_f64] = "f64",
[MPP_CFG_TYPE_STRING] = "string",
[MPP_CFG_TYPE_RAW] = "raw",
[MPP_CFG_TYPE_OBJECT] = "object",
@ -557,17 +557,17 @@ rk_s32 mpp_cfg_set_info(MppCfgObj obj, MppCfgInfo *info)
memcpy(&impl->info, info, sizeof(impl->info));
switch (info->data_type) {
case CFG_FUNC_TYPE_S32 : {
impl->type = MPP_CFG_TYPE_S32;
case CFG_FUNC_TYPE_s32 : {
impl->type = MPP_CFG_TYPE_s32;
} break;
case CFG_FUNC_TYPE_U32 : {
impl->type = MPP_CFG_TYPE_U32;
case CFG_FUNC_TYPE_u32 : {
impl->type = MPP_CFG_TYPE_u32;
} break;
case CFG_FUNC_TYPE_S64 : {
impl->type = MPP_CFG_TYPE_S64;
case CFG_FUNC_TYPE_s64 : {
impl->type = MPP_CFG_TYPE_s64;
} break;
case CFG_FUNC_TYPE_U64 : {
impl->type = MPP_CFG_TYPE_U64;
case CFG_FUNC_TYPE_u64 : {
impl->type = MPP_CFG_TYPE_u64;
} break;
default : {
} break;
@ -851,22 +851,22 @@ static rk_s32 mpp_cfg_to_log(MppCfgIoImpl *impl, MppCfgStrBuf *str)
case MPP_CFG_TYPE_BOOL : {
len += snprintf(buf + len, total - len, "%s\n", impl->val.b1 ? "true" : "false");
} break;
case MPP_CFG_TYPE_S32 : {
case MPP_CFG_TYPE_s32 : {
len += snprintf(buf + len, total - len, "%d\n", impl->val.s32);
} break;
case MPP_CFG_TYPE_U32 : {
case MPP_CFG_TYPE_u32 : {
len += snprintf(buf + len, total - len, "%u\n", impl->val.u32);
} break;
case MPP_CFG_TYPE_S64 : {
case MPP_CFG_TYPE_s64 : {
len += snprintf(buf + len, total - len, "%lld\n", impl->val.s64);
} break;
case MPP_CFG_TYPE_U64 : {
case MPP_CFG_TYPE_u64 : {
len += snprintf(buf + len, total - len, "%llu\n", impl->val.u64);
} break;
case MPP_CFG_TYPE_F32 : {
case MPP_CFG_TYPE_f32 : {
len += snprintf(buf + len, total - len, "%f\n", impl->val.f32);
} break;
case MPP_CFG_TYPE_F64 : {
case MPP_CFG_TYPE_f64 : {
len += snprintf(buf + len, total - len, "%lf\n", impl->val.f64);
} break;
case MPP_CFG_TYPE_STRING :
@ -942,22 +942,22 @@ static rk_s32 mpp_cfg_to_json(MppCfgIoImpl *impl, MppCfgStrBuf *str)
case MPP_CFG_TYPE_BOOL : {
len += snprintf(buf + len, total - len, "%s,\n", impl->val.b1 ? "true" : "false");
} break;
case MPP_CFG_TYPE_S32 : {
case MPP_CFG_TYPE_s32 : {
len += snprintf(buf + len, total - len, "%d,\n", impl->val.s32);
} break;
case MPP_CFG_TYPE_U32 : {
case MPP_CFG_TYPE_u32 : {
len += snprintf(buf + len, total - len, "%u,\n", impl->val.u32);
} break;
case MPP_CFG_TYPE_S64 : {
case MPP_CFG_TYPE_s64 : {
len += snprintf(buf + len, total - len, "%lld,\n", impl->val.s64);
} break;
case MPP_CFG_TYPE_U64 : {
case MPP_CFG_TYPE_u64 : {
len += snprintf(buf + len, total - len, "%llu,\n", impl->val.u64);
} break;
case MPP_CFG_TYPE_F32 : {
case MPP_CFG_TYPE_f32 : {
len += snprintf(buf + len, total - len, "%f,\n", impl->val.f32);
} break;
case MPP_CFG_TYPE_F64 : {
case MPP_CFG_TYPE_f64 : {
len += snprintf(buf + len, total - len, "%lf,\n", impl->val.f64);
} break;
case MPP_CFG_TYPE_STRING :
@ -1081,22 +1081,22 @@ static rk_s32 mpp_cfg_to_toml(MppCfgIoImpl *impl, MppCfgStrBuf *str, rk_s32 firs
case MPP_CFG_TYPE_BOOL : {
len += snprintf(buf + len, total - len, "%s", impl->val.b1 ? "true" : "false");
} break;
case MPP_CFG_TYPE_S32 : {
case MPP_CFG_TYPE_s32 : {
len += snprintf(buf + len, total - len, "%d", impl->val.s32);
} break;
case MPP_CFG_TYPE_U32 : {
case MPP_CFG_TYPE_u32 : {
len += snprintf(buf + len, total - len, "%u", impl->val.u32);
} break;
case MPP_CFG_TYPE_S64 : {
case MPP_CFG_TYPE_s64 : {
len += snprintf(buf + len, total - len, "%lld", impl->val.s64);
} break;
case MPP_CFG_TYPE_U64 : {
case MPP_CFG_TYPE_u64 : {
len += snprintf(buf + len, total - len, "%llu", impl->val.u64);
} break;
case MPP_CFG_TYPE_F32 : {
case MPP_CFG_TYPE_f32 : {
len += snprintf(buf + len, total - len, "%f", impl->val.f32);
} break;
case MPP_CFG_TYPE_F64 : {
case MPP_CFG_TYPE_f64 : {
len += snprintf(buf + len, total - len, "%lf", impl->val.f64);
} break;
case MPP_CFG_TYPE_STRING :
@ -1201,24 +1201,24 @@ done:
if (strstr(tmp, ".")) {
if (value >= FLT_MIN && value <= FLT_MAX) {
*type = MPP_CFG_TYPE_F32;
*type = MPP_CFG_TYPE_f32;
val->f32 = (float)value;
} else {
*type = MPP_CFG_TYPE_F64;
*type = MPP_CFG_TYPE_f64;
val->f64 = (double)value;
}
} else {
if (value >= INT_MIN && value <= INT_MAX) {
*type = MPP_CFG_TYPE_S32;
*type = MPP_CFG_TYPE_s32;
val->s32 = (int)value;
} else if (value >= 0 && value <= UINT_MAX) {
*type = MPP_CFG_TYPE_U32;
*type = MPP_CFG_TYPE_u32;
val->u32 = (unsigned int)value;
} else if (value >= (long double)LLONG_MIN && value <= (long double)LLONG_MAX) {
*type = MPP_CFG_TYPE_U64;
*type = MPP_CFG_TYPE_u64;
val->u64 = (unsigned long long)value;
} else if (value >= 0 && value <= (long double)ULLONG_MAX) {
*type = MPP_CFG_TYPE_S64;
*type = MPP_CFG_TYPE_s64;
val->s64 = (long long)value;
} else {
mpp_loge_f("invalid number %s\n", tmp);
@ -3078,16 +3078,16 @@ static void write_struct(MppCfgIoImpl *obj, MppTrie trie, MppCfgStrBuf *str, voi
if (tbl->data_type < CFG_FUNC_TYPE_BUTT) {
switch (tbl->data_type) {
case CFG_FUNC_TYPE_S32 : {
case CFG_FUNC_TYPE_s32 : {
mpp_cfg_set_s32(tbl, st, obj->val.s32);
} break;
case CFG_FUNC_TYPE_U32 : {
case CFG_FUNC_TYPE_u32 : {
mpp_cfg_set_u32(tbl, st, obj->val.u32);
} break;
case CFG_FUNC_TYPE_S64 : {
case CFG_FUNC_TYPE_s64 : {
mpp_cfg_set_s64(tbl, st, obj->val.s64);
} break;
case CFG_FUNC_TYPE_U64 : {
case CFG_FUNC_TYPE_u64 : {
mpp_cfg_set_u64(tbl, st, obj->val.u64);
} break;
default : {
@ -3158,33 +3158,33 @@ static MppCfgObj read_struct(MppCfgIoImpl *impl, MppCfgObj parent, void *st)
/* assign value by different type */
switch (info->data_type) {
case CFG_FUNC_TYPE_S32 :
case CFG_FUNC_TYPE_U32 :
case CFG_FUNC_TYPE_S64 :
case CFG_FUNC_TYPE_U64 : {
case CFG_FUNC_TYPE_s32 :
case CFG_FUNC_TYPE_u32 :
case CFG_FUNC_TYPE_s64 :
case CFG_FUNC_TYPE_u64 : {
switch (info->data_type) {
case CFG_FUNC_TYPE_S32 : {
mpp_assert(impl->type == MPP_CFG_TYPE_S32);
case CFG_FUNC_TYPE_s32 : {
mpp_assert(impl->type == MPP_CFG_TYPE_s32);
mpp_cfg_get_s32(info, st, &ret->val.s32);
} break;
case CFG_FUNC_TYPE_U32 : {
mpp_assert(impl->type == MPP_CFG_TYPE_U32);
case CFG_FUNC_TYPE_u32 : {
mpp_assert(impl->type == MPP_CFG_TYPE_u32);
mpp_cfg_get_u32(info, st, &ret->val.u32);
} break;
case CFG_FUNC_TYPE_S64 : {
mpp_assert(impl->type == MPP_CFG_TYPE_S64);
case CFG_FUNC_TYPE_s64 : {
mpp_assert(impl->type == MPP_CFG_TYPE_s64);
mpp_cfg_get_s64(info, st, &ret->val.s64);
} break;
case CFG_FUNC_TYPE_U64 : {
mpp_assert(impl->type == MPP_CFG_TYPE_U64);
case CFG_FUNC_TYPE_u64 : {
mpp_assert(impl->type == MPP_CFG_TYPE_u64);
mpp_cfg_get_u64(info, st, &ret->val.u64);
} break;
default : {
} break;
}
} break;
case CFG_FUNC_TYPE_St :
case CFG_FUNC_TYPE_Ptr : {
case CFG_FUNC_TYPE_st :
case CFG_FUNC_TYPE_ptr : {
ret->val = impl->val;
} break;
default : {

74
mpp/base/mpp_sys_cfg.c
View file

@ -74,32 +74,32 @@ static RK_U32 mpp_sys_cfg_debug = 0;
} while (0);
#define ENTRY_TABLE(ENTRY) \
ENTRY(dec_buf_chk, enable, U32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_ENABLE, dec_buf_chk, enable) \
ENTRY(dec_buf_chk, type, U32, MppCodingType, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_TYPE, dec_buf_chk, type) \
ENTRY(dec_buf_chk, fmt_codec, U32, MppFrameFormat, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_FMT_CODEC, dec_buf_chk, fmt_codec) \
ENTRY(dec_buf_chk, fmt_fbc, U32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_FMT_FBC, dec_buf_chk, fmt_fbc) \
ENTRY(dec_buf_chk, fmt_hdr, U32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_FMT_HDR, dec_buf_chk, fmt_hdr) \
ENTRY(dec_buf_chk, width, U32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_WIDTH, dec_buf_chk, width) \
ENTRY(dec_buf_chk, height, U32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_HEIGHT, dec_buf_chk, height) \
ENTRY(dec_buf_chk, crop_top, U32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_CROP_TOP, dec_buf_chk, crop_top) \
ENTRY(dec_buf_chk, crop_bottom, U32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_CROP_BOTTOM, dec_buf_chk, crop_bottom) \
ENTRY(dec_buf_chk, crop_left, U32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_CROP_LEFT, dec_buf_chk, crop_left) \
ENTRY(dec_buf_chk, crop_right, U32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_CROP_RIGHT, dec_buf_chk, crop_right) \
ENTRY(dec_buf_chk, unit_size, U32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_CROP_RIGHT, dec_buf_chk, unit_size) \
ENTRY(dec_buf_chk, has_metadata, U32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_FLAG_METADATA, dec_buf_chk, has_metadata) \
ENTRY(dec_buf_chk, has_thumbnail, U32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_FLAG_THUMBNAIL, dec_buf_chk, has_thumbnail) \
ENTRY(dec_buf_chk, h_stride_by_byte, U32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_H_STRIDE_BYTE, dec_buf_chk, h_stride_by_byte) \
ENTRY(dec_buf_chk, v_stride, U32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_V_STRIDE, dec_buf_chk, v_stride) \
ENTRY(dec_buf_chk, enable, u32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_ENABLE, dec_buf_chk, enable) \
ENTRY(dec_buf_chk, type, u32, MppCodingType, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_TYPE, dec_buf_chk, type) \
ENTRY(dec_buf_chk, fmt_codec, u32, MppFrameFormat, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_FMT_CODEC, dec_buf_chk, fmt_codec) \
ENTRY(dec_buf_chk, fmt_fbc, u32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_FMT_FBC, dec_buf_chk, fmt_fbc) \
ENTRY(dec_buf_chk, fmt_hdr, u32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_FMT_HDR, dec_buf_chk, fmt_hdr) \
ENTRY(dec_buf_chk, width, u32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_WIDTH, dec_buf_chk, width) \
ENTRY(dec_buf_chk, height, u32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_HEIGHT, dec_buf_chk, height) \
ENTRY(dec_buf_chk, crop_top, u32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_CROP_TOP, dec_buf_chk, crop_top) \
ENTRY(dec_buf_chk, crop_bottom, u32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_CROP_BOTTOM, dec_buf_chk, crop_bottom) \
ENTRY(dec_buf_chk, crop_left, u32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_CROP_LEFT, dec_buf_chk, crop_left) \
ENTRY(dec_buf_chk, crop_right, u32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_CROP_RIGHT, dec_buf_chk, crop_right) \
ENTRY(dec_buf_chk, unit_size, u32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_CROP_RIGHT, dec_buf_chk, unit_size) \
ENTRY(dec_buf_chk, has_metadata, u32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_FLAG_METADATA, dec_buf_chk, has_metadata) \
ENTRY(dec_buf_chk, has_thumbnail, u32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_FLAG_THUMBNAIL, dec_buf_chk, has_thumbnail) \
ENTRY(dec_buf_chk, h_stride_by_byte, u32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_H_STRIDE_BYTE, dec_buf_chk, h_stride_by_byte) \
ENTRY(dec_buf_chk, v_stride, u32, RK_U32, MPP_SYS_DEC_BUF_CHK_CFG_CHANGE_V_STRIDE, dec_buf_chk, v_stride) \
/* read-only config */ \
ENTRY(dec_buf_chk, cap_fbc, U32, RK_U32, 0, dec_buf_chk, cap_fbc) \
ENTRY(dec_buf_chk, cap_tile, U32, RK_U32, 0, dec_buf_chk, cap_tile) \
ENTRY(dec_buf_chk, h_stride_by_pixel, U32, RK_U32, 0, dec_buf_chk, h_stride_by_pixel) \
ENTRY(dec_buf_chk, offset_y, U32, RK_U32, 0, dec_buf_chk, offset_y) \
ENTRY(dec_buf_chk, size_total, U32, RK_U32, 0, dec_buf_chk, size_total) \
ENTRY(dec_buf_chk, size_fbc_hdr, U32, RK_U32, 0, dec_buf_chk, size_fbc_hdr) \
ENTRY(dec_buf_chk, size_fbc_bdy, U32, RK_U32, 0, dec_buf_chk, size_fbc_bdy) \
ENTRY(dec_buf_chk, size_metadata, U32, RK_U32, 0, dec_buf_chk, size_metadata) \
ENTRY(dec_buf_chk, size_thumbnail, U32, RK_U32, 0, dec_buf_chk, size_thumbnail)
ENTRY(dec_buf_chk, cap_fbc, u32, RK_U32, 0, dec_buf_chk, cap_fbc) \
ENTRY(dec_buf_chk, cap_tile, u32, RK_U32, 0, dec_buf_chk, cap_tile) \
ENTRY(dec_buf_chk, h_stride_by_pixel, u32, RK_U32, 0, dec_buf_chk, h_stride_by_pixel) \
ENTRY(dec_buf_chk, offset_y, u32, RK_U32, 0, dec_buf_chk, offset_y) \
ENTRY(dec_buf_chk, size_total, u32, RK_U32, 0, dec_buf_chk, size_total) \
ENTRY(dec_buf_chk, size_fbc_hdr, u32, RK_U32, 0, dec_buf_chk, size_fbc_hdr) \
ENTRY(dec_buf_chk, size_fbc_bdy, u32, RK_U32, 0, dec_buf_chk, size_fbc_bdy) \
ENTRY(dec_buf_chk, size_metadata, u32, RK_U32, 0, dec_buf_chk, size_metadata) \
ENTRY(dec_buf_chk, size_thumbnail, u32, RK_U32, 0, dec_buf_chk, size_thumbnail)
static void mpp_sys_cfg_srv_init()
{
@ -657,12 +657,12 @@ MPP_RET mpp_sys_cfg_ioctl(MppSysCfg cfg)
return ret; \
}
MPP_CFG_SET_ACCESS(mpp_sys_cfg_set_s32, RK_S32, S32);
MPP_CFG_SET_ACCESS(mpp_sys_cfg_set_u32, RK_U32, U32);
MPP_CFG_SET_ACCESS(mpp_sys_cfg_set_s64, RK_S64, S64);
MPP_CFG_SET_ACCESS(mpp_sys_cfg_set_u64, RK_U64, U64);
MPP_CFG_SET_ACCESS(mpp_sys_cfg_set_ptr, void *, Ptr);
MPP_CFG_SET_ACCESS(mpp_sys_cfg_set_st, void *, St);
MPP_CFG_SET_ACCESS(mpp_sys_cfg_set_s32, RK_S32, s32);
MPP_CFG_SET_ACCESS(mpp_sys_cfg_set_u32, RK_U32, u32);
MPP_CFG_SET_ACCESS(mpp_sys_cfg_set_s64, RK_S64, s64);
MPP_CFG_SET_ACCESS(mpp_sys_cfg_set_u64, RK_U64, u64);
MPP_CFG_SET_ACCESS(mpp_sys_cfg_set_ptr, void *, ptr);
MPP_CFG_SET_ACCESS(mpp_sys_cfg_set_st, void *, st);
#define MPP_CFG_GET_ACCESS(func_name, in_type, cfg_type) \
MPP_RET func_name(MppSysCfg cfg, const char *name, in_type *val) \
@ -689,12 +689,12 @@ MPP_CFG_SET_ACCESS(mpp_sys_cfg_set_st, void *, St);
return ret; \
}
MPP_CFG_GET_ACCESS(mpp_sys_cfg_get_s32, RK_S32, S32);
MPP_CFG_GET_ACCESS(mpp_sys_cfg_get_u32, RK_U32, U32);
MPP_CFG_GET_ACCESS(mpp_sys_cfg_get_s64, RK_S64, S64);
MPP_CFG_GET_ACCESS(mpp_sys_cfg_get_u64, RK_U64, U64);
MPP_CFG_GET_ACCESS(mpp_sys_cfg_get_ptr, void *, Ptr);
MPP_CFG_GET_ACCESS(mpp_sys_cfg_get_st, void , St);
MPP_CFG_GET_ACCESS(mpp_sys_cfg_get_s32, RK_S32, s32);
MPP_CFG_GET_ACCESS(mpp_sys_cfg_get_u32, RK_U32, u32);
MPP_CFG_GET_ACCESS(mpp_sys_cfg_get_s64, RK_S64, s64);
MPP_CFG_GET_ACCESS(mpp_sys_cfg_get_u64, RK_U64, u64);
MPP_CFG_GET_ACCESS(mpp_sys_cfg_get_ptr, void *, ptr);
MPP_CFG_GET_ACCESS(mpp_sys_cfg_get_st, void , st);
void mpp_sys_cfg_show(void)
{

6
mpp/base/test/mpp_cfg_test.c
View file

@ -170,7 +170,7 @@ int main(int argc, char *argv[])
for (i = 0; i < array_size; i++) {
obj = NULL;
val.s32 = i;
ret = mpp_cfg_get_object(&obj, NULL, MPP_CFG_TYPE_S32, &val);
ret = mpp_cfg_get_object(&obj, NULL, MPP_CFG_TYPE_s32, &val);
if (ret) {
mpp_loge("mpp_cfg_get_object array element failed\n");
goto DONE;
@ -193,7 +193,7 @@ int main(int argc, char *argv[])
obj = NULL;
val.s32 = 1920;
ret = mpp_cfg_get_object(&obj, "width", MPP_CFG_TYPE_S32, &val);
ret = mpp_cfg_get_object(&obj, "width", MPP_CFG_TYPE_s32, &val);
if (ret) {
mpp_loge("mpp_cfg_get s32 failed\n");
goto DONE;
@ -209,7 +209,7 @@ int main(int argc, char *argv[])
obj = NULL;
val.u32 = 1080;
ret = mpp_cfg_get_object(&obj, "height", MPP_CFG_TYPE_U32, &val);
ret = mpp_cfg_get_object(&obj, "height", MPP_CFG_TYPE_u32, &val);
if (ret) {
mpp_loge("mpp_cfg_get u32 failed\n");
goto DONE;

24
mpp/inc/mpp_cfg.h
View file

@ -33,18 +33,18 @@ MPP_RET mpp_cfg_get_st(MppCfgInfo *info, void *cfg, void *val);
MPP_RET mpp_cfg_set_ptr(MppCfgInfo *info, void *cfg, void *val);
MPP_RET mpp_cfg_get_ptr(MppCfgInfo *info, void *cfg, void **val);
#define MPP_CFG_SET_S32(info, cfg, val) (mpp_cfg_set_s32)(info, cfg, val)
#define MPP_CFG_GET_S32(info, cfg, val) (mpp_cfg_get_s32)(info, cfg, (RK_S32 *)(val))
#define MPP_CFG_SET_U32(info, cfg, val) (mpp_cfg_set_u32)(info, cfg, val)
#define MPP_CFG_GET_U32(info, cfg, val) (mpp_cfg_get_u32)(info, cfg, (RK_U32 *)(val))
#define MPP_CFG_SET_S64(info, cfg, val) (mpp_cfg_set_s64)(info, cfg, val)
#define MPP_CFG_GET_S64(info, cfg, val) (mpp_cfg_get_s64)(info, cfg, (RK_S64 *)(val))
#define MPP_CFG_SET_U64(info, cfg, val) (mpp_cfg_set_u64)(info, cfg, val)
#define MPP_CFG_GET_U64(info, cfg, val) (mpp_cfg_get_u64)(info, cfg, (RK_U64 *)(val))
#define MPP_CFG_SET_St(info, cfg, val) (mpp_cfg_set_st )(info, cfg, val)
#define MPP_CFG_GET_St(info, cfg, val) (mpp_cfg_get_st )(info, cfg, (void *)(val))
#define MPP_CFG_SET_Ptr(info, cfg, val) (mpp_cfg_set_ptr)(info, cfg, val)
#define MPP_CFG_GET_Ptr(info, cfg, val) (mpp_cfg_get_ptr)(info, cfg, (void **)(val))
#define MPP_CFG_SET_s32(info, cfg, val) (mpp_cfg_set_s32)(info, cfg, val)
#define MPP_CFG_GET_s32(info, cfg, val) (mpp_cfg_get_s32)(info, cfg, (RK_S32 *)(val))
#define MPP_CFG_SET_u32(info, cfg, val) (mpp_cfg_set_u32)(info, cfg, val)
#define MPP_CFG_GET_u32(info, cfg, val) (mpp_cfg_get_u32)(info, cfg, (RK_U32 *)(val))
#define MPP_CFG_SET_s64(info, cfg, val) (mpp_cfg_set_s64)(info, cfg, val)
#define MPP_CFG_GET_s64(info, cfg, val) (mpp_cfg_get_s64)(info, cfg, (RK_S64 *)(val))
#define MPP_CFG_SET_u64(info, cfg, val) (mpp_cfg_set_u64)(info, cfg, val)
#define MPP_CFG_GET_u64(info, cfg, val) (mpp_cfg_get_u64)(info, cfg, (RK_U64 *)(val))
#define MPP_CFG_SET_st(info, cfg, val) (mpp_cfg_set_st )(info, cfg, val)
#define MPP_CFG_GET_st(info, cfg, val) (mpp_cfg_get_st )(info, cfg, (void *)(val))
#define MPP_CFG_SET_ptr(info, cfg, val) (mpp_cfg_set_ptr)(info, cfg, val)
#define MPP_CFG_GET_ptr(info, cfg, val) (mpp_cfg_get_ptr)(info, cfg, (void **)(val))
const char *strof_cfg_type(CfgType type);

12
mpp/inc/mpp_internal.h
View file

@ -27,12 +27,12 @@ typedef void* KmppObjDef;
typedef void* KmppObj;
typedef enum CfgType_e {
CFG_FUNC_TYPE_S32,
CFG_FUNC_TYPE_U32,
CFG_FUNC_TYPE_S64,
CFG_FUNC_TYPE_U64,
CFG_FUNC_TYPE_St,
CFG_FUNC_TYPE_Ptr,
CFG_FUNC_TYPE_s32,
CFG_FUNC_TYPE_u32,
CFG_FUNC_TYPE_s64,
CFG_FUNC_TYPE_u64,
CFG_FUNC_TYPE_st,
CFG_FUNC_TYPE_ptr,
CFG_FUNC_TYPE_BUTT,
} CfgType;