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

[h264d]: fix bug: fast output frame

Browse Source 
tip: when first frame is field, missing to write out.

Change-Id: I22f3e6041b9cceebefd3bec953c333a91e721b00
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
This commit is contained in:
Ding Wei
2018-10-31 09:22:36 +08:00
committed by Herman Chen
parent 1bd32f0745
commit 1babbc9cc2
1 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
mpp/codec/dec/h264/h264d_dpb.c
View File

@@ -1242,6 +1242,41 @@ __FAILED:
return ret; return ret;
} }
static MPP_RET scan_dpb_output(H264_DpbBuf_t *p_Dpb, H264_StorePic_t *p)
{
MPP_RET ret = MPP_NOK;
H264_FrameStore_t *fs = p_Dpb->fs[p_Dpb->used_size - 1];
if (fs->is_used == 3) {
RK_S32 min_poc = 0, min_pos = 0;
RK_S32 poc_inc = fs->poc - p_Dpb->last_output_poc;
H264dErrCtx_t *p_err = &p_Dpb->p_Vid->p_Dec->errctx;
if ((p_Dpb->last_output_poc > INT_MIN) && abs(poc_inc) & 0x1) {
p_Dpb->poc_interval = 1;
}
if (p_Dpb->p_Vid->p_Dec->immediate_out ||
(p_err->i_slice_no < 2 && p_Dpb->last_output_poc == INT_MIN)) {
FUN_CHECK(ret = write_stored_frame(p_Dpb->p_Vid, p_Dpb, fs));
} else {
while ((p_Dpb->last_output_poc > INT_MIN)
&& (get_smallest_poc(p_Dpb, &min_poc, &min_pos))) {
if ((min_poc - p_Dpb->last_output_poc) <= p_Dpb->poc_interval) {
FUN_CHECK(ret = write_stored_frame(p_Dpb->p_Vid, p_Dpb, p_Dpb->fs[min_pos]));
} else {
break;
}
}
while (!remove_unused_frame_from_dpb(p_Dpb));
}
}
return MPP_OK;
__FAILED:
return ret;
}
/*! /*!
*********************************************************************** ***********************************************************************
* \brief * \brief
@@ -1252,7 +1287,6 @@ __FAILED:
MPP_RET store_picture_in_dpb(H264_DpbBuf_t *p_Dpb, H264_StorePic_t *p) MPP_RET store_picture_in_dpb(H264_DpbBuf_t *p_Dpb, H264_StorePic_t *p)
{ {
MPP_RET ret = MPP_ERR_UNKNOW; MPP_RET ret = MPP_ERR_UNKNOW;
H264_FrameStore_t *fs = NULL;
H264dVideoCtx_t *p_Vid = p_Dpb->p_Vid; H264dVideoCtx_t *p_Vid = p_Dpb->p_Vid;
VAL_CHECK(ret, NULL != p); //!< if frame, check for new store VAL_CHECK(ret, NULL != p); //!< if frame, check for new store
@@ -1279,8 +1313,7 @@ MPP_RET store_picture_in_dpb(H264_DpbBuf_t *p_Dpb, H264_StorePic_t *p)
FUN_CHECK(ret = direct_output(p_Vid, p_Dpb, p)); //!< output frame FUN_CHECK(ret = direct_output(p_Vid, p_Dpb, p)); //!< output frame
} else { } else {
FUN_CHECK(ret = insert_picture_in_dpb(p_Vid, p_Dpb->last_picture, p, 1)); //!< field_dpb_combine FUN_CHECK(ret = insert_picture_in_dpb(p_Vid, p_Dpb->last_picture, p, 1)); //!< field_dpb_combine
update_ref_list(p_Dpb); scan_dpb_output(p_Dpb, p);
update_ltref_list(p_Dpb);
} }
p_Dpb->last_picture = NULL; p_Dpb->last_picture = NULL;
goto __RETURN; goto __RETURN;
@@ -1329,32 +1362,7 @@ MPP_RET store_picture_in_dpb(H264_DpbBuf_t *p_Dpb, H264_StorePic_t *p)
p_Dpb->used_size++; p_Dpb->used_size++;
H264D_DBG(H264D_DBG_DPB_INFO, "[DPB_size] p_Dpb->used_size=%d", p_Dpb->used_size); H264D_DBG(H264D_DBG_DPB_INFO, "[DPB_size] p_Dpb->used_size=%d", p_Dpb->used_size);
#if 1 scan_dpb_output(p_Dpb, p);
fs = p_Dpb->fs[p_Dpb->used_size - 1];
if (fs->is_used == 3) {
RK_S32 min_poc = 0, min_pos = 0;
RK_S32 poc_inc = fs->poc - p_Dpb->last_output_poc;
if ((p_Dpb->last_output_poc > INT_MIN) && abs(poc_inc) & 0x1) {
p_Dpb->poc_interval = 1;
}
if (p->idr_flag || (p->poc == 0)
|| (p_Dpb->last_output_poc == INT_MIN)
|| p_Vid->p_Dec->immediate_out) {
FUN_CHECK(ret = write_stored_frame(p_Vid, p_Dpb, fs));
}
while ((p_Dpb->last_output_poc > INT_MIN)
&& (get_smallest_poc(p_Dpb, &min_poc, &min_pos))) {
if ((min_poc - p_Dpb->last_output_poc) <= p_Dpb->poc_interval) {
FUN_CHECK(ret = write_stored_frame(p_Vid, p_Dpb, p_Dpb->fs[min_pos]));
} else {
break;
}
}
while (!remove_unused_frame_from_dpb(p_Dpb));
}
#endif
update_ref_list(p_Dpb); update_ref_list(p_Dpb);
update_ltref_list(p_Dpb); update_ltref_list(p_Dpb);