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

[h265d]: split mode: deal with eos_packet has data

Browse Source 
tips: when last packet is not empty and has data should decode
it and then flush dpb.

Change-Id: Ia677a3bc8163405feb50ce426d954a1477dc3146
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
This commit is contained in:
Ding Wei
2018-01-03 15:57:58 +08:00
committed by Herman Chen
parent 7b7b509847
commit ecd1acb2b6
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mpp/codec/dec/h265/h265d_parser.c
View File

@@ -239,13 +239,16 @@ static RK_S32 h265d_split_frame(void *sc,
mpp_fetch_timestamp(s, 0); mpp_fetch_timestamp(s, 0);
} }
if (s->eos) { if (s->eos && !buf_size) {
*poutbuf = s->buffer; *poutbuf = s->buffer;
*poutbuf_size = s->index; *poutbuf_size = s->index;
return 0; return 0;
} }
next = hevc_find_frame_end(s, buf, buf_size); next = hevc_find_frame_end(s, buf, buf_size);
if (s->eos && buf_size && next == END_NOT_FOUND) {
next = buf_size;
}
if (mpp_combine_frame(s, next, &buf, &buf_size) < 0) { if (mpp_combine_frame(s, next, &buf, &buf_size) < 0) {
*poutbuf = NULL; *poutbuf = NULL;
@@ -1728,6 +1731,7 @@ MPP_RET h265d_prepare(void *ctx, MppPacket pkt, HalDecTask *task)
s->checksum_buf_size = split_size; s->checksum_buf_size = split_size;
h265d_dbg(H265D_DBG_TIME, "split frame get pts %lld", sc->pts); h265d_dbg(H265D_DBG_TIME, "split frame get pts %lld", sc->pts);
s->pts = sc->pts; s->pts = sc->pts;
s->eos = (s->eos && (mpp_packet_get_length(pkt) < 4)) ? 1 : 0;
} else { } else {
return MPP_FAIL_SPLIT_FRAME; return MPP_FAIL_SPLIT_FRAME;
} }
@@ -1801,14 +1805,11 @@ MPP_RET h265d_parse(void *ctx, HalDecTask *task)
s->task->syntax.data = s->hal_pic_private; s->task->syntax.data = s->hal_pic_private;
s->task->syntax.number = 1; s->task->syntax.number = 1;
s->task->valid = 1; s->task->valid = 1;
if (s->eos) {
s->task->flags.eos = 1; }
} if (s->eos) {
} else { h265d_flush(ctx);
if (s->eos) { s->task->flags.eos = 1;
h265d_flush(ctx);
s->task->flags.eos = 1;
}
} }
s->nb_frame++; s->nb_frame++;
if (s->is_decoded) { if (s->is_decoded) {