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

[h264d]: fix bug: when avcC mode, and contains mutil nalus

Browse Source 
tips: when one packet has mutil frames, and has muti nalus,
then, it should check first_mb_in_slice, and then split
nalus to frame or field.

Change-Id: Ie8a194f069c1174fc1210896b9f0787cd144159d
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
This commit is contained in:
Ding Wei
2018-05-11 17:54:04 +08:00
committed by Herman Chen
parent 6cbdac920c
commit e39b6456b9
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mpp/codec/dec/h264/h264d_parse.c
View File

@@ -769,6 +769,7 @@ MPP_RET parse_prepare_avcC_data(H264dInputCtx_t *p_Inp, H264dCurCtx_t *p_Cur)
p_strm->nalu_len = parse_nal_size(p_Inp->nal_size, p_strm->curdata);
if (p_strm->nalu_len <= 0 || p_strm->nalu_len >= p_Inp->in_length) {
p_Cur->p_Dec->is_new_frame = 1;
p_Cur->p_Dec->have_slice_data = 0;
pkt_impl->length = 0;
p_Inp->in_length = 0;
p_strm->nalu_len = 0;
@@ -778,6 +779,16 @@ MPP_RET parse_prepare_avcC_data(H264dInputCtx_t *p_Inp, H264dCurCtx_t *p_Cur)
p_strm->nalu_buf = NULL;
goto __FAILED;
}
p_strm->nalu_buf = p_strm->curdata + p_Inp->nal_size;
judge_is_new_frame(p_Cur, p_strm);
if (p_Cur->p_Dec->is_new_frame) {
p_Cur->p_Dec->have_slice_data = 0;
p_strm->startcode_found = 1;
p_strm->endcode_found = 0;
break;
}
p_strm->curdata += p_Inp->nal_size;
p_strm->nalu_offset += p_Inp->nal_size;
pkt_impl->length -= p_Inp->nal_size;
@@ -800,15 +811,15 @@ MPP_RET parse_prepare_avcC_data(H264dInputCtx_t *p_Inp, H264dCurCtx_t *p_Cur)
if (p_Inp->in_length < p_Inp->nal_size) {
p_Cur->p_Dec->is_new_frame = 1;
p_Cur->p_Dec->have_slice_data = 0;
pkt_impl->length = 0;
p_Inp->in_length = 0;
p_strm->nalu_len = 0;
p_strm->nalu_offset = 0;
p_strm->startcode_found = 1;
p_strm->endcode_found = 0;
p_strm->nalu_buf = NULL;
break;
} else if ((p_strm->nalu_type == NALU_TYPE_SLICE)
|| (p_strm->nalu_type == NALU_TYPE_IDR)) {
p_Cur->p_Dec->is_new_frame = 1;
break;
}
}
//!< one frame end