From patchwork Thu Jan 27 08:38:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 33884 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp2251110iov; Thu, 27 Jan 2022 00:38:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJzC4Fg1f5D11thrdETHWBzqO1Q7VIH6p+pWwnEEFsJrQNLQnzBd12sp0dtZoOzyiVoA7joU X-Received: by 2002:a05:6402:1241:: with SMTP id l1mr2686439edw.64.1643272718040; Thu, 27 Jan 2022 00:38:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643272718; cv=none; d=google.com; s=arc-20160816; b=gOU0+EzfKDHoZt4QP2ua63AE59vWC3t7mXsfPOxOokVsYJ2w5i103KiEFBosh+xDKO gVm/hcVSH5Or23iZc4w/82AgX9sJsFriwUFrtOAOdQRTLX1tweutpiXUWuCzhMnb5JO0 r2ep79nSSwXp/osb6H82yvEI9+GWw9Vi1g+SpO78it115oE45XG+7iPdm00xuCW000tr qSnB1MZwKoC5T5OTRb1UpRYYijcYV+FepLFtcnldOfV+tUIVBX/L58X9sBfJQxDCA/lb 9m7ocCs9zttU/JOR3kmgn9d14z4owhA1fm5hpN2nQ9FBgLASDlFcGFwp97QymvKjRyt8 hd4Q== 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=nWEeMIdDGG557IfGE6/pw6pkle9YEzgB+lixxksXvrE=; b=tjxcVb5gF95IF1RGoD/r5SB2Mr7m3Fc96dZuRqkx9CJrvjZN7ZxkZyVxFTzDOlS5iV hCwgv1Sj4HyeOwR2BQMpuVcHGMV/PqWxCz8R1TkvDkSVQ45cAmKj3lUpeT8FUbu74aX9 CTR92DQFFaRFVF27XLl46TBwJEQzx7fmod/TK33y1LOPMwP8zJ9cAZj+y55cKX09OKMg u9vJyK7RIieeK0naGAV+jn2lSNQnrpoXJeJO5isw9iRoqxT6sgIbQUc90VxMdL+0IKS8 aZ/uRU/NC3VnTWmyfSPE1Nqui7Wrm35sQWeZVHdISJcu8yf41Yi6V2fDgMYpfiLXjsb3 u4Eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=zywJ1g4h; 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 w15si1162509edd.324.2022.01.27.00.38.36; Thu, 27 Jan 2022 00:38:38 -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=zywJ1g4h; 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 C0F4A68B1FF; Thu, 27 Jan 2022 10:38:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-49.mail.qq.com (out162-62-57-49.mail.qq.com [162.62.57.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 217B368AFD1 for ; Thu, 27 Jan 2022 10:38:24 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1643272699; bh=v0xKQs9uOysV72UuTY2/l9oErIJs5VPsbqBgB2J4Dho=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zywJ1g4hFdrqDuy7bq3njgwrge5mkOEKWOS+JTJuHCPYYT2mNTuooyRlRIV31JBhO ycJVpROVfCYjhOf/SdvA19yYdOrCg/9iF+wbpNMvTEuNjWE4WhaWOrBaS1y4gEEBLq GnQeSOLpb3PH/P1p32PeQDW0Do4gKTlkyADQqMhk= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.72]) by newxmesmtplogicsvrszc7.qq.com (NewEsmtp) with SMTP id 991B38FA; Thu, 27 Jan 2022 16:38:17 +0800 X-QQ-mid: xmsmtpt1643272697tl05bbkxx Message-ID: X-QQ-XMAILINFO: MIXpHopat2IawWSLgqSD1uQ5TG8D79Ik+BA7cKXmA1GyS6w2Iw1EZ1d55e2vUA t63NY/y2ICAZsZAlgni2N+vYqZpPIUAUH5HH6PMoAUKJSCkD2eFTJBvDKnjCJDqVjRZ0Kpm3AH2O hcXTAmHyhtPao7ocAD0wEM5on4W3AFTO6pZ7TChngUanPDhMz8fnWdSa+tkzjcCM5YYgMteoCNtG hcUKvNqWCiCyEUMXhl2VzsbE9WTK+gMxs+AZxFSVrB5w5AvUi3FCUJlCMXSywmDP+PeBuMg3uYrx cQnH/YwNgd6K3FTcRWWKIleFiEQ9Y0k/mWDP9htJ0cRBK7a80Nj2dkA47DPAiXZuLMWPcie8fCFz vHDtCOqYa8d0JE2osnAvOou5Ybj22d7t3nh4OI28Yo7+M4oEFNfK06alKxNXXSaHRp6lbw9z675p HseaO6AHtEYDohEvOctz3WFHtsR8KQ1QiC4U5aRzg8Kxx77AbFnN8HMWL2cMYCnKc9MNemJbXQDf g1S7anW9ditVjgqjVaISkcxSIHaSFjb2+tbjw3h3gapnIkB2Q3IDDp9Ysn2HiTbre7yOuTl/3FqK dwvKDdMeh4rU+Shsgpx4wW3hq9hv/MVRmu7HjbIoV2FBwBmC0TeaF/wyblEZVtrlw4XIfsRiGFLw YTqUv1tbDOkkW47LoVbM1K5tt28qBr898mchyezFtxz31+LAB/xzuBSSghX6JcwJcfIE5WORdIpf cyDlG0P2OvQc4PBUjF9d66Rj/+SfPrGONLYD+bIZUTsGe5qzDxUnI7nOqB5utEnOORziALRjgQdv FExJa9o3tZCa9mDVEVSLhBSXradA82AIb7HqOM5KJTIxy6bq0q9oSSMUTYderLjIiLhkIhX7rl2L dQeetVe5fZ/GLAJF1i6G/7Iqvkz2FSA0GlNASOJlaVXF4lY3xiyKNpkZ49K0+ibQ== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Jan 2022 16:38:15 +0800 X-OQ-MSGID: <20220127083815.82194-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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: 12c/AZybJNdz MoltenVK doesn't reset instance 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..d3bd37a6a7 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. */ + hwctx->inst = VK_NULL_HANDLE; err = AVERROR_EXTERNAL; goto fail; }