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

[h264d]: relax condition: check frame_num continue

Browse Source 
tips:
1. In h264 protocol, last frame is used for reference, current frame num
must increase by one, otherwise equel last frame.
2. Very few error stream, not increase by one, then consider it error.
for this case, relax condition, just check cur->frame_num is equal to
last_frame->frame_num or increse by one, not consider whehter last_frame
is reference or not.

Change-Id: I885074b781fa5a53419e77e9e73243b439bf15d4
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
This commit is contained in:
Ding Wei
2018-08-22 16:55:44 +08:00
parent 84bc2e31c0
commit 5c2f044d43
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mpp/codec/dec/h264/h264d_init.c
View File

@@ -509,13 +509,12 @@ static MPP_RET check_dpb_discontinuous(H264_StorePic_t *p_last, H264_StorePic_t
#if 1
if (p_last && dec_pic && (dec_pic->slice_type != I_SLICE)) {
RK_U32 error_flag = 0;
RK_U32 wrap_frame_num = 0;
if (p_last->used_for_reference && !dec_pic->combine_flag) {
wrap_frame_num = (p_last->frame_num + 1) % currSlice->p_Vid->max_frame_num;
} else {
wrap_frame_num = p_last->frame_num;
}
error_flag = (wrap_frame_num != dec_pic->frame_num) ? 1 : 0;
if (dec_pic->frame_num == p_last->frame_num ||
dec_pic->frame_num == (p_last->frame_num + 1))
error_flag = 0;
else
error_flag = 1;
currSlice->p_Dec->errctx.cur_err_flag |= error_flag ? 1 : 0;
H264D_DBG(H264D_DBG_DISCONTINUOUS, "[discontinuous] last_slice=%d, cur_slice=%d, last_fnum=%d, cur_fnum=%d, last_poc=%d, cur_poc=%d",