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

fix[av1d]: Fix scanlist calc issue

Browse Source 
sync with c_model

Change-Id: I71b0594814e34f9d9330d79143248f03c62416a7
Signed-off-by: Hongjin Li <vic.hong@rock-chips.com>
This commit is contained in:
Hongjin Li
2024-03-14 11:19:56 +08:00
parent ec2666fc6f
commit b37a668bad
1 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
mpp/hal/rkdec/h264d/hal_h264d_vdpu383.c
View File

@@ -254,6 +254,15 @@ static MPP_RET prepare_spspps(H264dHalCtx_t *p_hal, RK_U64 *data, RK_U32 len)
mpp_put_align(&bp, 64, 0);//128 mpp_put_align(&bp, 64, 0);//128
} }
#ifdef DUMP_VDPU383_DATAS
{
char *cur_fname = "global_cfg.dat";
memset(dump_cur_fname_path, 0, sizeof(dump_cur_fname_path));
sprintf(dump_cur_fname_path, "%s/%s", dump_cur_dir, cur_fname);
dump_data_to_file(dump_cur_fname_path, (void *)bp.pbuf, 64 * bp.index + bp.bitpos, 64, 0);
}
#endif
return MPP_OK; return MPP_OK;
} }
@@ -323,6 +332,15 @@ static MPP_RET prepare_framerps(H264dHalCtx_t *p_hal, RK_U64 *data, RK_U32 len)
mpp_put_align(&bp, 128, 0); mpp_put_align(&bp, 128, 0);
#ifdef DUMP_VDPU383_DATAS
{
char *cur_fname = "rps.dat";
memset(dump_cur_fname_path, 0, sizeof(dump_cur_fname_path));
sprintf(dump_cur_fname_path, "%s/%s", dump_cur_dir, cur_fname);
dump_data_to_file(dump_cur_fname_path, (void *)bp.pbuf, 64 * bp.index + bp.bitpos, 64, 0);
}
#endif
return MPP_OK; return MPP_OK;
} }
@@ -336,10 +354,10 @@ static MPP_RET prepare_scanlist(H264dHalCtx_t *p_hal, RK_U8 *data, RK_U32 len)
for (i = 0; i < 6; i++) { //4x4, 6 lists for (i = 0; i < 6; i++) { //4x4, 6 lists
/* dump by block4x4, vectial direction */ /* dump by block4x4, vectial direction */
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
data[n++] = p_hal->qm->bScalingLists4x4[i][j + 0]; data[n++] = p_hal->qm->bScalingLists4x4[i][j * 4 + 0];
data[n++] = p_hal->qm->bScalingLists4x4[i][j + 4]; data[n++] = p_hal->qm->bScalingLists4x4[i][j * 4 + 1];
data[n++] = p_hal->qm->bScalingLists4x4[i][j + 8]; data[n++] = p_hal->qm->bScalingLists4x4[i][j * 4 + 2];
data[n++] = p_hal->qm->bScalingLists4x4[i][j + 12]; data[n++] = p_hal->qm->bScalingLists4x4[i][j * 4 + 3];
} }
} }
@@ -352,10 +370,10 @@ static MPP_RET prepare_scanlist(H264dHalCtx_t *p_hal, RK_U8 *data, RK_U32 len)
RK_U32 pos = blk4_y * 8 + blk4_x; RK_U32 pos = blk4_y * 8 + blk4_x;
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
data[n++] = p_hal->qm->bScalingLists8x8[i][pos + j + 0]; data[n++] = p_hal->qm->bScalingLists8x8[i][pos + j * 8 + 0];
data[n++] = p_hal->qm->bScalingLists8x8[i][pos + j + 8]; data[n++] = p_hal->qm->bScalingLists8x8[i][pos + j * 8 + 1];
data[n++] = p_hal->qm->bScalingLists8x8[i][pos + j + 16]; data[n++] = p_hal->qm->bScalingLists8x8[i][pos + j * 8 + 2];
data[n++] = p_hal->qm->bScalingLists8x8[i][pos + j + 24]; data[n++] = p_hal->qm->bScalingLists8x8[i][pos + j * 8 + 3];
} }
} }
} }
@@ -363,6 +381,15 @@ static MPP_RET prepare_scanlist(H264dHalCtx_t *p_hal, RK_U8 *data, RK_U32 len)
mpp_assert(n <= len); mpp_assert(n <= len);
#ifdef DUMP_VDPU383_DATAS
{
char *cur_fname = "scanlist.dat";
memset(dump_cur_fname_path, 0, sizeof(dump_cur_fname_path));
sprintf(dump_cur_fname_path, "%s/%s", dump_cur_dir, cur_fname);
dump_data_to_file(dump_cur_fname_path, (void *)data, 8 * n, 128, 0);
}
#endif
return MPP_OK; return MPP_OK;
} }