From patchwork Wed Aug 12 02:43:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "xie.kunming" X-Patchwork-Id: 21602 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0E12444B2C6 for ; Wed, 12 Aug 2020 05:43:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D49B668B27D; Wed, 12 Aug 2020 05:43:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-oln040092253109.outbound.protection.outlook.com [40.92.253.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30D1B68AFA9 for ; Wed, 12 Aug 2020 05:43:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IcXvLXhRVI0tJKbWFQLCNXfaUY9N0QQyf35aLVx3x5wFm4Iv1tF5JyaT9Y7nDYCzSJwyFgnHQiXBOTm3gQXjE/4OeaVOOmFlF85fx9hh1yTeZv27SNUW2y6MElJqVkoNmc7mjYVeiUBjaVrk5+iKYvzdNXKLnhZFb4qSwGoyHLsry+jRNeAa4In37Uzk4/34q2Zw0qsCsEzmfGlTgLmpLXD/pioyWFh+9OmuNDJshohRAb70GcyZ93IBEgePCjbDPzRfJSEUp4eAgOFVWp15zxpvNEIwGfKMQw9VYpn6S6D3d0Hh6w/lPzbTRlwN+briJiXz0iOFWbCuK3IH8QQX0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sXA9F8JTZB5qMpwTa+jrP5LZ0xSDsRuIUa6FvK3c/8s=; b=QdjyAf9AKb9D28JBh8nQCIBTS9vS7fJCRWADLUkckTqr2pblSNp5lAny9vEe8RNUEw3aQC+xg5yaJAQMjS5IDz7SWQi8i56JUefkq54OR/xEceqzcEvZUwxwaLE5FTeqkH3WRrycNrhj0keD9CEFK2gKjb82d4YJXikHNs+eqZN9Kfuucim+iafAUn4aXTVeADVc+iNJZstogmYYqMHsL8QkwSahItoR0mYLPtXgNDU4ZPSAQok4aWlp1YtUVvBWo30EN4J/051ZnJ+MmA3OY37b0XC19FQ4guK6wEcKuD+fIVxly5o2X4az75jVSxfUIIpRG9u0eS/C/vKEZloSGA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sXA9F8JTZB5qMpwTa+jrP5LZ0xSDsRuIUa6FvK3c/8s=; b=u9heaQJLEp2WT/KWdjEiem8xL4GHuPUksPbpR1UWkrhSrZdybeOd+zDJgKfj5inuWFyXdy+ebLD5WkhNtdu254DAs9zi9CdkeRLMLQFl3B2U5MFqaV3T3h7A9ROTaTWCp4R0vSr9AXkrpnmCZIWPhgh7ule52G3HaiwShLoMv6TB0Xmxou7NdHzcb2croN5iQEAA35Kir5xE6GlRA70hEFwDxEQ1llI3Shv/vusYs3+mJVBHW7uoTRsuxVNGI2buw76cuLeb7OLOWx8gUAHtf16a3Ex4NTBjtTTmihIu3iD4NtaL+fIBdnzP3UTC/p7aIfVC9c/XWHgbQmXrHu9j3w== Received: from SG2APC01FT004.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebd::4e) by SG2APC01HT187.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebd::273) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3261.16; Wed, 12 Aug 2020 02:43:39 +0000 Received: from HKAPR04MB3924.apcprd04.prod.outlook.com (2a01:111:e400:7ebd::42) by SG2APC01FT004.mail.protection.outlook.com (2a01:111:e400:7ebd::163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.16 via Frontend Transport; Wed, 12 Aug 2020 02:43:39 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:9738B9DEB9EE27E2EB326E6B8D7632D45F5F10E90183C8A7A5CB8D313769EAFC; UpperCasedChecksum:BA6C99314DBABDFE976BA489828ACF0AB831B2809294B46B95AA11094A372B70; SizeAsReceived:8558; Count:46 Received: from HKAPR04MB3924.apcprd04.prod.outlook.com ([fe80::d14d:2b63:61b9:99ab]) by HKAPR04MB3924.apcprd04.prod.outlook.com ([fe80::d14d:2b63:61b9:99ab%4]) with mapi id 15.20.3261.025; Wed, 12 Aug 2020 02:43:38 +0000 From: "xie.kunming" To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Aug 2020 10:43:07 +0800 Message-ID: X-Mailer: git-send-email 2.14.2.windows.2 X-ClientProxiedBy: HK2PR03CA0066.apcprd03.prod.outlook.com (2603:1096:202:17::36) To HKAPR04MB3924.apcprd04.prod.outlook.com (2603:1096:203:d9::10) X-Microsoft-Original-Message-ID: <20200812024307.9356-1-kunming.xie@hotmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (112.5.202.21) by HK2PR03CA0066.apcprd03.prod.outlook.com (2603:1096:202:17::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3283.6 via Frontend Transport; Wed, 12 Aug 2020 02:43:38 +0000 X-Mailer: git-send-email 2.14.2.windows.2 X-Microsoft-Original-Message-ID: <20200812024307.9356-1-kunming.xie@hotmail.com> X-TMN: [NTV/RZdXVlAvQGQ1Ct1nk/wpWock6ukr] X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 275c9592-e03c-4c41-28e9-08d83e69845f X-MS-TrafficTypeDiagnostic: SG2APC01HT187: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7do7H5kr3/jG9knaHiC1pT9URA+Cd/EU8L44/konO8o688VnWKtrHW6VFz9X9445uVjTpg84XRf0d4Y36L+pEgKPnsFwXe0VpC/CXgJ9MTO+rXuvhxs2t0Ylbw1hgjeOM+hIaTAbiZXIvag5MRVM7B18SnIawldF4ECUxRnYHdwtgUXLa2Zo+MphyMuBSuKJhFi+/831+zTyzN9w3bUQnA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:0; SRV:; IPV:NLI; SFV:NSPM; H:HKAPR04MB3924.apcprd04.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:; DIR:OUT; SFP:1901; X-MS-Exchange-AntiSpam-MessageData: 6RhQ6o5t4Rl1VMqwGFti+wtVDLaOUKA+OOKRotGK/MJHbKQr4ran1qmzqEOjAjkAmeeE9kzmMTF/zf5jCMtbDTo5a/R8F9sUiHVyzd1KGe3jgkKUHu0H8d20pyMjo/YnSU2vr0YX6+6lzL35epKr7Q== X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-Network-Message-Id: 275c9592-e03c-4c41-28e9-08d83e69845f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2020 02:43:38.8960 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: SG2APC01FT004.eop-APC01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2APC01HT187 Subject: [FFmpeg-devel] [PATCH] libavutil/hwcontext_d3d11va: missing unlock if d3d11va_create_staging_texture failed X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: xie.kunming --- libavutil/hwcontext_d3d11va.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c index c8ae58f908..4524b01c20 100644 --- a/libavutil/hwcontext_d3d11va.c +++ b/libavutil/hwcontext_d3d11va.c @@ -391,8 +391,10 @@ static int d3d11va_transfer_data(AVHWFramesContext *ctx, AVFrame *dst, if (!s->staging_texture) { int res = d3d11va_create_staging_texture(ctx); - if (res < 0) + if (res < 0) { + device_hwctx->unlock(device_hwctx->lock_ctx); return res; + } } staging = (ID3D11Resource *)s->staging_texture;