From patchwork Fri Jun 16 12:05:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 42154 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp1493624pzb; Fri, 16 Jun 2023 05:10:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Ht+6jWYTj/nLLPG1eC2hz7BX8bDzAwmWhS0iDzFV5UMqxeIU+CPJ9H5N2lW9iJdACntfN X-Received: by 2002:a17:907:5c2:b0:974:55a2:cb0b with SMTP id wg2-20020a17090705c200b0097455a2cb0bmr1688312ejb.55.1686917426330; Fri, 16 Jun 2023 05:10:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686917426; cv=none; d=google.com; s=arc-20160816; b=HGA49SoQU4A61+sPYDGK/otzfGEaT104XVKblzeZyUnypSpMwgqdUwaTnAs2QrMcVY tiyUHDoUiQW5kwWeFgtH52RZZroP0CREQRTW658Dv2gJpCUJvRGmB1lYCT7HHyZzUewS /o8ZK83fulLfLWpKaxKYb2qdNozasQK20l6x7puGPvKTQ/B9fnFcbdsWwFAJ1dr5HqEs JRFhCNbgIxVFSfuVOk8SUk7DpQVcDAYcefcCfbEO0xthERfg0SIs7mKCoQteHjp5YRwk t+TpfvwXrT6+1sORbwdfyIhW0kkLBnKhpdSJcNGUAtA7iOxDzUPdq7/tAfQ411fDnuFL DmUw== 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=MAkPwDwgMJC2MwbeShLyW3S7AOxoDu93sBV8dzA9hl8=; b=J7CsAzWHW/BE6WKXoUN4dKTVpZzTXwGx8aFBOsdzPFkKzKqyzt5MDQ/BBC1gBowXOU rJb2MmKTQOA4Wt/ADVLyqBB8cQfjPMcaDjGmVYBnWwqPxi091OHcoO9vuvcGvPEsDXPX jNqTq1XFpELloIN/r98Z/fYI9MCSGIs423exjNHPN2UuZgMmjYM+UoRM2QrgT9TPyqHo yYKzj6aHS+KsJ/RYwkX11gKkQsQAvmsGL5aANKcvRpqhmmsQ2t5v+jWJ0vO/BTjFvr8k 8KxQ74fmT4uttK7SWIk18BS2XOoD65HjLwk3dlX9N6m4Ur5Otb0Xfu/DHY+hxm4sEh01 4K5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=HWeXFCkq; 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 k8-20020a17090666c800b00977e0843714si10990338ejp.1002.2023.06.16.05.10.25; Fri, 16 Jun 2023 05:10:26 -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=HWeXFCkq; 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 BCBD568C0A6; Fri, 16 Jun 2023 15:10:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89E8368BE21 for ; Fri, 16 Jun 2023 15:10:15 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686917420; x=1718453420; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=K9u8t14k09MZrE8fDCME2GWPYoeutI8iEQQZr3c7XAU=; b=HWeXFCkqLSCQkb+AXeImaTC13NOgqIEnLjzvcaYotQAqkxun/ABSmCwy AcaUPjNA+6ktcF8Rnm/clEKHNciOKXxoVepSbHlgQ3UoLKrOGuuHcUHF4 BS4M7TdiHDSE1GMBgc276ABn3N05e1e19yOVAY+OVvbAJUqLmhZtnRfmr fS1RFlQ713FeiAOErBBgJ8j9328jZHDQLkjLowkhm+q3+nKEWmPDS+LdH 8ZCrnfQFKNZrR8BWvo2eJtqMCeF7FdOgERoVSG6AMFXOsdmnk11336z2I MOmDpqz34UOK0gq3qWXsZ1ELuuOXvzDZ3gWqlUGOCTg+sNnulcKXbscMA A==; X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="359209867" X-IronPort-AV: E=Sophos;i="6.00,247,1681196400"; d="scan'208";a="359209867" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jun 2023 05:10:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="742656098" X-IronPort-AV: E=Sophos;i="6.00,247,1681196400"; d="scan'208";a="742656098" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.59]) by orsmga008.jf.intel.com with ESMTP; 16 Jun 2023 05:10:12 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Jun 2023 20:05:56 +0800 Message-ID: <20230616120557.75-1-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] 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: rUAQyQ70wOgB 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 713dc90ffd..931f905a51 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: + IDXGIDevice_Release(pDXGIDevice); + IDXGIAdapter_Release(pDXGIAdapter); #endif - return AVERROR_UNKNOWN; + return ret; } static int qsv_d3d9_update_config(void *ctx, mfxHDL handle, mfxConfig cfg) From patchwork Fri Jun 16 12:05:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 42153 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp1494029pzb; Fri, 16 Jun 2023 05:11:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4iuetZxF9V9UomYlZ2pR1CTeMq34YxBGuy1OzYwEtTPyuk7hwjF22B6gg29gJnPjQqiZFJ X-Received: by 2002:ac2:5bd1:0:b0:4eb:42b7:8c18 with SMTP id u17-20020ac25bd1000000b004eb42b78c18mr1128384lfn.53.1686917465949; Fri, 16 Jun 2023 05:11:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686917465; cv=none; d=google.com; s=arc-20160816; b=YGH744Nf47+xu66xgoMIaECauqbAIkMLX2PVGoqo+hCWkv4VLwzElzsMLAA7qcSNKW nPYTwjWSSsRlMdhm41nQKibF4gN+qZTSttYsGgg/uhCTAI+VAw83J3cqEWiZKcf1I7uG 7FJZw2A50sPcsR/vCkTzkbcrXg8MZUSbxgo4FrGGjCWoTnMAVWPGJaxo8FcgEKfJ6jmc OXPdWLinSHJFmJTJFO8XVWY3FTdmvOgNVUsn2VXOhtzBBj4bYzX8la4vZIajUewX+laQ xfOm9XJIw4e0MBCS3ibtwda06q5bEnrnbDNm9s1r0J2Q84dSDu2rkWV9/YRbuK3/Hom2 T3aQ== 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=M1F6fpwOkzMhBcY751c+oTdNuhiQY0Pegjzj3lyPMLs=; b=0x37gN7Uz3Kz0mrAyRyNAfafqfCYq1a9JtFVvwnYRkHkBRcSjG/ZrN0EZi94BkgBU3 XMmyVFsPv9jFtqnna+2jFYzHAIlfEucV62xE+njABNCbVgDvc/w9AF9JlVGbZXHM5rLz Ezib7OilGE6y9cAI4whvBSZ2niKXffYihyw5riBrdwUZ0fdZ27Vux1jHAwQdvCAZBquw Tzm5qD6bIhPaBwhW2Y8bvK2ML2OgrAdM9XR+peP2Vuy1UsLRgtE/rCDvCy9johOEisSX 5Yj1OxJ+P3Wl42hss5cv+gHgOoGBMWJPN48+bIFEH1Xy1RXoQbEGDxSE5iv4E/z06ajn daZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Y34I5EYA; 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 by9-20020a170906a2c900b009837907df00si1048416ejb.242.2023.06.16.05.10.35; Fri, 16 Jun 2023 05:11:05 -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=Y34I5EYA; 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 E93DE68C00B; Fri, 16 Jun 2023 15:10:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BCCF68C00B for ; Fri, 16 Jun 2023 15:10:21 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686917426; x=1718453426; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6R+4kzLWRNQIFvI6DhwPmyokU+zV5fqm/Iy1AeV9c8E=; b=Y34I5EYAL2v8qF0zOpp4pFeMbZVvCqhit4MBl6kvDAMyFYe/WHvRnLNA 0Jq+PTZFvOB0tn5p1mOvo6DJptdALksYsC85H1Bu9V8bRweLr1PrY+atW FtLeRFbmt3lI0xYZ5xMihIjdGjhgmuEEHEs+at6oGqXXXYO06ECkA1Ta7 rgxFuygauS1Va7t/2anEmDnWRoPUHTUemSZYzdGt5KuZxSDKuIvfBa94Q xcQSOZldhJGNvyzkzAz3Iv5LMNKto9jPyJJS96ArPL6JLdKytfMvK79ek 53G+7HAiuvNshCSd2BY83joDwyxPjYePcwmKbwWyn8xxqptImKwFF6bof w==; X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="359209870" X-IronPort-AV: E=Sophos;i="6.00,247,1681196400"; d="scan'208";a="359209870" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jun 2023 05:10:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="742656103" X-IronPort-AV: E=Sophos;i="6.00,247,1681196400"; d="scan'208";a="742656103" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.59]) by orsmga008.jf.intel.com with ESMTP; 16 Jun 2023 05:10:13 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Jun 2023 20:05:57 +0800 Message-ID: <20230616120557.75-2-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20230616120557.75-1-tong1.wu@intel.com> References: <20230616120557.75-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] 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: Ke068GLZOFh3 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 931f905a51..4cbe8cc494 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;