From patchwork Thu Jan 27 08:11:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 33883 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp2236329iov; Thu, 27 Jan 2022 00:11:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJwYNtiovHdNv8WlOnWbTgeL7CVP3zLY/frjyOdwnXBjSWzJ+j5BBUn4Od7FuCuCgTG3MCoJ X-Received: by 2002:a05:6402:510b:: with SMTP id m11mr2608491edd.290.1643271093840; Thu, 27 Jan 2022 00:11:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643271093; cv=none; d=google.com; s=arc-20160816; b=ob+4Mia0m4el/Gpmr8ONMFHXkD4RdzI20JOF++1D4n2ZJ45XTj1cEStR+i2dfEO986 8DcHbUcqN3vqYMIP0MKsJRDr+gT5uc2LKjoEr5SBr6Dk+8elgwiC5ByBbdsyfZISMuuc 03C5czGZDv/ItwtWOO7BoGdAcAvJrANu/6ED/a8PoHEEzraP+M6KsFr0uOrghjpon2zm b530AMCnZ59LNiD6cc8lI90EwmU9QajdfEz7kpkRTrdoYiOERkmlRpMJ3TetJkq3WVCi 2H/9REBhnhDLsrMZjANXllML0cgCTWkUApvauCyXUPyNkZ1NJvQBkRGs1G1HBZCOZYuz jnpQ== 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=I4jhtD5aQwURZyz9rFLuwpLWWM5UfeAup4F9ltZznR8=; b=G9bsjrstUxLhHgUcxYEBqFJ4FiRpoBO8q6nUor3STuGtj+ctQvbROIxGvt4RwjeI5n QZDVAe8XfLGwbrwkklAiV85PV/Jdx3Ogg8seNg9huANH9vcBb0j/p2UJhNJ2zZ5kLA7k STvF/lBsheEW/qN2mFY0L2lJZHxdIjiHpoa+s5ev4q1Qj91i5IqaATTk+6SVPwKpwpkG lnuFuTq2D+axmtLXVUoSXGeT00iy8elitQQ12kimVd91Z843bLIh0VNZJWnU778YLEBe JTgljXdxcvvGS1lTen1CKVKQkXgIb5EnsLLYb8KLUEBGUiOc/QsDucoCGzo1cLGoMBXb RTww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=H1teETia; 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 fy1si1169859ejc.679.2022.01.27.00.11.33; Thu, 27 Jan 2022 00:11:33 -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=H1teETia; 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 72C6268B1F4; Thu, 27 Jan 2022 10:11:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-202.mail.qq.com (out203-205-221-202.mail.qq.com [203.205.221.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB48A68B08E for ; Thu, 27 Jan 2022 10:11:20 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1643271077; bh=EqeMoWR1f+tR/CwwF1RzRYo3YKdP5SDmlsFn2g5e6MQ=; h=From:To:Cc:Subject:Date; b=H1teETiaWJQvWWnDAuv/05rn66X498IjmqgBB5nshIcl/fThPpxe7XzdBTHZSFQ+X KFhXydVxFmscy7KQWb6NiOppAcMxznJf1T8zevD8xZMOIk+pLL8tej8Mcro06iKVwf qfdUr8f2/NTfymB5KvxLsik3h6XhDI+Y1xV2ajX8= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.72]) by newxmesmtplogicsvrszc6.qq.com (NewEsmtp) with SMTP id 2CFB70B7; Thu, 27 Jan 2022 16:11:15 +0800 X-QQ-mid: xmsmtpt1643271075tigdf0gpb Message-ID: X-QQ-XMAILINFO: MklzYC+sb6GFspCSIoKEXmsbhyCM/GJIcYatDcpXNqRriJd1c52Ehs/+BrJKQT dD9jJh46/Xymsn2FhTYmevLCOPMHYnHLDozaDQopGQlcndt7j1Mg9tQ43VV6PCxkfT3LGW2OzQ81 xWYp3jYNE0342sHUrfJsGfvmlPb+fpIC0USqTG+OQI/dMFXUW6W+NdS6u+pYVSi8SeDEHDCR37f8 KF2eqMgGba083otFBE/Zl31GdQowtfRexX2cJ5DtF10+ev/TKnjVxHCKUe9SX2+UKKE5anZavmUA HgtYtq3RvUatLB4BcXR1ZdROK0NrWxTiGb+cmTVMStP037l43YMdD1xe9t6c2NWGpvo9CWKN189n SWFAXJV4UwTM/LC6+XkuxXw6imIj1zIu5bhQdeWR/vcFPkQpx771c3ZBNSsqb5kWBsCV52321IXd nfgVniytykyzqkSf1Z8kyN/2U0ov7pVKgssA6vqqyUfRD2tFBO/4YLgwvN5HPNK2GiytJPb1p/+b SGbENDBqrj1b88ZruWyvopof7KGw+jBC9WQc+OAeI5JFOS5usQaPsl7M1IIZAlh2Ex7OTe84FBzc kLVemwem49NIWRtHy3X27h2PItl6B0idaYv4DFb/mbPprsCpkNptP7F+dVYwqP9CTho1y5S2HyMo hpS8F0iy4iUMzXwhVe6EXQYo7Vh/yN4wxyZECkml45b9y1/klWuNloLrZhvw5lHg4Uf7Xp2vp4c0 cckvIMWPwiSyWbkkMqKjFn0fAnYXrnh2U9jOhb4Gj1bp9wG8VlvlJub8ki0M/CI2eeJWDSyXtPZM jXqvXpyz56vW3SAztPvyQIM43tgRcxEF7GXrNkIqUGwslIOUQ6kELR6ehMDGaGB+G8aqqhpK/hUg == From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Jan 2022 16:11:13 +0800 X-OQ-MSGID: <20220127081113.49094-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] hwcontext_vulkan: workaround MoltenVK's bug which leads to segmentation fault 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: zsMStXcA6eHD MoltenVK doesn't reset instance pointer when CreateInstance() failed, then DestroyInstance() leads to segmentation fault. MoltenVK's bug has been fixed by [1], which doesn't available on homebrew yet. Regardless MoltenVK's bug, we shouldn't call DestroyInstance() in the case of CreateInstance() failed, so reset instance making sense. [1] https://github.com/KhronosGroup/MoltenVK/commit/86a1fbdb8 --- libavutil/hwcontext_vulkan.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 2e219511c9..ac8e00003a 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -719,6 +719,8 @@ static int create_instance(AVHWDeviceContext *ctx, AVDictionary *opts) if (ret != VK_SUCCESS) { av_log(ctx, AV_LOG_ERROR, "Instance creation failure: %s\n", vk_ret2str(ret)); + /* Workaround MoltenVK's bug which doesn't reset instance pointer. */ + hwctx->inst = (VkInstance) { 0 }; err = AVERROR_EXTERNAL; goto fail; }