From patchwork Thu Feb 22 14:42:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 46446 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp377515pze; Thu, 22 Feb 2024 06:43:08 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWKpTjAQqLc+Z859iuM+mzW3aqf6x9PHcDG6lwe7fLgSDs9bUOp1qkiA/BNNQ95BU8Vjjx5gh2v+1c/L2pVP3a7KxcsNX9PInAJUw== X-Google-Smtp-Source: AGHT+IG9RqUmNSE70LljbXGsNZnOMtaFzUC/24KlTeRXxXxY1/vEzTJemYvbcgDgctdhFBNzEfd9 X-Received: by 2002:a17:906:c293:b0:a3e:ff36:c83 with SMTP id r19-20020a170906c29300b00a3eff360c83mr6889228ejz.29.1708612988147; Thu, 22 Feb 2024 06:43:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708612988; cv=none; d=google.com; s=arc-20160816; b=Yu8G5q+zgkdxsiqc2VjHKk8sIABUkQtHltHJgA1OD6IIyxvSli1ZSIGwchAp5grQ6y TEGbyvTyq0mVHKOtcevbOF0NyujV94QszxDElwpTCke0k4vcbbMbzcRfvftL69sYJ+xm UvBR9Zi3qqkGGt8Mfsz8qS16OQgttaD+qcuFLx9+VYShKvv6xSB8Bc1ql8ebLarJKkz2 MwnQEIbIa422Iup25gr5C33sp7Wc+6klnvDPbVxGq7bou2r9fpVH7ehMFfhxsZfzdV4M Q6XSLkLz61nYMg+nGDNAkbk4oXI/YWVnKTOLL+B2A/FFzuoY8BhxntsS34pDpMA1EhwJ Vi0A== 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:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=8z8SWDRKkfmfqzFQ7DPMBQXNd+R53YL2OD+n7c2KmgM=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=IauzXW0Zq15jKnspBF5WwVL7OvGozlYecZQ3IRqkiL2AA7AVOQkynbLTG8eC+aYX2W fxOWnv/KtSaJhXrByyZ7us2A39jLlSqzGBXI/TMSs0P/qHtKmz++o8T5vS1KR2VxChR6 g0/IEDyhUT3ijhxudTwHsnwos/JMffToGKp74jZPml5gOzDNNvCK82CMTR15is07r964 MO26KTMkj9fA+i2/KAdp9BS5c36/i3S6B0juCWDqRv51+8xbPGsw2BvN4/xNZoEH9XiA Yjcw3mu5RZLzrvi7eoG8edK6NUObXtbv1/gxU9my+EuE1Fw+ELvn64qI3SUNwFObzXYK 1jjQ==; 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="UhzrRr/4"; 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 gb35-20020a170907962300b00a3f0445f498si2553432ejc.895.2024.02.22.06.43.07; Thu, 22 Feb 2024 06:43:08 -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="UhzrRr/4"; 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 2620168D1B7; Thu, 22 Feb 2024 16:43:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1FEC68C539 for ; Thu, 22 Feb 2024 16:42:55 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1708612966; bh=Clnwt77aCc3dZe7FiI07Ue/TA+TNEA3TKDC5sy9zPUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UhzrRr/4D6Y+VTjjXGp1bl2lYfZlmv5YkUPRB0fD/uSb5Ihx0hPMHw9QXLLoZPLhB jMwuPw7xSXMxY9wyXfNwfOiUmANVqWnUvoI8GV3HbIx4Orj6yx6potHDzT+Ucf7TTd d13Uyg/d9vfMRnA2nJKXDjaKa71GfqLdUvWOB12Y= Received: from localhost.localdomain ([113.118.106.125]) by newxmesmtplogicsvrsza1-0.qq.com (NewEsmtp) with SMTP id AADBE486; Thu, 22 Feb 2024 22:42:45 +0800 X-QQ-mid: xmsmtpt1708612965tn5o9lxea Message-ID: X-QQ-XMAILINFO: OQhZ3T0tjf0aNQtsHtgPWXvwuYisMWo/OohOauLkzkkvWDztrQccTCesCdWU8G kkDWl+9hx/h7XFC54Az/UtjK08ssbFKWmztvU182Qhm+sVfj059Rn/5Hi3KreNUJQ2Gsnf3EAMGq hwfiKdug1lo135HrYVaVABXfZAQt3kZq/TNv72QsUa0cKU38c0GfLmpEWTxDFLsXTSKVKgx5nIDb TMbzWjae2DDfAHc+mzX11qAgtemBMbTXvHQDEgS61i4wL93yzd/iz2nTvviJ/XqwXO806nQhjf+2 FyQxASoG1QWc9ng3ejtN4qR/1SBZqJCvsn4uPyzvvfbcx2tWG55AgTSPll4MQVhI5zZvUmRz07wG xDj7he+2N/8rTtjcMpwl4HxRJbgdccNFMEtRC20ah+mQ+/Bf8dEhVqX+Z2kCwqnAfN2t0Tx/F6A2 /K3GMOKYgEWP6iW9035PGlI7Pul3ED3CVUKD7H+F3JvcJHrIyYFk59JomzFV1QkEt3ANs5h+8EEB pcSyDhsa2k4MQfTtb/l79u1kOsO8loXi+WjI2Bf3MEf2ApZ6uiMKJEB6Wa4A8Y9M9H6PEmG88BEq uQaO+emU4/S3uJxJvnBMc5CI5ve3Ned88EaETpjQh1H3HT8xOcRCtJ/A5KWSXOXkD7KGRdK6tXOq YxtJ1Dkx5kBZ3gQYfdgANunq9tn4+6du8M1z5NrHKpdFCuKx6sDvs93PGpzen+m6yQsdcc+67dOC smxt/uojxBwoVGZ1I6Typy/ndfjysEnEa56W2GCmUOpJHVRSRJgyk59RqI8eD7CK6bJqQ0EJlnJ7 ahbe238VsmyX+TH62/jK9P0Mj2Q5Y53Iu347C2He0CXQ0DW8WsOf6zCBSzdOckoHuDuPujaPeOcY zqxTK1/APThaaSI5juTJM9MTcyqHBjZs13PvbD0MpkjWQ5KhAJJzsG7VXwPd+L12zhLas2kdT5yh 3XtJtZEQPuL1lXB4ws+8+ylGwniJABG7oY/NUCtzNa3EMXPWKXrg== X-QQ-XMRINFO: Mp0Kj//9VHAxr69bL5MkOOs= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Feb 2024 22:42:42 +0800 X-OQ-MSGID: <20240222144242.16111-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/5] avutil/hwcontext_vulkan: Fix leaks when semaphore creation fails 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GG00OJDnNXyw From: Zhao Zhili --- libavutil/hwcontext_vulkan.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index d660f63afe..ee13788ead 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -1807,16 +1807,22 @@ static void vulkan_frame_free(AVHWFramesContext *hwfc, AVVkFrame *f) VulkanDevicePriv *p = hwfc->device_ctx->internal->priv; FFVulkanFunctions *vk = &p->vkctx.vkfn; int nb_images = ff_vk_count_images(f); + int nb_sems = 0; + + while (nb_sems < FF_ARRAY_ELEMS(f->sem) && f->sem[nb_sems]) + nb_sems++; + + if (nb_sems) { + VkSemaphoreWaitInfo sem_wait = { + .sType = VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO, + .flags = 0x0, + .pSemaphores = f->sem, + .pValues = f->sem_value, + .semaphoreCount = nb_sems, + }; - VkSemaphoreWaitInfo sem_wait = { - .sType = VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO, - .flags = 0x0, - .pSemaphores = f->sem, - .pValues = f->sem_value, - .semaphoreCount = nb_images, - }; - - vk->WaitSemaphores(hwctx->act_dev, &sem_wait, UINT64_MAX); + vk->WaitSemaphores(hwctx->act_dev, &sem_wait, UINT64_MAX); + } vulkan_free_internal(f); @@ -2098,7 +2104,8 @@ static int create_frame(AVHWFramesContext *hwfc, AVVkFrame **frame, if (ret != VK_SUCCESS) { av_log(hwctx, AV_LOG_ERROR, "Failed to create semaphore: %s\n", ff_vk_ret2str(ret)); - return AVERROR_EXTERNAL; + err = AVERROR_EXTERNAL; + goto fail; } f->queue_family[i] = p->nb_img_qfs > 1 ? VK_QUEUE_FAMILY_IGNORED : p->img_qfs[0];