From patchwork Tue Aug 18 00:04:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 21700 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 BE900449AD4 for ; Tue, 18 Aug 2020 15:05:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9C87F688072; Tue, 18 Aug 2020 15:05:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from qq.com (out203-205-221-157.mail.qq.com [203.205.221.157]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B78FD6806AC for ; Tue, 18 Aug 2020 15:05:19 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1597752313; bh=P1KHsWF7+a0rBvjLeOla/8nLA4LAA+FKzIeHHFsT5wY=; h=From:To:Cc:Subject:Date; b=MU5a/vg1PIs3omCHr2O8nx+3gsTZezT+tkGIUxdy6lPk1lxFdEUFcnNaqc7xVHaVl Gs88imUQCLscpiwK0gqYBxMMsWPlBiJJPLsVgN0rxUGFLwdlbi2PgCslnvvWg6vGGN iKlq5Vys8VMg99o0qtpY28LF6z2TEhaM0P32pwBw= Received: from ZHILIZHAO-MB1.tencent.com ([59.37.125.52]) by newxmesmtplogicsvrsza9.qq.com (NewEsmtp) with SMTP id FAA4AC3; Tue, 18 Aug 2020 20:03:58 +0800 X-QQ-mid: xmsmtpt1597752238t2lbzw5jj Message-ID: X-QQ-XMAILINFO: MUX0Fcv92NUetc9uNlVWtdDM+GdeMIeFSF9W9fFal6hk8RUSD3fqcCmdx+EutI p7p+rxhNLeifKhrHzw2m9JzDylezqj+/ao1tJpjpBGql4h9lWebwTTrBCNb0mXbfoOvApOHurupF WhSj//0A5oG/d7KUGpWotFpR/UmltlUadMboKFojUOvb419jY10Wzl5px5nQWAHap6jdZVlKvXkc 3TfeuMfM+y0xV6V/oD3cahH3PzsTd3imgmNfbHaSAJukjFKddM5QgNGKNR+m60egXgkJRZcYDMXc i7oIG+7Sw3nS3Dg+VYqTFe2y5kQNQUWksMk0sAJkBnJ53onoMJIhYxJ3g+R5ZVEvTgxIrnbH0uau YFe2i1DRpOP7bRF5jbVZiBYNzuaTgZvH1U+TuBDj5NuALH1yFt/q5ynzLt6HcM/PxrgVKPbdAgAW Sa03p+n3oNrAMEw8mdCZJN8JpWf9BFMJKgkED5PRYeHxa2UEGLwNaWyofglagUQL3QwFpCLEscyh VRByDro0nhhl5OjT+QZWBhsAI3V5Gy645BdQdqkARlXWtyNPJNR8OZn3Fj4x3rt6oQWXIi+ypdEt 32NIqmzWmuimKeEBhH301ohVRk+81/ykhtrsdz7SxtIAGu5Et9H6erois+m3LWesH5dcReditT/C Ju6ckBJvZJbDqsEfa8iZoQoH5LhgcxUPLFDw27dxf5JTodIxgfNCM97s1Ubus4Oq6h+DETDnOxeS CrzggA5d2+46clCigOyfhTMt87QIHaVuvIYfbYHwbdNQJY479Cmkzm2kwktBu/dJ2z0sUtOEklAV Q= From: quinkblack@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Aug 2020 08:04:12 +0800 X-OQ-MSGID: <20200818000412.47029-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] examples/decode_video: flush parser to fix missing frame 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Zhao Zhili To reproduce, run decode_video with a single frame sample. No frame was decoded before the patch. --- doc/examples/decode_video.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/examples/decode_video.c b/doc/examples/decode_video.c index 169188a4b9..ba753c6dc1 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,14 @@ 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) - 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 +170,10 @@ int main(int argc, char **argv) if (pkt->size) decode(c, frame, pkt, outfilename); + if (eof) + break; } - } + } while (!eof); /* flush the decoder */ decode(c, frame, NULL, outfilename);