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

chore[astyle]: Format code by new astyle config

Browse source 
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: Iafdb694219ad9d0407e622ba13fd729b935a2dad
This commit is contained in:
Herman Chen 2025-10-23 15:57:05 +08:00
parent ef11356680
commit 17a370d2d0
5 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kmpp/base/inc/kmpp_obj_helper.h
View file

@ -548,7 +548,7 @@ KMPP_OBJ_ENTRY_TABLE(KMPP_OBJ_NAME, KMPP_OBJ_EXPORT, KMPP_OBJ_EXPORT,
extern "C" { extern "C" {
#endif #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 #ifdef __cplusplus
} }

7
kmpp/base/kmpp_obj.c
View file

@ -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); ret = kmpp_obj_impl_set_ptr(tbl, impl->entry, val);
} }
} }
if (ret) if (ret)
mpp_loge("obj %s set %s ptr failed ret %d\n", 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; return ret;
} }
@ -1491,7 +1493,8 @@ rk_s32 kmpp_obj_get_ptr(KmppObj obj, const char *name, void **val)
if (ret) if (ret)
mpp_loge("obj %s get %s ptr failed ret %d\n", 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; return ret;
} }

2
mpp/hal/rkdec/h265d/hal_h265d_vdpu384a.c
View file

@ -635,7 +635,7 @@ static RK_S32 hal_h265d_v345_output_pps_packet(void *hal, void *dxva)
char *cur_fname = "global_cfg.dat"; char *cur_fname = "global_cfg.dat";
memset(dump_cur_fname_path, 0, sizeof(dump_cur_fname_path)); memset(dump_cur_fname_path, 0, sizeof(dump_cur_fname_path));
sprintf(dump_cur_fname_path, "%s/%s", dump_cur_dir, cur_fname); 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 #endif

3
mpp/mpp.c
View file

@ -1576,8 +1576,7 @@ MPP_RET mpp_notify_group(Mpp *mpp, MppBufferGroup group)
switch (mpp->mType) { switch (mpp->mType) {
case MPP_CTX_DEC : { case MPP_CTX_DEC : {
if (group == mpp->mFrameGroup) if (group == mpp->mFrameGroup)
ret = mpp_notify_flag(mpp, MPP_DEC_NOTIFY_BUFFER_VALID | ret = mpp_notify_flag(mpp, MPP_DEC_NOTIFY_BUFFER_VALID | MPP_DEC_NOTIFY_BUFFER_MATCH);
MPP_DEC_NOTIFY_BUFFER_MATCH);
} break; } break;
default : { default : {
} break; } break;

3
tools/astylerc
View file

@ -4,7 +4,6 @@
# bracket style setting # bracket style setting
--style=linux --style=linux
#--style=kr
# indent setting # indent setting
--indent=spaces=4 --indent=spaces=4
@ -12,7 +11,7 @@
#--indent-switches #--indent-switches
#--indent-preprocessor #--indent-preprocessor
--min-conditional-indent=0 --min-conditional-indent=0
--max-instatement-indent=80 --max-instatement-indent=120
# padding setting # padding setting
#--break-blocks #--break-blocks