From patchwork Tue Feb 20 14:27:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 46395 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp1885022pzb; Tue, 20 Feb 2024 06:27:31 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU2y22CfsRBfVmzi5CV12xclfI8cjynqbM9B4auXuiZnqZPqG3ZT+4tLiWjnpnD3Np1sI+SQ16IYSyz1K6RITVWOtcfWpBkdOlwsQ== X-Google-Smtp-Source: AGHT+IE+y2tMRgmT6BlnSFXsjV2PDYz47LgaRsXcS7ynKY7cUySuTSuibessmszv8tiw0/Co9CDg X-Received: by 2002:a17:906:29d9:b0:a3e:d858:a829 with SMTP id y25-20020a17090629d900b00a3ed858a829mr2348660eje.28.1708439251356; Tue, 20 Feb 2024 06:27:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708439251; cv=none; d=google.com; s=arc-20160816; b=sBqDLg1/NrMwoRqLedJnPiFm27ScoWd8lpIGs41XsVHrxhx4kNHQF271mB4Qgo8uSS zIP0UzIib5oiAx3In/a3+TXSwfcEiHkmfuxnGbg+jJcuAz3QE8HIc3yTysd/enxBvLXC kdDqF/d1iQeYxYh2Wojt9eZk38BTcq9QM1X9z9x1JbEsFbk04hG1YeMbe8qaP1RHiURU 1CmzaZNXGXpnUVc14rfY2WHq7L1aojEULGP7HnfxjdKA91n6szur0OMASUdv7LTlJxEk 5P9TWR9bHB8PbWc0maXZh0Dl+pUWKftnZWj9AEF/N5USZb6EvBEzvs2Iq4u2ve+jvdI9 ctvw== 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=sFcfVks3EuxXAj8zkdX4ReGPM5IBCP0FLU+fS0WXfeM=; fh=L/RjWyEgBldyPssm+GwiUEN11vSvf0hyNRi8lzcjioE=; b=snqb0gU3DKAYyU/B9/tJpzGx2/EzmZ3dnQQKpS7xuXzgxFltawc++ohLPybmQx0DRe Jptl5DFzI9SmJpt5byPLqQQmJxjezw43umbeFGtFlMveGjmY070enbJVgL0ZPnxJsJd5 tKnwQVZ9fmneYJZ+jOTv7wqPJ4Nfsu99vN5drqgkVgCYTbSboNSIX9C6yEc50+U6S1NT sYgYKNXddDWLBOjYjRJ8+LY6ZnaWz2GiJAXQzY5wA16Iy0Z+i4ES1XY8MXLFXIu884av J0WMB3r3sEj5uMca51/BMuJZ+nYPAkDF3hX/+Wi9WbdsiG7iJXZ47F9/dp7w8c0hsXbL Ia6Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=dpwhP0uL; 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 o22-20020a1709061d5600b00a3ea739097asi1721032ejh.793.2024.02.20.06.27.30; Tue, 20 Feb 2024 06:27:31 -0800 (PST) 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=dpwhP0uL; 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 C0FE268D1BF; Tue, 20 Feb 2024 16:27:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-59.mail.qq.com (out203-205-251-59.mail.qq.com [203.205.251.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CE7A68C22A for ; Tue, 20 Feb 2024 16:27:19 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1708439231; bh=1JUa8PmiiJ/oMTcTZWCdATECF9VX6I3z65+9KUBzqOM=; h=From:To:Cc:Subject:Date; b=dpwhP0uLqxDLxfibKHbLxYNdbFJTNNRBTbUgxYC3VJHw3AigLlAW1Difrd3Fh86MP a9I9SAxmIVpkM0NJCgxV3N1DIuy4yQzRDUazeKztvlPvDiWQgXnKi4eaWGbUIO4jFc u2cXjKPZnfbBja9WOikMHqz0wZsz3vqYoJdsV+xI= Received: from localhost.localdomain ([113.116.31.63]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id 6CA3585A; Tue, 20 Feb 2024 22:27:10 +0800 X-QQ-mid: xmsmtpt1708439230t99zg21rw Message-ID: X-QQ-XMAILINFO: MC9b57iUs2xB3fPZ+eXxee/BjM1deBpgb/vy8Xl9+P603I7JGrC8F7mOzL+lG2 EGsR+ajwkBaAI6kc7XB905Bw8XlxMs+NY66r4D9zlIDUEzVnR1GsgW6cmiVJzdg2QnK9aJpuHDXf c+nKTxLq8X5mg9GLjBh/Kjk+DxSYomCje3YaKyOKzGkh8gQfHF2BR0awq8ha12wFaDi7kITffrim jXU5hZBXBeqB20+kgkocznueg7D7CzseHpdJrX37pmxs9LhwAICSCcvmnit9TkFf3mjMtHmH8jUp hgofD8azcyaTcLcR6CRUFbLW4aMxbEYh1PfEhWgMNmM7WBcomarDc0gX/kBEeNatXsTuHMFt+d1/ Rtn/Lp2E2F4wx5zPxf+bV6PvDIZGoz756izupnhO6KPM9RifVUMt3lI0BjW0d+3/j9BRTSDIVCpq rqZjPaB9ET3ShgDEXwpmgBLiGym7oebgpcb7rUEY7AMlkQ0x7OiKLe2uMUiVnxVmWmeuCb75QhdO QNldmNiSC9w3BBYvNp87zFz28bem+CqC7yuHBM8FTPRgEO204AsYYkmYsR7vVn2UVES5keA4IYGK WpYo8jiku5OKV4WRRY+/F3IrFhn2OaVqYT10fMa2HkZwYknz9xi0e06mqBD+PGffShs7DASVOV2F lRFoTjTPU9ZnL/eSra9vUawIJ1FuJ1Uth6kyr9IGGub+mXj/oXKt12C45sAbyvDvysDSZNhuXBl4 ALK1C7PNbQL/gCTYOXE9hRFpXU9ikI8EJ5gpfsedfshCdCzohDCgEu/t3dnKTtrVrCJaqZydKxob AJWp63Tp8QeTP+3xH0Mbuk1W92o+KT7EEUedBLxwY06eF3ihDu+O6R4EtphrKy9/OLkymYvSA3Mf fDxW3dzlZr/8V/2AY6uTouRhSyYDroF3HWqqSGxVFUPtTq6hLqfXmlC4nZ8Fhzx2t/0X3iM8exyX aFQ+dQKUOZpL0LH4TJuvwBgPlkoQOAu/EEr285yJRgxN0TrvXJ3k4DFe/bP5Oa X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Feb 2024 22:27:04 +0800 X-OQ-MSGID: <20240220142704.333741-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avutil/hwcontext_vulkan: Fix memleaks when transfer to vulkan 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 , dev@lynne.ee Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7ucSIsm9+zvU From: Zhao Zhili Without ff_vk_exec_discard_deps which is called by ff_vk_exec_wait, the reference count of hwframe context cannot reach zero due to circular reference created by ff_vk_exec_add_dep_frame. Fix #10873 --- libavutil/hwcontext_vulkan.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index a84713e621..d660f63afe 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -3393,9 +3393,7 @@ static int transfer_image_buf(AVHWFramesContext *hwfc, AVFrame *f, if (err < 0) return err; - /* Wait for the operation to complete when downloading */ - if (to_buf) - ff_vk_exec_wait(&p->vkctx, exec); + ff_vk_exec_wait(&p->vkctx, exec); return 0; }