From patchwork Mon Jun 26 07:24:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 42297 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3805:b0:126:ac68:d900 with SMTP id p5csp962694pzf; Mon, 26 Jun 2023 00:25:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5ZqXUkr90SMG9uG9oXL9Alvzeq7zQGHXDI6VJBW6MQ451I3JTBMdE8FjEbZjCQmumWyOt7 X-Received: by 2002:a2e:8203:0:b0:2b4:490a:66b7 with SMTP id w3-20020a2e8203000000b002b4490a66b7mr19697535ljg.12.1687764318065; Mon, 26 Jun 2023 00:25:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687764318; cv=none; d=google.com; s=arc-20160816; b=nH+zoFSI9yoKpqnyfKzi0mmb5T2aTqoYL5XQYwc8cEtta68LLI1CZXqr8vlKokz3R+ SE6UVH6P/vDFnfSoZYYJOxaFSNy5tQMyGjWW84nYakTuf0F8BV0UvhZ9xBC03N8BhZKH dFpFzKSN8wuHLiL4UJf3GuqnDyXdY0XaKtV3xo6+y73R1RtQqF/qCSip5qAeH1aQDTYC Y2XtZInd4nYFk1cDa0SCNl78lro20RsU75PYPrTc4VOdTSgvLdLWS6tUk3bHaM0VmcDp jeu/E8d3ctU9Nx3XAAKbwLv4pNO0PrJtRBt4r2aCxpYeCwCVCMHlUhI8b0KQHtWT07U1 OrcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=vX3M3i3mseUMGPbV6CuY5hjS5MTQM5gbrVqGL8u75hM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=x1HFpvDj6OPhzRoNgzJLdpOB7O0QoCtUnKXWl8qsKEkL1FOHbC1ipXsYf44yKuvpv9 9nk58or+U5nJ7CAGFnV/tbsYdId3+1lVB/vQ9Q+mYMHyudgVIRKweupZWCIbgxF15YTZ WhmWYb9eheHdsmlYCCqBIrQ+6YdoVEH8sYk1yPBcTrpxYEiZIHq+2rbfLqQIGnTyUYxT bdQGl36NeZMGCKXQJmcmrChk3OCfETr2LjsCIuhCD1cvnbPdgI2mVcRqsAgnjkdYAdtZ lcxRrntXWxMQrbpTKQUuh7bT8mI+xyHpVvpt7XojVOKBkoSHYL/VZ6mN/6oKoQsVooEZ yffg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=nhNOSr0P; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b17-20020aa7d491000000b0051d88350109si2106739edr.328.2023.06.26.00.25.17; Mon, 26 Jun 2023 00:25:18 -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=@intel.com header.s=Intel header.b=nhNOSr0P; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3D02F68C292; Mon, 26 Jun 2023 10:25:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62CDD68C198 for ; Mon, 26 Jun 2023 10:25:05 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687764311; x=1719300311; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=Cl2/VZOpqiUZKdveD6WrK/oT6Q210mLPgM59vv9HHNE=; b=nhNOSr0PW/eI/bQjk9L8+kW3XOLs/iYI1ZtlXonTdmpNsOmjaUwjk5Fh JJhgXIhfBauLiDd0oSKYcfS0acEhYBA75DcOWcLVjNECSOiDHchda3/u4 9XzGDNMV94BecYKOX5mNmlLHiDPfcDZM5RBqDF8eBcd2OTjdWoO1Fwht8 6J2p3UhZsTvTOtbTWbrkVMT6L9CuMyaw5Npt1PcoSYA5MDskF883LbYjw M3p+KwE5gjuJEffbUEyjFrtmUh74U0LtubbDOawWSq5wVlf6Je56Klkd6 lT/QQmJHDpkmZOSV/cki6KWLbfDHCkpvW3ukPgKFKqlBvZrGApiKIEV46 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10752"; a="363745398" X-IronPort-AV: E=Sophos;i="6.01,158,1684825200"; d="scan'208";a="363745398" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2023 00:25:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10752"; a="962681500" X-IronPort-AV: E=Sophos;i="6.01,158,1684825200"; d="scan'208";a="962681500" Received: from t-dg2.sh.intel.com ([10.238.200.108]) by fmsmga006.fm.intel.com with ESMTP; 26 Jun 2023 00:25:02 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Jun 2023 15:24:58 +0800 Message-Id: <20230626072458.1429656-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] fftools/ffmpeg_dec: Don't keep sending frame to filters in flushing 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9ELHEGlnTanM Filter may has a limited frame pool size. Do not always send frame to filters without reaping. Fix the regression of commit 5fa00b38e6. Example cmd: $ ffmpeg -threads 20 -init_hw_device vaapi=hw:/dev/dri/renderD128 \ -hwaccel_output_format vaapi -hwaccel vaapi -i avc_1080P.mp4 \ -vf 'scale_vaapi=w=720:h=480' -f null - Signed-off-by: Fei Wang --- Change: 1. rebase to master. fftools/ffmpeg_dec.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 85bf8dc536..a7ae51fed2 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -803,6 +803,12 @@ int dec_packet(InputStream *ist, const AVPacket *pkt, int no_eof) av_frame_unref(d->frame); if (ret < 0) goto finish; + + // During flushing, break out to reap filter once send a frame to filters to + // avoid drain out filter's output frame pool. Especially for HW filters which + // always have a limited frame pool size. + if (!pkt) + return 0; } finish: