package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-16 06:00:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix[vdpu383]: Fix av1 rkfbc output error

Browse Source 
Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com>
Change-Id: I6ea36b643f4b3dcc4e29dc6ff5f8fe0fc4c668c5
This commit is contained in:
Chandler Chen
2024-03-06 15:30:03 +08:00
committed by Herman Chen
parent 61650a170e
commit 398b4cb76f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mpp/hal/vpu/av1d/hal_av1d_vdpu383.c
View File

@@ -2230,21 +2230,23 @@ MPP_RET vdpu383_av1d_gen_regs(void *hal, HalTaskInfo *task)
RK_U32 fbd_offset;
regs->ctrl_regs.reg9.fbc_e = 1;
regs->av1d_paras.reg68_hor_virstride = pixel_width / 64;
regs->av1d_paras.reg68_hor_virstride = MPP_ALIGN(hor_virstride, 64) / 64;
fbd_offset = regs->av1d_paras.reg68_hor_virstride * MPP_ALIGN(ver_virstride, 8) * 4;
regs->av1d_addrs.reg193_fbc_payload_offset = fbd_offset;
regs->av1d_paras.reg80_error_ref_hor_virstride = regs->av1d_paras.reg68_hor_virstride;
} else if (MPP_FRAME_FMT_IS_TILE(mpp_frame_get_fmt(mframe))) {
regs->ctrl_regs.reg9.tile_e = 1;
regs->av1d_paras.reg68_hor_virstride = hor_virstride * 6 / 16;
regs->av1d_paras.reg70_y_virstride = (y_virstride + uv_virstride) / 16;
regs->av1d_paras.reg80_error_ref_hor_virstride = hor_virstride >> 4;
} else {
regs->ctrl_regs.reg9.fbc_e = 0;
regs->av1d_paras.reg68_hor_virstride = hor_virstride >> 4;
regs->av1d_paras.reg69_raster_uv_hor_virstride = hor_virstride >> 4;
regs->av1d_paras.reg70_y_virstride = y_virstride >> 4;
regs->av1d_paras.reg80_error_ref_hor_virstride = hor_virstride >> 4;
}
/* error */
regs->av1d_paras.reg80_error_ref_hor_virstride = hor_virstride >> 4;
regs->av1d_paras.reg81_error_ref_raster_uv_hor_virstride = hor_virstride >> 4;
regs->av1d_paras.reg82_error_ref_virstride = y_virstride >> 4;
}
@@ -2256,7 +2258,7 @@ MPP_RET vdpu383_av1d_gen_regs(void *hal, HalTaskInfo *task)
if (mframe) {
hor_virstride = mpp_frame_get_hor_stride(mframe);
if (MPP_FRAME_FMT_IS_FBC(mpp_frame_get_fmt(mframe))) {
hor_virstride = MPP_ALIGN(hor_virstride, 64) / 64;
hor_virstride = MPP_ALIGN(hor_virstride, 64) / 4;
}
ver_virstride = mpp_frame_get_ver_stride(mframe);
y_virstride = hor_virstride * ver_virstride;