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

[hal_vp9d_vdpu34x]: Fix vp9d fbc err

Browse Source 
The y/uv hor virstride of the ref frame should be
configured width, just like cur frame, when fbc enable

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I49f48164d1921bfd7ccede3eac353f26431939a4
This commit is contained in:
Yandong Lin
2020-12-18 14:11:06 +08:00
committed by Herman Chen
parent f9ef9976e9
commit a40ce32e4e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mpp/hal/rkdec/vp9d/hal_vp9d_vdpu34x.c
View File

@@ -338,6 +338,7 @@ static MPP_RET hal_vp9d_vdpu34x_gen_regs(void *hal, HalTaskInfo *task)
RK_S32 intraFlag = 0;
MppBuffer framebuf = NULL;
HalBuf *mv_buf = NULL;
RK_U32 fbc_en = 0;
HalVp9dCtx *p_hal = (HalVp9dCtx*)hal;
Vdpu34xVp9dCtx *hw_ctx = (Vdpu34xVp9dCtx*)p_hal->hw_ctx;
@@ -478,8 +479,9 @@ static MPP_RET hal_vp9d_vdpu34x_gen_regs(void *hal, HalTaskInfo *task)
MppFrame mframe = NULL;
mpp_buf_slot_get_prop(p_hal->slots, task->dec.output, SLOT_FRAME_PTR, &mframe);
fbc_en = MPP_FRAME_FMT_IS_FBC(mpp_frame_get_fmt(mframe));
if (MPP_FRAME_FMT_IS_FBC(mpp_frame_get_fmt(mframe))) {
if (fbc_en) {
RK_U32 w = MPP_ALIGN(mpp_frame_get_width(mframe), 64);
RK_U32 h = mpp_frame_get_height(mframe);
RK_U32 fbd_offset = MPP_ALIGN(w * (h + 16) / 16, SZ_4K);
@@ -540,8 +542,11 @@ static MPP_RET hal_vp9d_vdpu34x_gen_regs(void *hal, HalTaskInfo *task)
ref_frame_height_y = pic_param->ref_frame_coded_height[ref_idx];
pic_h[0] = vp9_ver_align(ref_frame_height_y);
pic_h[1] = vp9_ver_align(ref_frame_height_y) / 2;
y_hor_virstride = (vp9_hor_align((ref_frame_width_y * bit_depth) >> 3) >> 4);
uv_hor_virstride = (vp9_hor_align((ref_frame_width_y * bit_depth) >> 3) >> 4);
if (fbc_en) {
y_hor_virstride = uv_hor_virstride = MPP_ALIGN(ref_frame_width_y, 64) >> 4;
} else {
y_hor_virstride = uv_hor_virstride = (vp9_hor_align((ref_frame_width_y * bit_depth) >> 3) >> 4);
}
y_virstride = y_hor_virstride * pic_h[0];
if (pic_param->ref_frame_map[ref_idx].Index7Bits < 0x7f) {