From patchwork Mon Jun 12 03:33:11 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: 42033 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp2690950pzb; Sun, 11 Jun 2023 20:33:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6pjIFosWeKupGK4L3M0J2HbJxU2bfA4cPhqtK8uYoZmUX3lwvariHPKw8UBbVXBT6BNtTQ X-Received: by 2002:a17:907:608a:b0:977:c405:6c76 with SMTP id ht10-20020a170907608a00b00977c4056c76mr8498763ejc.14.1686540820269; Sun, 11 Jun 2023 20:33:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686540820; cv=none; d=google.com; s=arc-20160816; b=Kgas9rW4bUmPsY8yAs9tr7Ffcb/vmN4rFWVjheEt9EyZGT+nqwDWSV0WQr1vTURupZ L+E33CKY7KySkX+22Whl+Tuptl4RtNYH0MAiqYajGCeBA/NXn7LqB8Lc7VBJ79Bizryb W3gAQN9jsUYSobN9rimYYiCqNgoCYsju+ce7t093jdgx2s1YD5TAU0ljgzzDemgErDIL 7UZJP8c/3dvNZvsEPmH6OnqG/tyxKbPsxG0JgUnWVImzsq8JWaUY9lMRrsFvNYou7ejc D5IXQthKP/PCTIFHYCooVPsMvDuMDtQpU83xKiQ1tW7a52JfVtm+TO1yNFl9RGknQpbS AdeQ== 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=AWDvJKcZF58OIURE6zhEOYgdSYqNXuWKpSCXuBQ2x68=; b=FGAvEh1dDf5Gxmi15keZS1q4aUyZP+X5QiIqOhuQUYtaYObltvLyu/IIZgZvdoO1P/ ZeCWHYDAuZP7QsXBJAK9Rfkv00bWKkHKIzEmuaSCYQJWmGUgOUxS2mdvQvzpfYahiGkH YFwzbrWFnnvKAUotaTAdVhqMzR+rC0EpFyqlrGOf8iUqwgpgZ5ui83ObGcF13hK7IxAE H1/5P4988yplhro1u2vjoF/3TN5axdf/Un8GSjyHghAMzMWw/3AqVVsr6QuiJNERBuD6 AfuKyKg70qo+KiFh3TTlHOsdfAleexd4n9JeUbtf/2f3o9Xzj+vc4JNh+IWtbx/wupsP 1hvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=OUXSIq59; 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 z13-20020a1709063a0d00b0097375b44ceasi4946161eje.230.2023.06.11.20.33.39; Sun, 11 Jun 2023 20:33:40 -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=OUXSIq59; 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 CB5E668C336; Mon, 12 Jun 2023 06:33:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA13768BE21 for ; Mon, 12 Jun 2023 06:33:28 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686540814; x=1718076814; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=2nB+dsi7Gvx/GuVqumIFh8NA07DLPF98UvhdhpJPVCI=; b=OUXSIq59f13R+rQT+j2GdohVbUVZsyvWx+4eNF2lr0Xbw83cSjkWpHnJ N6BCtkCjjiIGgclnPfKFxbi5m59vTxi0dJoVlhlKGBLwVteZevtaRJIQY eDMoSuNxjYnNOfamALnJafqvX1ODb2pzdAvaiHhVnnjBK6Qc0+AqFWUvf Ux7QVCd96hJa/CaJSFkVCoxUxYzg51tRxeXUPlJHJjGGfMpdEkfERgakF Zwt15GiXJl8Mi63PhKnq14IvSYzpX8Do+l/8AWEIs4GG/rOaHycYCaVRN FF+mfpImh2z+Fh4G3j67IEGc/nVGk7WZS0wpz18qWpX0GhTLz31SNYCIx w==; X-IronPort-AV: E=McAfee;i="6600,9927,10738"; a="355431723" X-IronPort-AV: E=Sophos;i="6.00,235,1681196400"; d="scan'208";a="355431723" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jun 2023 20:33:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10738"; a="800867053" X-IronPort-AV: E=Sophos;i="6.00,235,1681196400"; d="scan'208";a="800867053" Received: from t-dg2.sh.intel.com ([10.238.200.108]) by FMSMGA003.fm.intel.com with ESMTP; 11 Jun 2023 20:33:25 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Jun 2023 11:33:11 +0800 Message-Id: <20230612033311.363757-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1] 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: IZ58X5bopUOC 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 --- fftools/ffmpeg_dec.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 799be63215..d6b34402f8 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -531,6 +531,12 @@ int dec_packet(InputStream *ist, const AVPacket *pkt, int no_eof) av_frame_unref(frame); if (ret < 0) exit_program(1); + + // 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; } }