@@ -147,15 +147,17 @@ static int davs2_decode_frame(AVCodecContext *avctx, void *data,
if (!buf_size) {
ret = davs2_decoder_flush(cad->decoder, &cad->headerset, &cad->out_frame);
if (ret == DAVS2_END) {
- return 0;
+ ret = 0;
} else if (ret == DAVS2_GOT_FRAME) {
- *got_frame = davs2_dump_frames(avctx, &cad->out_frame, &cad->headerset, ret, frame);
+ ret = davs2_dump_frames(avctx, &cad->out_frame, &cad->headerset, ret, frame);
davs2_decoder_frame_unref(cad->decoder, &cad->out_frame);
- return ret;
+ if (ret == 0 || ret == 1) {
+ *got_frame = ret;
+ }
} else {
- av_log(avctx, AV_LOG_ERROR, "Decoder error: dump frames failed\n");
- return AVERROR_EXTERNAL;
+ av_log(avctx, AV_LOG_ERROR, "Decoder error: flush frames failed\n");
}
+ return ret;
}
cad->packet.data = buf_ptr;
@@ -174,8 +176,14 @@ static int davs2_decode_frame(AVCodecContext *avctx, void *data,
ret = davs2_decoder_recv_frame(cad->decoder, &cad->headerset, &cad->out_frame);
if (ret != DAVS2_DEFAULT) {
- *got_frame = davs2_dump_frames(avctx, &cad->out_frame, &cad->headerset, ret, frame);
+ ret = davs2_dump_frames(avctx, &cad->out_frame, &cad->headerset, ret, frame);
davs2_decoder_frame_unref(cad->decoder, &cad->out_frame);
+ if (ret == 0 || ret == 1) {
+ *got_frame = ret;
+ } else {
+ av_log(avctx, AV_LOG_ERROR, "Decoder error: dump frames failed\n");
+ return ret;
+ }
}
return buf_size;
Signed-off-by: hwren <hwrenx@126.com> --- libavcodec/libdavs2.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)