From patchwork Wed Jul 14 03:02:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 28920 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp176090ios; Wed, 14 Jul 2021 01:07:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBBDd5RL3+zUglhcU0rEjqph+eDA0kVJuKXgJfL/XR+cC1PKXOpB9nSsJpfBGiUi33yCQS X-Received: by 2002:a50:8a89:: with SMTP id j9mr11481080edj.226.1626250042332; Wed, 14 Jul 2021 01:07:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626250042; cv=none; d=google.com; s=arc-20160816; b=J7kHFKP6SF0tgIwkSBPq8bgsCRvJnJmg9gYmeXa+f6mCIoIANYkKqRcKZVDNI7jwmn Xbte2tfHXGXC48ZE/bxx9y4+QA/L5OkYsvv4/8E9Ck7B83ubqqRR40IC+nKWjdyH5/Q6 8FfTtAjkCCBqi3YlW49nU5lrEqIdVN79NVrKeuDvKhgFMnUp+rhhNmX7t5vinB4SXpnk wofpkq72hCk2ZhVokLS2xrQyQwTXK3RUXyUG7EHHw0cZsuA8UY32vVYR5Su3SVC/rp4K fH1KdqjxASSYjQDZ5tphncDLE26zuwqYQik7M06osAcrYQA1H0rvlaXWPn/jcqn46cUX Ievw== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=+sJJccFWwZ72cT74l8mx/+egA6Ni9TOYh2IVN5/belM=; b=VWoD/f2TqTu12DBFy00iVgRJlB+Ppsroop6mpkbli81hkEQzHYl3s/atsEhurjKFnG UBaiJIKqHzyJnzNy3K4NoLglNLhIVBbp8uHzXZ+RuCvyDivMpYYxzQQmWqNhHfwffT5x H6WlKJJ1vDlv6bROY52MaxX8EEW6jDC1Dc2Y9via0zxsAjtpANy0dvIbCqlQTV7HODnL uQODgWYiF9jQP8OTMgg6aNYTsCi4GqtG62OdzBRtDIGEW++CPXu+ocJkFyTJzTaQbuTn WCTBu93eX2k8Tdgsikk8s3BCwNMdhRU0ij9IZ62rH6WeajKYmWwy7G1JE4/1obwtfNqk paUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=rgnnoe+2; 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 hd42si1783561ejc.463.2021.07.14.01.07.12; Wed, 14 Jul 2021 01:07:22 -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=rgnnoe+2; 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 3C1FD68A7CB; Wed, 14 Jul 2021 11:07:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out121-51-6-63.mail.qq.com (out121-51-6-63.mail.qq.com [121.51.6.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 63903689E56 for ; Wed, 14 Jul 2021 11:06:51 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1626249993; bh=sja1dUMHzXv7Aj3UDFf54siMdqlr4iPoZvHw9RRBaYg=; h=From:To:Cc:Subject:Date; b=rgnnoe+252y9YJpMpNfYRMWSJh9VCBaqKdbR847dhRRzLQ0tWTi+y1K/qYIeTGITp Use5xYdNhpHkEaTv7T+ZrUUVMuMgVE7RF1oqYr7f53i2DSPtfE8ZBuZ5i3KO+Ovq6+ 8MkQWRcr2j7c0UP0VDZboHrzslrvqOPtkWLGy4WE= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.66]) by newxmesmtplogicsvrsza8.qq.com (NewEsmtp) with SMTP id AB1C2D2; Wed, 14 Jul 2021 11:02:43 +0800 X-QQ-mid: xmsmtpt1626231763twruiqs6v Message-ID: X-QQ-XMAILINFO: Mx0gLVTpyl5nhHPGP2D8S4sKPcOgji63P0SdEVbqf3iXUVIi1chnie6v/VpM+K QDUZ1LuAZBN7JJ3K97ArBSeEe2guRpaGljKGho93IJeQ0tGt1/s/oOIZWhhsCNbFYhGIIEZamQxb kqydjoP9NZ3l9vgjwRraZerRKgrCiO21DVcu0o9cSih+RN0SXJOG7rh8VZmeAN7avRXkOEhJxuuy vBGwtrPBQl2VibqeIk7PQHFJVYCQKbv3wk0swIuWrKTt1iDO1wxl/aU1hFGOUFGw4yiHY5hZy8/8 7GLJHgWiAm9Mwwp4YRY+cw74ux1rD7LNJQcrBQZaaQ8fWOqbTzOK74b9M5JItmkpFt2kv+Zxhijp KoDx2oqwmdgkJ9Xo6lZOdzft5OYgiE3kf3UrN6ZNaFKd0EHbWYQPCHyzu85VuAEq+2bBnpfkiZDk Hfsdpbr2UblSy/2N/UpH9qZD+JaD8wXlgSM7cvMgfSqL1yc0FZkbOB1KcRMd6+fXTMWfTdGmPVXN ys7rU3do+dOJQToWd5jydUL8VvY7E6D9s9rgR3OJ6kbIUM0f+d5TjObQJzMbjBmotphqfRUdVASi V6WdS0IIavM67HZeOG0Iv4n8SzpYdJHpeEjoo1PYpcICjtPIWHHnQR4GK3tCOhvHeunU41c11EXM /Q/odqaPUPrPItvZf3/USh4BvXa3bXFHwTbn7IiEMZ+rj2zGpAamX0Oh5dCRr6/I9R7ow5uDFONE xbp3wIDrOtg5gsGX4Ok1itojyoIbm/z9/kizKMN2cwrfsTirTqgAC+EMcriGMzOnIEQVwm75ZD3N pYfY/KZffuRGpYdNjhZbuH4HC7EiMYBfO8Ah2J+2EHXp5eLdpV9GOvXd+johhajA0GlrM1c+lAmL LDcKOQKFxqERQ5zCkTmi5Ruej2OmlC8rhmZQgq8YVm/GUUIg8ggk432fICJ090yIwAJbMYscfF From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Jul 2021 11:02:39 +0800 X-OQ-MSGID: <20210714030239.88983-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 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: gqnP19YJiL45 --- 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);