From patchwork Mon Jun 19 06:15:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 42222 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp477625pzb; Sun, 18 Jun 2023 23:19:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6P/sLiIYQwFFJ/vQgEW0gKkyNAPFHwALb5ErsOBBwDQcjoHGIpkWf0PK4npbPuZk4v3XqD X-Received: by 2002:aa7:c749:0:b0:51a:542b:ece1 with SMTP id c9-20020aa7c749000000b0051a542bece1mr1124904eds.27.1687155578224; Sun, 18 Jun 2023 23:19:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687155578; cv=none; d=google.com; s=arc-20160816; b=O+8uSClT37jZjWSuLXFcE30FX8Bjnd3m4ocDCBCRDIkgLQ+phKobm4XlKPRzxmLroS /TnEu2RGyzOS/YQhIbPeTm+oTtRFp5irCslt108XGh0TgfVzOHhprHNxvNt4EOSyyX72 Ovu/wqV+iExWVhKvJWR+rEyusrLtRlOFqY57LRlkEcJ/8hQrGupsDEVP21oAwpKlibPP MVRFwiG7pMJs61cDTVruu7vja9AnXTh0/j81jSBoXYn23UMZGutc++1MQKIZAxB7sCeb jrUV4U1G2vPPiTZCWvKpXbK4I8sLbUepOJ+F5/2usvgl+grcc/gLmVsYQniebojN0oBd jAvw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=40/Y6lB6kjPmLQZcEsETV1wQCr31mVI8wfuwalG+Xyk=; b=blUG00UyrlSxhCh6FK2mXGRrJ7sLgRNasw5m2QttS6u3AwnjAk0/69ZWgWLfGeF3Zq 2tUZqQ6pfaloMArRfikHexrjUsVDLQyPC3MLEjGcerpZ7st3ha7DsWxeXziYjTy5SVRt /mhHrlhRWZPHGvHRiFb5SiyNWRgCfaDE+3O7AqFZu5RxSksi3odSf0kIA6Eryw3UCMZK t5n0kDXYfOp3e+0vFYaLY16/PFrfnUxw3kMeMniLDeCVQhgmlRUrLqYha/5xG1gHM/+/ yoTQU89eJhDs7aFUj2vpb821fNhdT1HUTkRrvcC+CQpsm3NB5MJTaNwnr/4oEMHIc7O5 Vugg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="FXE/fsMk"; 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 e23-20020a50ec97000000b0051a5a6676dfsi687475edr.23.2023.06.18.23.19.37; Sun, 18 Jun 2023 23:19:38 -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="FXE/fsMk"; 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 284336808CC; Mon, 19 Jun 2023 09:19:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BEFC468BDDE for ; Mon, 19 Jun 2023 09:19:26 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687155571; x=1718691571; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=13RhCQYd88z16FYBu6gavqUP0t3KaHeRWcBUbwvy2jA=; b=FXE/fsMklx7XtBl6MrtVgJ6iqBuPhnXl3iha+zCGUQ8cJrV3y5eAbxnP Im6s7l2UxwsUfnGUSARzSUlaizwzKfTkxcLRYU1IZ8TIbwQzv+9Z+CdFp CwawIu09eBQ7XZ7s79EDlLWpcwvRCf2muIHGvjlSwbeU+bdFPkrm0R/dG ESbYxW+ALAvkTVLQEmRpBZuRDSYhj1i0EaGD1JU3tl3STCRk54bx0QfcF qp9oaNtH2igBtEPTAoAaxkl1qOpOC7/n3OK3z6vjuPNMTkzfz3Y97IDPz VXE82Y38orFX6HgJ6/LtqRG1VV7KEuuCohh91LHwIP4Sx34KRpqnc8SkF w==; X-IronPort-AV: E=McAfee;i="6600,9927,10745"; a="362089623" X-IronPort-AV: E=Sophos;i="6.00,254,1681196400"; d="scan'208";a="362089623" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2023 23:19:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10745"; a="858099902" X-IronPort-AV: E=Sophos;i="6.00,254,1681196400"; d="scan'208";a="858099902" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.59]) by fmsmga001.fm.intel.com with ESMTP; 18 Jun 2023 23:19:22 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Jun 2023 14:15:07 +0800 Message-ID: <20230619061509.1363-1-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/3] avutil/hwcontext_qsv: register free function for device_derive 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: Tong Wu , Wenbin Chen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wXbiZnjPIF+g When qsv device is created by device_derive, the ctx->free function is not registered, causing potential memory leak because of not properly closing the MFX session. Signed-off-by: Tong Wu Signed-off-by: Wenbin Chen --- libavutil/hwcontext_qsv.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 4ed4242ddf..878ecd886e 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -2094,6 +2094,15 @@ static int qsv_device_derive(AVHWDeviceContext *ctx, AVDictionary *opts, int flags) { mfxIMPL impl; + QSVDevicePriv *priv; + + priv = av_mallocz(sizeof(*priv)); + if (!priv) + return AVERROR(ENOMEM); + + ctx->user_opaque = priv; + ctx->free = qsv_device_free; + impl = choose_implementation("hw_any", child_device_ctx->type); return qsv_device_derive_from_child(ctx, impl, child_device_ctx, flags); From patchwork Mon Jun 19 06:15:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 42221 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp477684pzb; Sun, 18 Jun 2023 23:19:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ46Df7ZSIR/nDxesy+7eIwloKBQ2YZG8JhJFjn4Cc3b9zslJ0uM9zto9TCS6QwEoLtunUnL X-Received: by 2002:a17:906:ee83:b0:978:af9d:771d with SMTP id wt3-20020a170906ee8300b00978af9d771dmr7763910ejb.17.1687155588107; Sun, 18 Jun 2023 23:19:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687155588; cv=none; d=google.com; s=arc-20160816; b=qjQsTuNeHwDGRIqe8fz7dygo+63cRbKHVjWgQ85RiWWYNMcanktKEMdjnpxx6oSKX3 7clmogyUkt2HYjkbbSi5XQx0vAq0/Y06xsJUXTu0VOhcRUupIdFE5VJTBkU6d9GpahX0 jajUZNp27PlFg/84/8cLNBxiMR5HE50psKxPSNtC9ly20p/vYCm9hG2+EueoRN++0pS2 RJIs83l9c5GHkF3PUZAa4KjevpNTT3R2A5J3Z/D9FtsdKQWYHTBtE52k//lGeXcRFAc9 tib3QLdAcsxT8YuULlKILPeE2eCFeU2gJCga+23hK3f9XRgPJu+DzbbdC7eLq6qu8AZD OFMg== 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 :message-id:date:to:from:dkim-signature:delivered-to; bh=fJVQ7fj6E+zyEgSLEkUhXlHddXwG0buWSINa6yuciRw=; b=AGgCvXlrb9FqQl9FsmcpErMz1IoVZMrgBz+oF7W02ne0xGBJ7p6a4Nz3+FmWQq/o0W E81B37CKVlr1MxDcn1xgqZsiJ+/VWhYdL4GzYG1EPOx1HRctA/5q0iIFI4Xv1zmJ/3Iz gsCZLO1xJiAT0g4HA8uYmCr7wte92ZUd3OjwlAaMG/fc0onxJOGuifQTeb1yE+I52V6N q5ejCFQnTmRBz2do5a9TYAFjoJ9E855dNmnMSWUR0hIuzJfQitbiBB1N+aaQwAjXKiB+ yHTzvFmjcOVehaQIxUy06ZCA6cPnSCwVyIOHbVvqT0nCa7cxHxS3jS2vZoDILmo87LWg A18w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="Rn/9DMjP"; 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 lr20-20020a170906fb9400b0098287baecc2si5970134ejb.50.2023.06.18.23.19.47; Sun, 18 Jun 2023 23:19:48 -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="Rn/9DMjP"; 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 3029A68BF9B; Mon, 19 Jun 2023 09:19:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 561BA6808CC for ; Mon, 19 Jun 2023 09:19:27 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687155572; x=1718691572; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yvEmEYODuaDiPoB3pHyQin0S1Xnv5VlkNSiE/xyDd9Y=; b=Rn/9DMjPp2xn7/dNYRzmPpKvarvWg83SLioPmKs+Aj3FIFIn1d8dyssD lJfqh0Jn4ggSby1izZHrJGGOuth3l3DQVtY0zSlNO+Mh5NHukXN0DkLLz uRspFtEZRgwvJ17Vb41MDZFhHQWmPX2Kw/LDq62a5Tf2DCOcOBStaJqm2 UofCZarYdWujgt4lbf6ZHtJxnAeZdED126P5BmNECwzqZIw2qtj7WxIR6 L8in9PMQHrozPZQpF9gTn+CTPoiXcVWjo+fZ33rAwYK18BtyIawjVUtIY s1Vy2d4iaUKsr9fJwQwmB8xLzi8vMwlFZPYNHKk1jb8xhCdID2bk1x4I3 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10745"; a="362089625" X-IronPort-AV: E=Sophos;i="6.00,254,1681196400"; d="scan'208";a="362089625" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2023 23:19:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10745"; a="858099909" X-IronPort-AV: E=Sophos;i="6.00,254,1681196400"; d="scan'208";a="858099909" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.59]) by fmsmga001.fm.intel.com with ESMTP; 18 Jun 2023 23:19:23 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Jun 2023 14:15:08 +0800 Message-ID: <20230619061509.1363-2-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20230619061509.1363-1-tong1.wu@intel.com> References: <20230619061509.1363-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/3] lavu/hwcontext_qsv: fix memory leak for d3d11va impl 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BZc5GQDpFl1z Signed-off-by: Tong Wu --- libavutil/hwcontext_qsv.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 878ecd886e..1d24a04561 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -665,6 +665,7 @@ static mfxStatus frame_get_hdl(mfxHDL pthis, mfxMemId mid, mfxHDL *hdl) static int qsv_d3d11_update_config(void *ctx, mfxHDL handle, mfxConfig cfg) { + int ret = AVERROR_UNKNOWN; #if CONFIG_D3D11VA mfxStatus sts; IDXGIAdapter *pDXGIAdapter; @@ -679,7 +680,8 @@ static int qsv_d3d11_update_config(void *ctx, mfxHDL handle, mfxConfig cfg) hr = IDXGIDevice_GetAdapter(pDXGIDevice, &pDXGIAdapter); if (FAILED(hr)) { av_log(ctx, AV_LOG_ERROR, "Error IDXGIDevice_GetAdapter %d\n", hr); - goto fail; + IDXGIDevice_Release(pDXGIDevice); + return ret; } hr = IDXGIAdapter_GetDesc(pDXGIAdapter, &adapterDesc); @@ -689,7 +691,7 @@ static int qsv_d3d11_update_config(void *ctx, mfxHDL handle, mfxConfig cfg) } } else { av_log(ctx, AV_LOG_ERROR, "Error ID3D11Device_QueryInterface %d\n", hr); - goto fail; + return ret; } impl_value.Type = MFX_VARIANT_TYPE_U16; @@ -722,11 +724,13 @@ static int qsv_d3d11_update_config(void *ctx, mfxHDL handle, mfxConfig cfg) goto fail; } - return 0; + ret = 0; fail: + IDXGIAdapter_Release(pDXGIAdapter); + IDXGIDevice_Release(pDXGIDevice); #endif - return AVERROR_UNKNOWN; + return ret; } static int qsv_d3d9_update_config(void *ctx, mfxHDL handle, mfxConfig cfg) From patchwork Mon Jun 19 06:15:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 42223 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp477714pzb; Sun, 18 Jun 2023 23:19:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7clkP3iTCqlF7UFBDvVNfMkDJ4sYb7EBDt1cbIOy0pLRh8p7sJkaK43Hqjp5AlIvvItzi6 X-Received: by 2002:a17:907:9485:b0:988:6bd2:b0a6 with SMTP id dm5-20020a170907948500b009886bd2b0a6mr2859578ejc.10.1687155596064; Sun, 18 Jun 2023 23:19:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687155596; cv=none; d=google.com; s=arc-20160816; b=MENsF1d6f5gVKiRzhqXbX5XR+Sj7DzIZQe1iK/ycXaFIIqSAzs+VUs9xPNyz6AQuCf fdYlQKhGIHdtugWTXADfmNLqXpEyHkbSuwYwbaU2+nzj21hFClEHfwqnr9OO/4dP9uFD A9VAOIfsEOLsDocoBIVvTdai8uDTRMN4+k9vGJh5oUKYF7eYoiIs6o13wHqxYdgM3VgB ttcVwwZue+YL6ABfVgxIgDIKz8ziRLbEWFtoacp31ArcVOvVIR64Bp8W2HrDQN5EAp+G ieR6gifC6cKmmPL9vXl7fI2rW+PWIIHwez0WASBSKj85JRpKuB9vkQf0rFis1KOTWUET wgRg== 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 :message-id:date:to:from:dkim-signature:delivered-to; bh=CF2tk1o+EklcWXAYYvL6YyhtzkuQNDK5BA/W0tQ5y/0=; b=SqirYIThoHZ2d+7nOlrOP3xWPKuHWzHFSU6PGrAlUTgK4pQNvT432TJqImkdfIPL30 ZZwVdaJgzsrpi8nCdAsmHAI8NkJGomdEdG5Aojnx+FqnEsZ66AajKGjqDVkX543Rh2rW uD2cwrg1G0U7802GQoDpCd9grIBXbiw4rOVHqPjziAbGAbJNI1zOO1olUw3HhL65jn+T Cw3oDyNIREVvfq3KUj9r71cXG8Mv9joFhTbPRoVCGfkP/I7NEtgq0AUwxQuSUzQkMlZ8 tSPXEIerAtk8ZkEXd4qXjT8il0DMWdbOcNLEuaLwcyBlw56QJ7opZ0eYCeIqCPRiC00X nIoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=npZve1Oo; 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 lh8-20020a170906f8c800b009889b296070si841281ejb.261.2023.06.18.23.19.55; Sun, 18 Jun 2023 23:19:56 -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=npZve1Oo; 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 36D2068BFB2; Mon, 19 Jun 2023 09:19:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B054D68BF75 for ; Mon, 19 Jun 2023 09:19:32 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687155577; x=1718691577; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=X7XNxg0d+HuPquyEcRoWDtuT0kQOEGtpKFbsZqS+hJw=; b=npZve1OohkgnpHnmU1jJ8JkrhK3LHxodAc2ZE+lnqjmVU5WAOuFyq4U6 mHUkXNlFylBVJN1VNQZA/CyW7sBXcBGrAY464t/ChOrEv7E0u8JdEudIU 3/gLCAPeAPZCDo49m/1fF2rppb/tvnLvUDBzlek3iLP1YGECOdvhPArY1 +yfHo4B+yNmcKwh7H6EV2rDiUe8w7hSqvNa6MY5w19egxAro83FYbmx7K F5DnnTrAVhK2GhAGL4HNqY/1Mi4FxK6kUkVeOFdzVfqJt1qV4A2GNQcjT FR3uGAv5DRl3jyxUUGAiFenUG7rMZpwjqgnE+eyUUrCXeIlZXW1Swoh70 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10745"; a="362089630" X-IronPort-AV: E=Sophos;i="6.00,254,1681196400"; d="scan'208";a="362089630" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2023 23:19:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10745"; a="858099919" X-IronPort-AV: E=Sophos;i="6.00,254,1681196400"; d="scan'208";a="858099919" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.59]) by fmsmga001.fm.intel.com with ESMTP; 18 Jun 2023 23:19:24 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Jun 2023 14:15:09 +0800 Message-ID: <20230619061509.1363-3-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20230619061509.1363-1-tong1.wu@intel.com> References: <20230619061509.1363-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] lavu/hwcontext_qsv: fix memory leak for d3d9 impl 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lpizMJ3KXBdE Signed-off-by: Tong Wu --- libavutil/hwcontext_qsv.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 1d24a04561..82c020915d 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -756,25 +756,28 @@ static int qsv_d3d9_update_config(void *ctx, mfxHDL handle, mfxConfig cfg) hr = IDirect3DDeviceManager9_LockDevice(devmgr, device_handle, &device, TRUE); if (FAILED(hr)) { av_log(ctx, AV_LOG_ERROR, "Error LockDevice %d\n", hr); + IDirect3DDeviceManager9_CloseDeviceHandle(devmgr, device_handle); goto fail; } hr = IDirect3DDevice9Ex_GetCreationParameters(device, ¶ms); if (FAILED(hr)) { av_log(ctx, AV_LOG_ERROR, "Error IDirect3DDevice9_GetCreationParameters %d\n", hr); + IDirect3DDevice9Ex_Release(device); goto unlock; } hr = IDirect3DDevice9Ex_GetDirect3D(device, &d3d9ex); if (FAILED(hr)) { av_log(ctx, AV_LOG_ERROR, "Error IDirect3DDevice9Ex_GetAdapterLUID %d\n", hr); + IDirect3DDevice9Ex_Release(device); goto unlock; } hr = IDirect3D9Ex_GetAdapterLUID(d3d9ex, params.AdapterOrdinal, &luid); if (FAILED(hr)) { av_log(ctx, AV_LOG_ERROR, "Error IDirect3DDevice9Ex_GetAdapterLUID %d\n", hr); - goto unlock; + goto release; } impl_value.Type = MFX_VARIANT_TYPE_PTR; @@ -784,13 +787,18 @@ static int qsv_d3d9_update_config(void *ctx, mfxHDL handle, mfxConfig cfg) if (sts != MFX_ERR_NONE) { av_log(ctx, AV_LOG_ERROR, "Error adding a MFX configuration" "DeviceLUID property: %d.\n", sts); - goto unlock; + goto release; } ret = 0; +release: + IDirect3D9Ex_Release(d3d9ex); + IDirect3DDevice9Ex_Release(device); + unlock: IDirect3DDeviceManager9_UnlockDevice(devmgr, device_handle, FALSE); + IDirect3DDeviceManager9_CloseDeviceHandle(devmgr, device_handle); fail: #endif return ret;