From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 714CD47616 for ; Thu, 14 Sep 2023 23:44:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 341B968C857; Fri, 15 Sep 2023 02:44:47 +0300 (EEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2014.outbound.protection.outlook.com [40.92.73.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8799268C767 for ; Fri, 15 Sep 2023 02:44:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ObHLeAVP7wJtgPVVAr4+0TV2wolVeb0pS8Jfi+BXfhEIOpdLMW4uOQ60QDMcHg5bab67hkPNZ48EY6QcwbGMfvTJCCk1zJToXySDDnD3fuK26dEzbNdK+YGz3FRjHFvXkTxigqjMCAU0orZdg+yCEaktuLSzbKFdSGnOjEUXcvi+6pNeXi4TFEpaeNvts3a9TZucsy1lFkjOXbcQQbhuLrgEm16xAVLBEjR0e9q4LE6V1DtXmRdkb3N9zlICZfPguwblolG5At7KA4RlYZi0mvO8H/F3CEM7DjBglBKb/z9w30wMRjiVE2k+VLjSg5jsONQVfY7FayglDltfhyvH1Q== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=FlUH6UxCmdDZ0Y8F5mn5levqHCQnA9F0G166984OzUc=; b=OVv54exOQfX3ug/UcDUpoSCjqLyRiTW9xnW1ldsmcG5a+bXjmd5fRSkI49CszmXbubhRQ/QGoE5/YdBqM/7egx3PY1cg+FrGazLCQpXZ1788ehSDKbQqJgApW30csf4rNXyp2y6bih72cEWJ+NqyaNuWkh4JX2g/mZ5eZ9/kqOAPzaQWc4889426VBGP9KUMeopJkD7emrPK6gIjp4Z65OckyNp9gj9Mc/vOW5HITsSuDQOyF1RVeLN+KMZNCmkdPusrPFORgGnmsMgXqrC3mE7aqtRa5fcPXnz4SfFNUSFPIvywQ3wFhhhVxMgGOoRji2osZH17K3px87OT2r0eMg== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FlUH6UxCmdDZ0Y8F5mn5levqHCQnA9F0G166984OzUc=; b=LQLK+frbN8i2TzJM0iUDW1z3aapGFds9y5Ph2Z795dG8T8Rf4qUDnGmHQJHKuKmYcJEduMWvIKUjxUmm9giVjl9fMKdfcVzM1/1GvTaiXq9Qp3vYGzZ80hbxqi3GkZNdcSGbdjpczmEZn+iLOT/8H9qzBqrbYv02Ih9YNos4TF4zM+LSFXR+Az3B16c4/ITlEj6Hq3358tURwhHUcuuKCS33Yk8DauaOhmBTBfmsxDOWWCbnb9tz65zCeAy9XOusPgfslqVdY5sQfmkO+kSjUNsI8MDHRXXvYXe8ZyJwHqhpkiVja3DmdMycQEcGMv64acHziBoXyaENY/m7m4jqeg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0022.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.20; Thu, 14 Sep 2023 23:44:37 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::3fff:eb7b:b8e2:4dba]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::3fff:eb7b:b8e2:4dba%4]) with mapi id 15.20.6768.036; Thu, 14 Sep 2023 23:44:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Sep 2023 01:45:42 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [IaAqu8bQsMGe4DUt4bhwd4DsIlRRKNBx] X-ClientProxiedBy: FR3P281CA0085.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1f::22) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230914234544.156991-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0022:EE_ X-MS-Office365-Filtering-Correlation-Id: 605fe1c9-94bc-48aa-3ac9-08dbb57c8e27 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M4FMOlC4MMnF1QX/64pAa1fUef7GXmli06pFu+gJxIzYq6yKPeydQcKOsqB5eJpPZLSePIfLAMSwQ9n7prcd4yK26/oggwKK/4rPdC5kqCc1zMNyQO60Sn5WDYDTcGlFc3Yb7srBTEK5hwGtOhXTA8ij67/ATNEIV1jr1FzlQefZNDcK6M3CLenqWNZzLelu5kSSiUwAQJnC+BhRoBkGFLX513bNf4QIByTJMRkDkfKDSWuHgMjZ8jSsYQ7EE8+hrHQ8ub6l72EIlLkbVSaT+cIp52rg0rmzjqBfHo7uGk9rDEFzlddvUzmHrpVvDrqmpAc2Wr+wOsbExrt0Xy20zKXSC+yfq6rlLrKK9TmZvmcl/Z5V79wTLotJbX2oPa8NdIKfGiVBUJ0Fh3NcqE8NIF9wpSG8rZk7VL39ePM3MjmbuTSC0+49zYv1s7BSunaTXC0GowlmxcljSna6Ul7Z/B7dDGX2Aps/xS3UWZ/i8wDeXk6CBXA9Eel+y438u07e5FmB1Is+r5jIlfRf2mS2P5Ha+0jrYUrCgI2kAEAG0ID5k5hmXY7b/22DSeJW2ab6vJZNmoloI4CGbMejh35pI+8ekiwf9lcc4hephltqo1TwmTLHVL9fyG3I5E37ByDb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?k61WXe65GTwnuAQu+avjaq5tTrsp7uZpXYgdSDda3sVwZA6PFxaF2G3G4Wcc?= =?us-ascii?Q?ExSQO8dGOHAZr84XA9aw8Lx/L5UDTiGwrpv2Bomxqeved6It4LiWqXcOfve9?= =?us-ascii?Q?bobeNrpFQVRXuahKq3qH/bm0PTkTAsOjkLlarX9/+hW2N5Jv6ofkWfC65/up?= =?us-ascii?Q?9CbF/Hyd4lPx63E5svRC/M1gHp2DCnpx1AhU2hyC7W2l9XTzuAEFm+0FWM86?= =?us-ascii?Q?BC3kzSe3/OQOsj6ihCY1wNRXPQ9loO2iG7pAy5IM1OVpH4N6w1ywLIaUavwI?= =?us-ascii?Q?jzhvlS10GnGWNsGiKfWXhyl3hb97X9ORxYL1WiFi2g6Msg8z9joZg0nKjUWv?= =?us-ascii?Q?PfREXfgNBSjfsdsOwz6iCVMpTJ3xx/PphD5F/Xj5v4MKRTpKkgYngTqqPGl+?= =?us-ascii?Q?OsBxItAmrDX4CL2ftkFkF5t5XNeXTzwNcfdYW7nG1oHNqdTwK8vY6R9i29MO?= =?us-ascii?Q?XUjf807x7Aby8IknD5sniwBqbhOtnwfJhD7OPUlNdH8uSlR7sp4svnb8rFF/?= =?us-ascii?Q?WjfeB9SlNBCQTrq0I0abqBhxbZ53PNw1JfHSFXUFEnExKSgGh+QWfAh8kkre?= =?us-ascii?Q?6OQOHvZQuIAx9OPeiXiO4Nu7gKGwLTW4P5LTDCMnKNskv9J6kgXtjBVBcqHs?= =?us-ascii?Q?s+0heAS64XQqVFAsMW+9mZeTJAsAPdVG/4IKHQSUKP7e+MVqjPZsdluXkWXy?= =?us-ascii?Q?fR5L9si4BYRCGIs+dcU0qw3h5J/tMo/FA/jDCXHLRSV0quIdotDJ8m8TY/hx?= =?us-ascii?Q?G97hwrWipsKOvJHIWpMPKQpH+V0MGOnmI7jK1PTirKHfgviaNVW17U35GRgp?= =?us-ascii?Q?IP8H0rLHYeJxuvVYjsm5/+z2V9MXh+m7ofGNVTA36gZr8zSurJtOtUTdScaX?= =?us-ascii?Q?+z5qL0XcHmPtpz1k8JlyozeG/Amki5x/R0qX6VfT9DwjdPdcKjpa6893NfjN?= =?us-ascii?Q?ZmRCL6BoHBEr5+esIDZrsy/uj+7ZWLpRE/wRNjCMO3j3GzESW0OQZ7hB3/to?= =?us-ascii?Q?v7g6ulGNUk4RhGQhAn8QhfwG4QnKgle5WwTAnXEVbQCOldbHv6H0cwOa/coG?= =?us-ascii?Q?5ROXpx0/J0sVPUeLxPgD5wf0nB17MCdgID4j0vK3iajh3EeLeNSBgNLAj+qo?= =?us-ascii?Q?aIk7GszeK+laxyi6KTNk/HspbieF9uJCpctsV1zX7lLQUNCN7cO5HlJll8Tv?= =?us-ascii?Q?U3+WbNXqRJkS8YSzXl/dcnwJYbCxlwys9EePCGj46tSnTj3eaeeWXu8neA3j?= =?us-ascii?Q?F9dYwwM4vVzZpA7AN3O7?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 605fe1c9-94bc-48aa-3ac9-08dbb57c8e27 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2023 23:44:37.0971 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P250MB0022 Subject: [FFmpeg-devel] [PATCH 3/5] avutil/hwcontext_vulkan: Deduplicate code 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: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Andreas Rheinhardt --- libavutil/hwcontext_vulkan.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index d1c2d69b7b..0c846fde38 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -2407,31 +2407,7 @@ static int vulkan_transfer_get_formats(AVHWFramesContext *hwfc, #if CONFIG_LIBDRM static void vulkan_unmap_from_drm(AVHWFramesContext *hwfc, HWMapDescriptor *hwmap) { - AVVkFrame *f = hwmap->priv; - AVVulkanDeviceContext *hwctx = hwfc->device_ctx->hwctx; - VulkanDevicePriv *p = hwfc->device_ctx->internal->priv; - FFVulkanFunctions *vk = &p->vkctx.vkfn; - const int nb_images = ff_vk_count_images(f); - - VkSemaphoreWaitInfo wait_info = { - .sType = VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO, - .flags = 0x0, - .pSemaphores = f->sem, - .pValues = f->sem_value, - .semaphoreCount = nb_images, - }; - - vk->WaitSemaphores(hwctx->act_dev, &wait_info, UINT64_MAX); - - vulkan_free_internal(f); - - for (int i = 0; i < nb_images; i++) { - vk->DestroyImage(hwctx->act_dev, f->img[i], hwctx->alloc); - vk->FreeMemory(hwctx->act_dev, f->mem[i], hwctx->alloc); - vk->DestroySemaphore(hwctx->act_dev, f->sem[i], hwctx->alloc); - } - - av_free(f); + vulkan_frame_free(hwfc, hwmap->priv); } static const struct { -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".