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

[h264d]: Fix dpb stuck issue on decoding airplay

Browse Source 
The no_output_of_prior_pics_flag flag in apple airplay stream is true.
This will cause dpb slot leak in idr_memory_management function.
The no_output_of_prior_pics_flag flag require the frame before IDR frame
should be discard rather than display. So we need to unmark the frames
in dpb and then mark them to be displayed to avoid they to be send to
display queue.

NOTE: when clearing no output frame we need to remove it first with
p_mark->out_flag is false to insure the CODEC_USE flag in mpp_buf_slot is
clear. Then set is_output flag to true to avoid real output this frame
to display queue.

Change-Id: Ib9bcebe6b84ceb96350bf405b9bed96e7fa0ca2e
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Herman Chen
2019-04-25 15:30:34 +08:00
parent eaa9840c1d
commit c2e89f5010
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1501,21 +1501,19 @@ MPP_RET idr_memory_management(H264_DpbBuf_t *p_Dpb, H264_StorePic_t *p)
//!< free all stored pictures //!< free all stored pictures
for (i = 0; i < p_Dpb->used_size; i++) { for (i = 0; i < p_Dpb->used_size; i++) {
//!< reset all reference settings //!< reset all reference settings
free_frame_store(p_Dpb->p_Vid->p_Dec, p_Dpb->fs[i]); unmark_for_reference(p_Dpb->p_Vid->p_Dec, p_Dpb->fs[i]);
p_Dpb->fs[i] = alloc_frame_store(); // NOTE: when clearing no output frame we need to remove it first
MEM_CHECK(ret, p_Dpb->fs[i]); // with p_mark->out_flag is false to insure the CODEC_USE flag in
// mpp_buf_slot is clear. Then set is_output flag to true to avoid
// real output this frame to display queue.
FUN_CHECK(ret = remove_frame_from_dpb(p_Dpb, i));
p_Dpb->fs[i]->is_output = 1;
} }
for (i = 0; i < p_Dpb->ref_frames_in_buffer; i++) {
p_Dpb->fs_ref[i] = NULL;
}
for (i = 0; i < p_Dpb->ltref_frames_in_buffer; i++) {
p_Dpb->fs_ltref[i] = NULL;
}
p_Dpb->used_size = 0;
} else {
type = (p->layer_id == 0) ? 1 : 2;
FUN_CHECK(ret = flush_dpb(p_Dpb, type));
} }
type = (p->layer_id == 0) ? 1 : 2;
FUN_CHECK(ret = flush_dpb(p_Dpb, type));
p_Dpb->last_picture = NULL; p_Dpb->last_picture = NULL;
update_ref_list(p_Dpb); update_ref_list(p_Dpb);