From patchwork Wed Jul 14 02:58:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 28921 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp172770ios; Wed, 14 Jul 2021 01:03:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKBwITWZo2cDzWESfNQImcd3IDaduxtS/GFg5RDmKaZN89yyj1lMwgT83nKvRAuH6ZqyTI X-Received: by 2002:a17:906:31cb:: with SMTP id f11mr11049989ejf.379.1626249782046; Wed, 14 Jul 2021 01:03:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626249782; cv=none; d=google.com; s=arc-20160816; b=xpqIrYpm1ALFjkiDcTusE0Xel/2DnV2HYDw0in6tCj5wJZ65gtlaLoAseFKwVBURbJ R1oM3Q2+kw97yoTAeoXrqxa6fwHEyfk4PLp7ngtVVKQeMGm/b6xi/VQqMlO4rSH+xLHu h/x9pP7zmfevMBrxbDHEKh+cHmoqmDyatsGRxTgc0oiSVLk5skZ8RAwzEVUDVzgRUtyX uX5Ox+sNoyxxhYVcLx/7dA1pQ3aGH7tBP0Y776WzbrdfGiT49g76JgSSgPO0bod5vU03 JoO4c8ZRpRj699YLCx2ilLI1yHNuZeCcafat4QoP6LIjjEmW39sBJxdPrrhoeA06nunD A1hQ== 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=kiigY0kb++nwxbP8MumvNfkHR7QDytISpRN9VgdFfRVhUzH0P1GjT58hCdpyoe4j9r DcU6zltmgQKrQV0Z7UzHoOiMNrw9XS8u1vUtqAPNRAplTJDRe9T4JueaOj2tAvyzmsNQ NXUgaY9uKNA0tLzLAmvLJQHmmyF5odrGJWTeCQw3GpzS7r8srAXE9GMCMQWRwsD1oTZM qDPSYZ5dGrly5nIUqKg9XmTGN2JQHnpeSNzLeMw+Kb05ligELr5z4WAPpA3cVHkcgP70 30Egjxk+eaJU99iSuzpL/IYXKjY1S8Slo52qZk5rPjFbjiJfw27RcP4p5n4Mqggu9fZe pA4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=vG1Ikxu2; 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 oz32si1855284ejc.718.2021.07.14.01.03.01; Wed, 14 Jul 2021 01:03:02 -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=vG1Ikxu2; 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 DF7F668A581; Wed, 14 Jul 2021 11:02:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out121-51-6-70.mail.qq.com (out121-51-6-70.mail.qq.com [121.51.6.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04C0668A1CC for ; Wed, 14 Jul 2021 11:02:47 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1626249751; bh=sja1dUMHzXv7Aj3UDFf54siMdqlr4iPoZvHw9RRBaYg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vG1Ikxu2NqWdPe9gW7fOMCVIQtvHcCCh+LfwocFCNW1quwRoYUMqxAQbes4Hs4mTn 1Wm1HAzmPq+XG+cgUB+SjpbN41dLLfGfRxSLxBCnNyX89ou/9NEnu+GKJSxx5jwvhP oPV218uGaZTQLTuYCoaAOZ4zNTsPeinss//OmwJ4= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.66]) by newxmesmtplogicsvrszc9.qq.com (NewEsmtp) with SMTP id EAA9BCB5; Wed, 14 Jul 2021 10:58:42 +0800 X-QQ-mid: xmsmtpt1626231522tdjkyzrlk Message-ID: X-QQ-XMAILINFO: NO4k6wR4TKUNY4jJw2Je0lb4jAJMGuf/GYeuIKWFvIEq2xqASPvpOYrJVqjo1d QBcYG7STRDzxCOUdjVj1CSLCU2blxOB+4xBJpHXkS41qcOSHTJiRiKSqGKFb7ingFy+ZLRAQfTPf hKuMSU+9EftsimwnteEFwmTwaBi0As7KzKPj3ZU/bP/CHhX9fiixMqJ8ylyJHMHUr9RkWRLT20PA /lThlC5Bk6+k2uy6insamFmsY5Ju6rju+tAQwnFxyoi5t2RYiQscT1URUzLR9xopO2DrJCNJuIY7 vdQEgmIc3C8iowtiI493DSu5nFxOJ41RDknw4axi1qz6y6SNzZXEhBPZBDECWhQ67+yCMpGUuRZd VOZXaLYgdhN8de/TVDQ6I+r0t4elwjm7TXHZvhiKSXHgogGSUuTo4w+oCoVraSWN/pQFN98b1EOR gzInot9tq8h4MJRvRpA8uOEaLsXhV4pQttyyvMEfyEVR6+7cPvjXoyd1DTunOEZZNjvM2Ne2tJMT Gs4AHd6b06E7zpoIP6NKOS8+D6IqHjeJJsXGQohafdy8DMNGmY8h8pisM6T/+mjSQ6M3x1kUrPPQ fQLzf7E/PtN/m6l+Rb4iB1mYVenvA1h0Li1t2aYm1A1bVgDdPhZVBqEL+qLQZqj3Z7QBELzqgxGx qr5VQJChRodO6xcvcJiqyVsnc477YLUZ1Ami0wy6f775EEw3brOEesMJ9ygjz4njNhAT+Lkoe3va aX9ielPBQGb6c9cY++EfPO+9l4XgE15z0MWH89Bs2RX+ZaYXD3Z8aFoO5GVuizonKN8+6K0sko2E 6b0dsTDt3IVinA1O5A30QGeDGUwpUFES68H5pCdibe7NWAlR78rOlZyOXk1WvYwHX3X7Sw8XbeOD 0i0HDT+IpvS4v7Bu5z82CveMrt3F+rc1zFzBT6y6wA From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Jul 2021 10:58:42 +0800 X-OQ-MSGID: <20210714025842.88708-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: Gtnlw3jXeQF8 --- 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);