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

refactor[avs2d]: Use the common alignment function

Browse source 
Platform: General
Spec: avs2

Change-Id: Ibfbfaad67460060c1b7338796fc59354ab052ebf
Signed-off-by: Hongjin Li <vic.hong@rock-chips.com>
This commit is contained in:
Hongjin Li 2025-12-17 10:51:37 +08:00
parent 2ca8918673
commit d60780dd50
3 changed files with 11 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

28
mpp/hal/rkdec/avs2d/hal_avs2d_rkv.c
View file

@ -50,26 +50,6 @@
MPP_RET hal_avs2d_rkv_deinit(void *hal);
static RK_U32 avs2d_ver_align(RK_U32 val)
{
return MPP_ALIGN(val, 16);
}
static RK_U32 avs2d_hor_align(RK_U32 val)
{
return MPP_ALIGN(val, 16);
}
static RK_U32 avs2d_len_align(RK_U32 val)
{
return (2 * MPP_ALIGN(val, 16));
}
static RK_U32 avs2d_hor_align_64(RK_U32 val)
{
return MPP_ALIGN(val, 64);
}
static MPP_RET prepare_header(Avs2dHalCtx_t *p_hal, RK_U8 *data, RK_U32 len)
{
@ -520,12 +500,12 @@ MPP_RET hal_avs2d_rkv_init(void *hal, MppHalCfg *cfg)
}
if (MPP_FRAME_FMT_IS_FBC(cfg->cfg->base.out_fmt))
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_HOR_ALIGN, avs2d_hor_align_64);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_HOR_ALIGN, mpp_align_64);
else
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_HOR_ALIGN, avs2d_hor_align);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_HOR_ALIGN, mpp_align_16);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_VER_ALIGN, avs2d_ver_align);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_LEN_ALIGN, avs2d_len_align);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_VER_ALIGN, mpp_align_16);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_LEN_ALIGN, mpp_align_wxh2yuv422);
__RETURN:
AVS2D_HAL_TRACE("Out. ret %d", ret);

30
mpp/hal/rkdec/avs2d/hal_avs2d_vdpu382.c
View file

@ -51,26 +51,6 @@
MPP_RET hal_avs2d_vdpu382_deinit(void *hal);
static RK_U32 avs2d_ver_align(RK_U32 val)
{
return MPP_ALIGN(val, 16);
}
static RK_U32 avs2d_hor_align(RK_U32 val)
{
return MPP_ALIGN(val, 16);
}
static RK_U32 avs2d_len_align(RK_U32 val)
{
return (2 * MPP_ALIGN(val, 16));
}
static RK_U32 avs2d_hor_align_64(RK_U32 val)
{
return MPP_ALIGN(val, 64);
}
static MPP_RET prepare_header(Avs2dHalCtx_t *p_hal, RK_U8 *data, RK_U32 len)
{
@ -587,13 +567,13 @@ MPP_RET hal_avs2d_vdpu382_init(void *hal, MppHalCfg *cfg)
}
if (MPP_FRAME_FMT_IS_FBC(cfg->cfg->base.out_fmt))
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_HOR_ALIGN, avs2d_hor_align_64);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_HOR_ALIGN, mpp_align_64);
else
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_HOR_ALIGN, avs2d_hor_align);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_HOR_ALIGN, mpp_align_16);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_HOR_ALIGN, avs2d_hor_align);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_VER_ALIGN, avs2d_ver_align);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_LEN_ALIGN, avs2d_len_align);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_HOR_ALIGN, mpp_align_16);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_VER_ALIGN, mpp_align_16);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_LEN_ALIGN, mpp_align_wxh2yuv422);
__RETURN:
AVS2D_HAL_TRACE("Out. ret %d", ret);

13
mpp/hal/rkdec/avs2d/hal_avs2d_vdpu383.c
View file

@ -42,15 +42,6 @@
#define COLMV_BYTES (16)
MPP_RET hal_avs2d_vdpu383_deinit(void *hal);
static RK_U32 avs2d_ver_align(RK_U32 val)
{
return MPP_ALIGN(val, 16);
}
static RK_U32 avs2d_len_align(RK_U32 val)
{
return (2 * MPP_ALIGN(val, 16));
}
static MPP_RET prepare_header(Avs2dHalCtx_t *p_hal, RK_U8 *data, RK_U32 len)
{
@ -544,8 +535,8 @@ MPP_RET hal_avs2d_vdpu383_init(void *hal, MppHalCfg *cfg)
}
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_HOR_ALIGN, mpp_align_128_odd_plus_64);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_VER_ALIGN, avs2d_ver_align);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_LEN_ALIGN, avs2d_len_align);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_VER_ALIGN, mpp_align_16);
mpp_slots_set_prop(p_hal->frame_slots, SLOTS_LEN_ALIGN, mpp_align_wxh2yuv422);
__RETURN:
AVS2D_HAL_TRACE("Out. ret %d", ret);