From patchwork Wed Jul 14 07:54:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 28917 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp167256ios; Wed, 14 Jul 2021 00:54:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFElv8n8gc6PDAINlQJfNg/mmraEta6BLcVxWh5kDdN87zQVx29y1Ok7Kx1YLLEGdX0KuV X-Received: by 2002:a17:906:c256:: with SMTP id bl22mr11171770ejb.115.1626249277417; Wed, 14 Jul 2021 00:54:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626249277; cv=none; d=google.com; s=arc-20160816; b=bRFuBaRf1AFkAib5DlrIbnDF1TmAaZyV9NAzD0oLNMqXnA5jG7irP5Crljqt5Fcjmv JhFA9hAu+NoCZCuLpf92GEjuywQdMbSUUCN3Xg8D/UqVXjwrhY4q/WmZQ5AM1TlPerLL NqqDN101BqM1gqIEbvlbcs3eAQvu+h9VEadQelVu/pwVCwJw8p3sv9lTrazulgR/iBkA JT34jTaClzLXPKkzBwp79s27/uxhtnkRaOK04TFwutUdj90GYzw66XqChdZ+XjIm5asG g4NNdGc4I0ZbQ4Y0E4tWdsnI/iCuw5fwIqHmGBaIybTlHkVhu03oBy1vY07IDUkIKI+x g2gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=+sJJccFWwZ72cT74l8mx/+egA6Ni9TOYh2IVN5/belM=; b=kgEaEUcznqzgyP8QDUhNNHPOCuPP57fsRZW/bLTOZETBSrtPnoiQXZkK7Ca0stMNXA B3HMBgzemtr378GzVjOFlT4GGXNGR9pyCPNUKXy2TGXJ6lNgit6m9Rwojnb/Q+AndVj+ lIPTOL8KAUhKPLg8P6//g9iHQPiZ+J4cewtbXMtviJPTtA7MC24926DOYyXSURRqxkGk lJ3uyj5XFTJl1NvqON+Y3yemA7bzMFTQ1AQIE0z43MW4zBuKIcRlHpFUjb+UUcXZtXVR IBw48eJwM+KCnEuv1ZA7fB/Dv8MWN3WezAtHABx0cnkabhhXoC0kFzqrQhC6GcxoMj4+ /7gA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=HzZZwZtt; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k15si1862041eds.442.2021.07.14.00.54.37; Wed, 14 Jul 2021 00:54:37 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=HzZZwZtt; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2B6EC68A596; Wed, 14 Jul 2021 10:54:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-252.mail.qq.com (out162-62-57-252.mail.qq.com [162.62.57.252]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F91568A596 for ; Wed, 14 Jul 2021 10:54:20 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1626249257; bh=sja1dUMHzXv7Aj3UDFf54siMdqlr4iPoZvHw9RRBaYg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HzZZwZttE+FsvH5zp0J/mRn/HFL8FCDc2AwkYY5BaLsRDHVqDzcRPRbQY4U0AzcFg 4V92gNHrSXJGg1czDWn/iRAQRPW/e62HFJSkVHteG9s/sWmUVBXvnW6m47f0SOIwLR 5OCnkoVks+GeATYzTZsgoViT3vKOOXTYv4uFcdG0= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.66]) by newxmesmtplogicsvrszc6.qq.com (NewEsmtp) with SMTP id D903B4E7; Wed, 14 Jul 2021 15:54:16 +0800 X-QQ-mid: xmsmtpt1626249256tz3x2ehxr Message-ID: X-QQ-XMAILINFO: Npjm2tJ2Taz7yIjdwl5nNGEZDvD8/qtlGuAAMXsoq8ntIdNZ0R73toIh1qi+C5 ucbtPNrnmpaqbYFqgIp8Iapnp1CQ6Ti/RrK+SvPtmDJItXU8abDtbuUHQDzyzncQXOxJj3P31tA8 f5gnLv/HdIqhWmpKwh7qRuMF+CJpSyzg8wHgyKBPCF+049nGfrKOJRLPsopNyg4siaKcSd8mhulG b9mSf/1LJWxigDCKHnIx5eklIxZaI1zPpoKN6xkFi3x43pdMBSTrusrPGDRq4erCqyW0FQ5hsmGu qICUTpSg2ZczxEBzb6FPeq7wdF9H16g378KF3qSFMlmVcQ68XVmfDD9u9qz6SYjW/+tzxHCJw/+/ hvOhm6lndpS2DH9GmfcLR415t3SH3M6GFa8HTos0coxxlubZ8XsSN+79GOOm/3r71eSCUC7ZozGh DGrHfFBgP+434Nanqbvi25FFsJZnsQv510EEX043bDPFK5wpnN0A2CAp9+J7eIkl24u69S3mlAqo V/FKkrMz7w9egNyyEjmMH5AatPV+3S1i6Pa6UTcARJ9ogdAMxCyIl9mgYCwTnvhUDyGTS6bchsCD dDcQoqAs2H9/SDnNM06+v3jGX0UtfsSTKlU+G5aOaWDObdwOTk0QvwlEjJ1E2OBN1X5ZAOhrgkYt qL9W18E9rptftbnQU63b4ZNIOom18XF4KueKSj9+oC8VAJdGYtQUgV51bZpO2TXMus/I2J4QLuyi 0+xUzJ6DuzooGPAfjeCL76Qhnf2fE6Cw3K6WpL2HCTZUDZphwEwy+3frKSAsqbzQbFpeazwS9RmV FAf+HP6F/YyyDwV7KjA7C9XgxjNnCNRZszTsFWrf4LnLkE74egMffHfpVfUE0XM4UhTQZmWUsFZQ JZ3C/5+TMF From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Jul 2021 15:54:14 +0800 X-OQ-MSGID: <20210714075414.20553-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4] examples/decode_video: flush parser to fix missing frame X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: NSaYPZtbC1Cb --- v4: break when error occured in fread, fix infinite loop introduced by v3 v3: check EOF by "eof = !data_size && feof(f);" doc/examples/decode_video.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/examples/decode_video.c b/doc/examples/decode_video.c index 18ee90a6c0..7238e38103 100644 --- a/doc/examples/decode_video.c +++ b/doc/examples/decode_video.c @@ -92,6 +92,7 @@ int main(int argc, char **argv) uint8_t *data; size_t data_size; int ret; + int eof; AVPacket *pkt; if (argc <= 2) { @@ -150,15 +151,16 @@ int main(int argc, char **argv) exit(1); } - while (!feof(f)) { + do { /* read raw data from the input file */ data_size = fread(inbuf, 1, INBUF_SIZE, f); - if (!data_size) + if (ferror(f)) break; + eof = !data_size; /* use the parser to split the data into frames */ data = inbuf; - while (data_size > 0) { + while (data_size > 0 || eof) { ret = av_parser_parse2(parser, c, &pkt->data, &pkt->size, data, data_size, AV_NOPTS_VALUE, AV_NOPTS_VALUE, 0); if (ret < 0) { @@ -170,8 +172,10 @@ int main(int argc, char **argv) if (pkt->size) decode(c, frame, pkt, outfilename); + else if (eof) + break; } - } + } while (!eof); /* flush the decoder */ decode(c, frame, NULL, outfilename);