Message ID | GV1P250MB0737A13FAF37F2AD151AE9E88FF7A@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
---|---|
State | Accepted |
Commit | a6bd2ee7594c8625d4fd3b56e2d7c67b23c36580 |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4b2f:b0:149:dfde:5c0a with SMTP id fp47csp757012pzb; Thu, 14 Sep 2023 16:43:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHxnADqXwZFnkM6r0SaAbMlX2OQzSr+LEmA+Z92dPKi/pAx656NG+cW3jWy04/0yRFtyU2h X-Received: by 2002:a5d:444e:0:b0:31d:ccb5:f3c0 with SMTP id x14-20020a5d444e000000b0031dccb5f3c0mr68277wrr.18.1694734997902; Thu, 14 Sep 2023 16:43:17 -0700 (PDT) Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s3-20020a056402164300b005256c451a04si2217011edx.523.2023.09.14.16.43.17; Thu, 14 Sep 2023 16:43:17 -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=@outlook.com header.s=selector1 header.b="W2/uZUuo"; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5991568C767; Fri, 15 Sep 2023 02:43:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2029.outbound.protection.outlook.com [40.92.89.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5DE8A68C5DE for <ffmpeg-devel@ffmpeg.org>; Fri, 15 Sep 2023 02:43:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=go8ytqnrROpjGl0VMqAOgW7034JOhxxfTtyuJtO3b97m1RsLc5eq6wbsRNhDZq4LpcwTnUbT24qSc1aNyuie8KanoYFL9LT9wHdEUwyvx6IOklzLc03tf6aNm7ABchbqQHEsJrEkGe7gx+t2Fgdna+LyD+6kTIjscXXdn+50H9KY46VYF6MAWMUXyTPjenA+uuI66bxuQXYd4srfTVL4EIW32GRoURdMHKC8QbFVf3rGYgu55RnBMKXOaNkhNV8jXuACczFvpcQnT0Ko7NsPKUUzmp9eFOTz/0OX8pAYs7ACjRItqhyam5X17qa04oqsWHfqk/kRWeKw9oJBy0kvGg== 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=G/hBNiZahFhNXvNMfHyVZmZ0aKdQqWGXPVa+QSlZuQk=; b=IH/D7PZw6lybtX3JLaYZbxIFig9jgs41oY00qY6et8jrX2P0SMM8w05MRwtWZdkO0NvzSohKfi7LOAA1TWXpcvbjKrMDhx+BDBBW+fe9opi20MAFuzCRrFrydB/DVYS+aOpeq0W6/nrNt3iT1p/jAt0PKXbzb6QZ17ezzQ3L8Zt8Km5nXaTMCzB2Ne3xaB+od9L3koERkwK8e1C/RR3RRFSZuPYJZBRT7ajJgLCJteoJXQw+HuQwDEHH/Y2C1r3i1zVqAnNNZue+prJzQfwkSrQ9ZebzH+ppcRcEdm+6YNA4UprfH8Q5d2NPJaYKjyuw1Yjohm9jR/pdzfp9Ow8LLA== 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=G/hBNiZahFhNXvNMfHyVZmZ0aKdQqWGXPVa+QSlZuQk=; b=W2/uZUuo0srZ/o66ae7Y1j0gjjXsX6Qpu/lCbOSBnvbKN2ET5rawNzworVACQK6WLSARg9SqX8yUFNkRSzUGjP2Tln/W2xJqOnv5U4dmfiACtHfXezQo3OXh9Sk3SIexncGLidp1XEfjn+rIXzjvmvpEirxsoW/1p08RMicsZ3JRFck3MiJqrBbUDj6LueHsY7v7DKTpqZkGUTBNFRAg9bquzpIkTrUYag5lfXcr7l81AycRp3pcXVv+y5YDkBHnp4ZGECXdQ94Dvxm4g03xntfofQ4YGiGhTpFfTbTtstoJHvbEOeupgRVmEd0YMhpLgrbj+pb0Tbstzb5tKbhZFg== 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:43:05 +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:43:04 +0000 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Sep 2023 01:44:09 +0200 Message-ID: <GV1P250MB0737A13FAF37F2AD151AE9E88FF7A@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> X-Mailer: git-send-email 2.34.1 X-TMN: [8TRlgtAcHbCPAXqvzyUYLQ1tpESP2v2U] X-ClientProxiedBy: FR0P281CA0106.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a8::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230914234413.156864-1-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: bbb0aba0-7fb5-488d-9349-08dbb57c56aa X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Tyu7BrBH+VkHEoW9B2PgAB0hPCp5M5wvOPlVJvdwp9AbguCN+FUc1/o7mZeZ0ZVMda4jlXwbVR7SB+E8+6HfgzBhgJp8Zf0PjjPWpMUtan2XClQf/u4Mcn5XduCoCPktIX3y3y8FCNZlQDHxP7Mjxq/qVqxOlTPVxlKCCZVMvH9TXGU54060UZgp1pxlgziGbOel927rwN+zxo2+JmUihA90Msmr5Ygp4v8JLdSR+nFhlD7H4DB7+ErBeKooG0kTLeKqVOKUCHU5SF1OyfNshbB/oTFY0ZkddfpuviOhyAho/XIaefFX6wOmrZJTrkcJ7c2ubrfXoH2QyobnfOKm/28wi6Lq6bsSTOjsL+Zt2iT6MPquHGCGmYIMDr3aQP14HiHAYVp1mCdA7YheecpYWZXsncAonJLj/Eh+04m7c+J/av2IMK9fJAJXlXVljxjv10hD0PC9gcWEws846BOs1j3zJA6fN0PcQ9bA897PkcwtRj+n9FX09p49d4kl4JpNYJIQ01e7DYubICciHa7TFGo8lUok0jlGqhy4LmejnpEfaGPspbInDF4D7np3G0aBoX/tXS5DaCkZ8wO7Uq/52uSrCVTW7lIAq1go4/TH95D03IcPB5GYePIrpn2i8QxC X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 03w0IbdJICqcOZ7jA1pj5cas5TB+JIUZIo/j+T6D4OZHPeRKRFUK4JFTyH0LhG1149Iy1Ig5AKTCP/BLP2OsL7eizxuo/T+zl03yzqVqOIoFSYyW0vaWwC4mRcxiX8/u04lFKoL0qUshmmDIk3/4CFO7coKTWwH/Pi2XsZa8ElLdBjw5HeCdul5BlsIeMOMj53w1yZOXYrZ4InZ+nLQentx7Pj6OBj9+QwPISQ06Ek/xp9tmlqNlz2U20ojTJBj2X0D4s5zvvjC60BTSeNj/CBrChKOvg6ACtBGlpYqdKFMQh+Eo5QKar3QphLDaFc/dChvw4AUZbjlpHE0c03K8jPm+AzmCDq/tBn5OagMkSvUhkICaSBuY9HjzR0+qwvwoSp0IlR28RnmEsM3XZ8wN927SSO1gkGq1Sz+FJQR+q3MWs5Wiz9S2L6ywj+AQzswfce2efdhRp9CB+1lKkCUGcY+YHDyF9lUZr5q7YyEoK9THp3SmIO56rbntc+357lFFWs6ALHTYX98IfIVO9d2pEXAOVS3O3kXcQZ1SYkQMTU+svKeUJLfLvSp5vDO239V+4vGkn4o81mONhSZ27EsxwstMOsJqRrPvd3lV8VnRycU7eDIT13gUv/LLb2VvRXVEP9oaJZ5JFMIQ4mahML7Lmm+fzT+x2rKbzUHdrE70ebJe1Y4DkFmKRyE95cdFZuv1BXRleIP0Ew3rkc9BWklndTgD/XdAU0uFkUhcDhJ3EVwsKNvq+sSj7L5wBPtsx3F/q6vO0d2kZXhXWVl8RPXnRbmPnfzyl5Ux9a/Fw48W1RHXuiuip5wwmz6GqpJ6jOfyxZuhZMVSaAsV0DpCJJYKLy3UQO23zgKBhtCHjglouMp+oUvQzaqQCbIuC9tKX1210ikkzuWnEhWSeQK/eHZYBC/0SF5aA5VHkmAMfnf85NL5CWmZWES61JKnuT1dh8pprJokrDqx2/VP04Tqb9Sa67PhOvEeSF1+OBbhohiW4A+vdlhpb0GooWCyWTpAYvflCs0IQ9WpGRfsfz61wMpQ+ujA8VZAD5hyHxUIPwUvopQA4+VlS6Tfdv3TlfyJDNDCXaCZq0WTt0jU1ZP6/lM3zyULDAmuMk+AmLXhmPyFvNm/WtLXV3ENSnXU/QyAAUTpNB+0ndgtsswv5kmiTal7W0iP8qmfkaS0RluFPD72KU0x0NgA+8OgteofoMFcHcleHg6eZBJPMvX/J7h/y3RzI+R/et2jDdbTSwRe/ejJycTmNB7kA3nAov75T8lb9Lck X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bbb0aba0-7fb5-488d-9349-08dbb57c56aa 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:43:04.0738 (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 1/5] avutil/hwcontext_vulkan: Remove redundant resetting X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: yi9+WKskSLez |
Series |
[FFmpeg-devel,1/5] avutil/hwcontext_vulkan: Remove redundant resetting
|
expand
|
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 711a32a0ac..c783080567 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -3065,7 +3065,6 @@ static int vulkan_transfer_data_from_cuda(AVHWFramesContext *hwfc, fail: CHECK_CU(cu->cuCtxPopCurrent(&dummy)); vulkan_free_internal(dst_f); - dst_f->internal = NULL; av_buffer_unref(&dst->buf[0]); return err; } @@ -3642,7 +3641,6 @@ static int vulkan_transfer_data_to_cuda(AVHWFramesContext *hwfc, AVFrame *dst, fail: CHECK_CU(cu->cuCtxPopCurrent(&dummy)); vulkan_free_internal(dst_f); - dst_f->internal = NULL; av_buffer_unref(&dst->buf[0]); return err; }
vulkan_free_internal() already resets the AVVkFrame.internal pointer. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- 1. I find it odd that the frame's internal is freed without the frame itself being freed; vulkan_frame_free() expects the internal to be present and seems to NPD if not. (Actually, I was about to allocate AVVkFrames together with their internal when I found out that their lifetime was different.) 2. I have only tested that these patches compile, nothing more. libavutil/hwcontext_vulkan.c | 2 -- 1 file changed, 2 deletions(-)