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

[h265d]: fix bug: hor_stride mismatch

Browse Source 
tips: hor_stride value sett mismatch between parser and hal.

Change-Id: Ia8b9ab660c1a5f29ad71ccba418bb629f1487ef2
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
This commit is contained in:
Ding Wei
2019-08-29 11:09:45 +08:00
parent d499d95128
commit 11f4844482
2 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mpp/codec/dec/h265/h265d_refs.c
View File

@@ -85,7 +85,8 @@ static HEVCFrame *alloc_frame(HEVCContext *s)
h265d_dbg(H265D_DBG_GLOBAL, "width = %d height = %d", s->h265dctx->width, s->h265dctx->height); h265d_dbg(H265D_DBG_GLOBAL, "width = %d height = %d", s->h265dctx->width, s->h265dctx->height);
mpp_frame_set_width(frame->frame, s->h265dctx->width); mpp_frame_set_width(frame->frame, s->h265dctx->width);
mpp_frame_set_height(frame->frame, s->h265dctx->height); mpp_frame_set_height(frame->frame, s->h265dctx->height);
mpp_frame_set_hor_stride(frame->frame, (s->h265dctx->coded_width * s->h265dctx->nBitDepth) >> 3); mpp_frame_set_hor_stride(frame->frame,
(MPP_ALIGN(s->h265dctx->coded_width, 64) * s->h265dctx->nBitDepth) >> 3);
mpp_frame_set_ver_stride(frame->frame, s->h265dctx->coded_height); mpp_frame_set_ver_stride(frame->frame, s->h265dctx->coded_height);
mpp_frame_set_fmt(frame->frame, s->h265dctx->pix_fmt); mpp_frame_set_fmt(frame->frame, s->h265dctx->pix_fmt);
mpp_frame_set_errinfo(frame->frame, 0); mpp_frame_set_errinfo(frame->frame, 0);

38
mpp/hal/rkdec/h265d/hal_h265d_reg.c
View File

@@ -1319,11 +1319,11 @@ static RK_S32 hal_h265d_output_pps_packet(void *hal, void *dxva)
MPP_RET hal_h265d_gen_regs(void *hal, HalTaskInfo *syn) MPP_RET hal_h265d_gen_regs(void *hal, HalTaskInfo *syn)
{ {
RK_U32 uiMaxCUWidth, uiMaxCUHeight;
RK_U32 log2_min_cb_size;
RK_S32 width, height, numCuInWidth;
RK_S32 stride_y, stride_uv, virstrid_y, virstrid_yuv;
RK_S32 i = 0; RK_S32 i = 0;
RK_S32 log2_min_cb_size;
RK_S32 width, height;
RK_S32 stride_y, stride_uv, virstrid_y, virstrid_yuv;
H265d_REGS_t *hw_regs; H265d_REGS_t *hw_regs;
RK_S32 ret = MPP_SUCCESS; RK_S32 ret = MPP_SUCCESS;
@@ -1384,25 +1384,15 @@ MPP_RET hal_h265d_gen_regs(void *hal, HalTaskInfo *syn)
hw_regs = (H265d_REGS_t*)reg_cxt->hw_regs; hw_regs = (H265d_REGS_t*)reg_cxt->hw_regs;
memset(hw_regs, 0, sizeof(H265d_REGS_t)); memset(hw_regs, 0, sizeof(H265d_REGS_t));
uiMaxCUWidth = 1 << (dxva_cxt->pp.log2_diff_max_min_luma_coding_block_size
+ dxva_cxt->pp.log2_min_luma_coding_block_size_minus3
+ 3);
uiMaxCUHeight = uiMaxCUWidth;
log2_min_cb_size = dxva_cxt->pp.log2_min_luma_coding_block_size_minus3 + 3; log2_min_cb_size = dxva_cxt->pp.log2_min_luma_coding_block_size_minus3 + 3;
width = (dxva_cxt->pp.PicWidthInMinCbsY << log2_min_cb_size); width = (dxva_cxt->pp.PicWidthInMinCbsY << log2_min_cb_size);
height = (dxva_cxt->pp.PicHeightInMinCbsY << log2_min_cb_size); height = (dxva_cxt->pp.PicHeightInMinCbsY << log2_min_cb_size);
numCuInWidth = width / uiMaxCUWidth + (width % uiMaxCUWidth != 0); stride_y = ((MPP_ALIGN(width, 64)
* (dxva_cxt->pp.bit_depth_luma_minus8 + 8)) >> 3);
stride_y = (((numCuInWidth * uiMaxCUWidth stride_uv = ((MPP_ALIGN(width, 64)
* (dxva_cxt->pp.bit_depth_luma_minus8 + 8) + 7) * (dxva_cxt->pp.bit_depth_chroma_minus8 + 8)) >> 3);
& (~7)) >> 3);
stride_uv = (((numCuInWidth * uiMaxCUHeight
* (dxva_cxt->pp.bit_depth_chroma_minus8 + 8) + 7)
& (~7)) >> 3);
stride_y = hevc_hor_align(stride_y); stride_y = hevc_hor_align(stride_y);
stride_uv = hevc_hor_align(stride_uv); stride_uv = hevc_hor_align(stride_uv);
@@ -1410,14 +1400,10 @@ MPP_RET hal_h265d_gen_regs(void *hal, HalTaskInfo *syn)
virstrid_yuv = virstrid_y + stride_uv * hevc_ver_align(height) / 2; virstrid_yuv = virstrid_y + stride_uv * hevc_ver_align(height) / 2;
hw_regs->sw_picparameter.sw_slice_num = dxva_cxt->slice_count; hw_regs->sw_picparameter.sw_slice_num = dxva_cxt->slice_count;
hw_regs->sw_picparameter.sw_y_hor_virstride hw_regs->sw_picparameter.sw_y_hor_virstride = stride_y >> 4;
= stride_y >> 4; hw_regs->sw_picparameter.sw_uv_hor_virstride = stride_uv >> 4;
hw_regs->sw_picparameter.sw_uv_hor_virstride hw_regs->sw_y_virstride = virstrid_y >> 4;
= stride_uv >> 4; hw_regs->sw_yuv_virstride = virstrid_yuv >> 4;
hw_regs->sw_y_virstride
= virstrid_y >> 4;
hw_regs->sw_yuv_virstride
= virstrid_yuv >> 4;
mpp_buf_slot_get_prop(reg_cxt->slots, dxva_cxt->pp.CurrPic.Index7Bits, mpp_buf_slot_get_prop(reg_cxt->slots, dxva_cxt->pp.CurrPic.Index7Bits,
SLOT_BUFFER, &framebuf); SLOT_BUFFER, &framebuf);