From patchwork Fri Nov 2 13:30:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 10895 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A4DE344DF86 for ; Fri, 2 Nov 2018 15:30:23 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 19FD068A9CB; Fri, 2 Nov 2018 15:29:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m15-112.126.com (m15-112.126.com [220.181.15.112]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 63AA968A9B8 for ; Fri, 2 Nov 2018 15:29:45 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=9w6Lw4IQMB2+q/7OTD L127eX2+RxzVm4lpxeu/vpEHc=; b=f6hvfA/NSqd6Qm1FfDOB3l//lrhWfIPUBW UF5DbPINm50TgPxceBN2lddbGuj3TYJnroJRq+fDuJlNNOPlM1ia/CgH5W21/pWE mklcT8NfFXGa92GNbgjftSdN5fa63tPMGM6dQa3CbSpRVa833PyLtIfwLMg3+Q3n +LUa/WK58= Received: from localhost.localdomain (unknown [223.71.83.109]) by smtp2 (Coremail) with SMTP id DMmowAAHa0lkUdxbihHaCQ--.37249S3; Fri, 02 Nov 2018 21:30:14 +0800 (CST) From: hwren To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Nov 2018 21:30:08 +0800 Message-Id: <1541165411-4524-1-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: X-CM-TRANSID: DMmowAAHa0lkUdxbihHaCQ--.37249S3 X-Coremail-Antispam: 1Uf129KBjvdXoWruw1xurWrJw15Ww18JF1rXrb_yoWfuFc_KF 1UZ34DAryUCa17J3yUJrZIv34rWw48CF48W3W7trsYgrW7Xrn8XFsrXrs2va9xuwsYyF18 Cw1kZr1fJw4vgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU8zpB3UUUUU== X-Originating-IP: [223.71.83.109] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbiLQby6VpD6P+cYAAAsC Subject: [FFmpeg-devel] [PATCH v5 1/4] lavc/libdavs2: fix sequence incomplete output error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: hwren --- libavcodec/libdavs2.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c index cadf995..e36bfed 100644 --- a/libavcodec/libdavs2.c +++ b/libavcodec/libdavs2.c @@ -129,7 +129,17 @@ static int davs2_decode_frame(AVCodecContext *avctx, void *data, int ret = DAVS2_DEFAULT; if (!buf_size) { - return 0; + ret = davs2_decoder_flush(cad->decoder, &cad->headerset, &cad->out_frame); + if (ret == DAVS2_END) { + return 0; + } else if (ret == DAVS2_GOT_FRAME) { + *got_frame = davs2_dump_frames(avctx, &cad->out_frame, &cad->headerset, ret, frame); + davs2_decoder_frame_unref(cad->decoder, &cad->out_frame); + return ret; + } else { + av_log(avctx, AV_LOG_ERROR, "Decoder error: dump frames failed\n"); + return AVERROR_EXTERNAL; + } } cad->packet.data = buf_ptr;