From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 0B88944E21 for ; Mon, 26 Jun 2023 07:25:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0300768C289; Mon, 26 Jun 2023 10:25:14 +0300 (EEST) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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: -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".