mirror of
https://github.com/nyanmisaka/mpp.git
synced 2025-10-20 07:54:32 +08:00
[h264d]: remove extra flush on deinit
[h265d]: prevent possible multiple set eos git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@882 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
@@ -446,7 +446,6 @@ MPP_RET h264d_deinit(void *decoder)
|
|||||||
|
|
||||||
INP_CHECK(ret, !decoder);
|
INP_CHECK(ret, !decoder);
|
||||||
FunctionIn(p_Dec->logctx.parr[RUN_PARSE]);
|
FunctionIn(p_Dec->logctx.parr[RUN_PARSE]);
|
||||||
h264d_flush(decoder);
|
|
||||||
free_input_ctx(p_Dec->p_Inp);
|
free_input_ctx(p_Dec->p_Inp);
|
||||||
MPP_FREE(p_Dec->p_Inp);
|
MPP_FREE(p_Dec->p_Inp);
|
||||||
free_cur_ctx(p_Dec->p_Cur);
|
free_cur_ctx(p_Dec->p_Cur);
|
||||||
|
@@ -1981,6 +1981,7 @@ MPP_RET h265d_flush(void *ctx)
|
|||||||
frame = &s->DPB[s->output_frame_idx];
|
frame = &s->DPB[s->output_frame_idx];
|
||||||
if ((frame->slot_index < 0xff) && s->eos) {
|
if ((frame->slot_index < 0xff) && s->eos) {
|
||||||
mpp_buf_slot_set_prop(s->slots, frame->slot_index, SLOT_EOS, &eos);
|
mpp_buf_slot_set_prop(s->slots, frame->slot_index, SLOT_EOS, &eos);
|
||||||
|
frame->slot_index = 0xff;
|
||||||
} else {
|
} else {
|
||||||
if (s->notify_cb.callBack != NULL && s->eos) {
|
if (s->notify_cb.callBack != NULL && s->eos) {
|
||||||
s->notify_cb.callBack(s->notify_cb.opaque, NULL);
|
s->notify_cb.callBack(s->notify_cb.opaque, NULL);
|
||||||
|
Reference in New Issue
Block a user