From 17a370d2d056b53ffcf14252bc3b3eee2a008dc1 Mon Sep 17 00:00:00 2001 From: Herman Chen Date: Thu, 23 Oct 2025 15:57:05 +0800 Subject: [PATCH] chore[astyle]: Format code by new astyle config Signed-off-by: Herman Chen Change-Id: Iafdb694219ad9d0407e622ba13fd729b935a2dad --- kmpp/base/inc/kmpp_obj_helper.h | 2 +- kmpp/base/kmpp_obj.c | 7 +++++-- mpp/hal/rkdec/h265d/hal_h265d_vdpu384a.c | 2 +- mpp/mpp.c | 3 +-- tools/astylerc | 3 +-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/kmpp/base/inc/kmpp_obj_helper.h b/kmpp/base/inc/kmpp_obj_helper.h index a3d03ba2..2d3a532b 100644 --- a/kmpp/base/inc/kmpp_obj_helper.h +++ b/kmpp/base/inc/kmpp_obj_helper.h @@ -548,7 +548,7 @@ KMPP_OBJ_ENTRY_TABLE(KMPP_OBJ_NAME, KMPP_OBJ_EXPORT, KMPP_OBJ_EXPORT, extern "C" { #endif -KMPP_OBJ_FUNC_IOCTL(KMPP_OBJ_NAME, IOCTL_CTX, IOCTL_IN_, IOCTL_OUT, IOCTL_IO_) + KMPP_OBJ_FUNC_IOCTL(KMPP_OBJ_NAME, IOCTL_CTX, IOCTL_IN_, IOCTL_OUT, IOCTL_IO_) #ifdef __cplusplus } diff --git a/kmpp/base/kmpp_obj.c b/kmpp/base/kmpp_obj.c index dfad9ad5..68261112 100644 --- a/kmpp/base/kmpp_obj.c +++ b/kmpp/base/kmpp_obj.c @@ -1465,9 +1465,11 @@ rk_s32 kmpp_obj_set_ptr(KmppObj obj, const char *name, void* val) ret = kmpp_obj_impl_set_ptr(tbl, impl->entry, val); } } + if (ret) mpp_loge("obj %s set %s ptr failed ret %d\n", - impl ? impl->def ? impl->def->name : NULL : NULL, name, ret); + (impl && impl->def && impl->def->name) ? impl->def->name : NULL, name, ret); + return ret; } @@ -1491,7 +1493,8 @@ rk_s32 kmpp_obj_get_ptr(KmppObj obj, const char *name, void **val) if (ret) mpp_loge("obj %s get %s ptr failed ret %d\n", - impl ? impl->def ? impl->def->name : NULL : NULL, name, ret); + (impl && impl->def && impl->def->name) ? impl->def->name : NULL, name, ret); + return ret; } diff --git a/mpp/hal/rkdec/h265d/hal_h265d_vdpu384a.c b/mpp/hal/rkdec/h265d/hal_h265d_vdpu384a.c index 21f997da..437c6687 100644 --- a/mpp/hal/rkdec/h265d/hal_h265d_vdpu384a.c +++ b/mpp/hal/rkdec/h265d/hal_h265d_vdpu384a.c @@ -635,7 +635,7 @@ static RK_S32 hal_h265d_v345_output_pps_packet(void *hal, void *dxva) char *cur_fname = "global_cfg.dat"; memset(dump_cur_fname_path, 0, sizeof(dump_cur_fname_path)); sprintf(dump_cur_fname_path, "%s/%s", dump_cur_dir, cur_fname); - dump_data_to_file(dump_cur_fname_path, (void *)bp.pbuf, 18*128, 128, 0); + dump_data_to_file(dump_cur_fname_path, (void *)bp.pbuf, 18 * 128, 128, 0); } #endif diff --git a/mpp/mpp.c b/mpp/mpp.c index bba1fb3e..bc411a45 100644 --- a/mpp/mpp.c +++ b/mpp/mpp.c @@ -1576,8 +1576,7 @@ MPP_RET mpp_notify_group(Mpp *mpp, MppBufferGroup group) switch (mpp->mType) { case MPP_CTX_DEC : { if (group == mpp->mFrameGroup) - ret = mpp_notify_flag(mpp, MPP_DEC_NOTIFY_BUFFER_VALID | - MPP_DEC_NOTIFY_BUFFER_MATCH); + ret = mpp_notify_flag(mpp, MPP_DEC_NOTIFY_BUFFER_VALID | MPP_DEC_NOTIFY_BUFFER_MATCH); } break; default : { } break; diff --git a/tools/astylerc b/tools/astylerc index 2ca96756..8772e6b7 100644 --- a/tools/astylerc +++ b/tools/astylerc @@ -4,7 +4,6 @@ # bracket style setting --style=linux -#--style=kr # indent setting --indent=spaces=4 @@ -12,7 +11,7 @@ #--indent-switches #--indent-preprocessor --min-conditional-indent=0 ---max-instatement-indent=80 +--max-instatement-indent=120 # padding setting #--break-blocks