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

fix[hal_h265d]: Avoid reg offset duplicate setting issue

Browse Source 
set rps pps ref offset after ref_err check

Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com>
Change-Id: Ia04a171dc1bdbd73d769408a81efb80227a7a528
This commit is contained in:
Chandler Chen
2024-11-27 11:20:24 +08:00
parent 5f522dcaf0
commit 0d4afaa70a
3 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mpp/hal/rkdec/h265d/hal_h265d_vdpu34x.c
View File

@@ -907,12 +907,6 @@ static MPP_RET hal_h265d_vdpu34x_gen_regs(void *hal, HalTaskInfo *syn)
hw_regs = (Vdpu34xH265dRegSet*)reg_ctx->hw_regs;
memset(hw_regs, 0, sizeof(Vdpu34xH265dRegSet));
if (reg_ctx->is_v34x) {
hal_h265d_v345_output_pps_packet(hal, syn->dec.syntax.data);
} else {
hal_h265d_output_pps_packet(hal, syn->dec.syntax.data);
}
if (NULL == reg_ctx->hw_regs) {
return MPP_ERR_NULL_PTR;
}
@@ -1135,6 +1129,12 @@ static MPP_RET hal_h265d_vdpu34x_gen_regs(void *hal, HalTaskInfo *syn)
return MPP_OK;
}
if (reg_ctx->is_v34x) {
hal_h265d_v345_output_pps_packet(hal, syn->dec.syntax.data);
} else {
hal_h265d_output_pps_packet(hal, syn->dec.syntax.data);
}
trans_cfg.reg_idx = 161;
trans_cfg.offset = reg_ctx->spspps_offset;
mpp_dev_ioctl(reg_ctx->dev, MPP_DEV_REG_OFFSET, &trans_cfg);

3
mpp/hal/rkdec/h265d/hal_h265d_vdpu382.c
View File

@@ -713,8 +713,6 @@ static MPP_RET hal_h265d_vdpu382_gen_regs(void *hal, HalTaskInfo *syn)
hw_regs = (Vdpu382H265dRegSet*)reg_ctx->hw_regs;
memset(hw_regs, 0, sizeof(Vdpu382H265dRegSet));
hal_h265d_v382_output_pps_packet(hal, syn->dec.syntax.data);
if (NULL == reg_ctx->hw_regs) {
return MPP_ERR_NULL_PTR;
}
@@ -911,6 +909,7 @@ static MPP_RET hal_h265d_vdpu382_gen_regs(void *hal, HalTaskInfo *syn)
SET_POC_HIGNBIT_INFO(hw_regs->highpoc, i, poc_highbit, 3);
}
}
hal_h265d_v382_output_pps_packet(hal, syn->dec.syntax.data);
trans_cfg.reg_idx = 161;
trans_cfg.offset = reg_ctx->spspps_offset;

36
mpp/hal/rkdec/h265d/hal_h265d_vdpu383.c
View File

@@ -925,8 +925,6 @@ static MPP_RET hal_h265d_vdpu383_gen_regs(void *hal, HalTaskInfo *syn)
hw_regs = (Vdpu383H265dRegSet*)reg_ctx->hw_regs;
memset(hw_regs, 0, sizeof(Vdpu383H265dRegSet));
hal_h265d_v345_output_pps_packet(hal, syn->dec.syntax.data);
if (NULL == reg_ctx->hw_regs) {
return MPP_ERR_NULL_PTR;
}
@@ -1066,22 +1064,6 @@ static MPP_RET hal_h265d_vdpu383_gen_regs(void *hal, HalTaskInfo *syn)
hal_h265d_vdpu383_rps(syn->dec.syntax.data, rps_ptr, reg_ctx->sw_rps_buf, reg_ctx->fast_mode);
MppDevRegOffsetCfg trans_cfg;
/* pps */
hw_regs->common_addr.reg131_gbl_base = reg_ctx->bufs_fd;
hw_regs->h265d_paras.reg67_global_len = 0xc; //22 * 8;
trans_cfg.reg_idx = 131;
trans_cfg.offset = reg_ctx->spspps_offset;
mpp_dev_ioctl(reg_ctx->dev, MPP_DEV_REG_OFFSET, &trans_cfg);
/* rps */
hw_regs->common_addr.reg129_rps_base = reg_ctx->bufs_fd;
trans_cfg.reg_idx = 129;
trans_cfg.offset = reg_ctx->rps_offset;
mpp_dev_ioctl(reg_ctx->dev, MPP_DEV_REG_OFFSET, &trans_cfg);
hw_regs->common_addr.reg128_strm_base = mpp_buffer_get_fd(streambuf);
hw_regs->h265d_paras.reg66_stream_len = ((dxva_ctx->bitstream_size + 15) & (~15)) + 64;
aglin_offset = hw_regs->h265d_paras.reg66_stream_len - dxva_ctx->bitstream_size;
@@ -1163,6 +1145,24 @@ static MPP_RET hal_h265d_vdpu383_gen_regs(void *hal, HalTaskInfo *syn)
return MPP_OK;
}
MppDevRegOffsetCfg trans_cfg;
/* pps */
hw_regs->common_addr.reg131_gbl_base = reg_ctx->bufs_fd;
hw_regs->h265d_paras.reg67_global_len = 0xc; //22 * 8;
trans_cfg.reg_idx = 131;
trans_cfg.offset = reg_ctx->spspps_offset;
mpp_dev_ioctl(reg_ctx->dev, MPP_DEV_REG_OFFSET, &trans_cfg);
/* rps */
hw_regs->common_addr.reg129_rps_base = reg_ctx->bufs_fd;
trans_cfg.reg_idx = 129;
trans_cfg.offset = reg_ctx->rps_offset;
mpp_dev_ioctl(reg_ctx->dev, MPP_DEV_REG_OFFSET, &trans_cfg);
hal_h265d_v345_output_pps_packet(hal, syn->dec.syntax.data);
for (i = 0; i < (RK_S32)MPP_ARRAY_ELEMS(dxva_ctx->pp.RefPicList); i++) {
if (dxva_ctx->pp.RefPicList[i].bPicEntry != 0xff &&