package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-11-02 13:34:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[h264d]: fix the derivation of mbaff.

Browse Source 
Signed-off-by: xueman.ruan <xueman.ruan@rock-chips.com>
Change-Id: I3a119e2d9eb90158d837bd35b03d0d436425764e
This commit is contained in:
xueman.ruan
2023-06-16 11:20:44 +08:00
parent f1734a1737
commit 8a54ab8d7d
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mpp/codec/dec/h264/h264d_slice.c
View File

@@ -487,7 +487,8 @@ MPP_RET process_slice(H264_SLICE_t *currSlice)
}
}
currSlice->structure = p_Vid->structure;
currSlice->mb_aff_frame_flag = currSlice->active_sps->mb_adaptive_frame_field_flag;
currSlice->mb_aff_frame_flag = currSlice->active_sps->mb_adaptive_frame_field_flag &&
!currSlice->field_pic_flag;
if (currSlice->idr_flag) {
READ_UE(p_bitctx, &currSlice->idr_pic_id);
} else if (currSlice->svc_extension_flag == 0 && currSlice->mvcExt.non_idr_flag == 0) {

4
mpp/hal/rkdec/h264d/hal_h264d_vdpu34x.c
View File

@@ -878,6 +878,10 @@ static void hal_h264d_rcb_info_update(void *hal, Vdpu34xH264dRegSet *regs)
mpp_buffer_get(p_hal->buf_group, &rcb_buf, ctx->rcb_buf_size);
ctx->rcb_buf[i] = rcb_buf;
}
if (mbaff && 2 == chroma_format_idc)
mpp_err("Warning: rkv do not support H.264 4:2:2 MBAFF decoding.");
ctx->bit_depth = bit_depth;
ctx->width = width;
ctx->height = height;