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 ESMTPS id C4E234BDD0 for ; Tue, 29 Apr 2025 20:33:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3381B68A351; Tue, 29 Apr 2025 23:33:53 +0300 (EEST) Received: from mail-ua1-f44.google.com (mail-ua1-f44.google.com [209.85.222.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD8A96879C0 for ; Tue, 29 Apr 2025 23:33:46 +0300 (EEST) Received: by mail-ua1-f44.google.com with SMTP id a1e0cc1a2514c-877b9328604so4158086241.2 for ; Tue, 29 Apr 2025 13:33:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745958825; x=1746563625; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=GrJtjZ+6f7x9lLL2srirpm8yGpVouaCzZfXncjwETB8=; b=bz3uehrjgi4MLxkD/mNWSUu5qgBTjV7+2iSKoFAzkmr0GXmcA6Av+7HI09zxmT0b2h +CgDjtkeipN2E0mhlpasfKUKvj6Dg/eo0s51q/CEm1hOTWqpggCAQf53F9eH4PScQLgI Ra6eRuEq6e6IR4AG/Y+dD70chC1d8JePN8RX1BcRWELYfeZKiEJ5ba36JMdulh9lnTkJ b6yJIfeFtFARiAmfV6eRxpWt+Dp5FNNvMeZKwZ8sndjijjMCwXn3lFl3l12iCuHKCHKf 9eVXXBQRuJaqTha0kTAZ49f8t7PBqfjpNwHz9Z+ICST7IB6C8BuQ7SweTe7qc66FrfIz V44A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745958825; x=1746563625; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=GrJtjZ+6f7x9lLL2srirpm8yGpVouaCzZfXncjwETB8=; b=I/XdL5gl8A74GWZD/yz8e6bMd7rF7oykhYkaxdYhCs5vqPm3Vuv36E/esZBFvYlHY0 b8GfeIVPPoc6AXJxp06d5un1BYpxS3SGPssoGPXtmJF2BxIs3fQR7ozsZgDqsYAWgwaj 9M+G/ewfsDTypuP2E94FHhntBD+1TpkwYn99JoPj0q2oBFYYND+IETH8LgppoZ0uhZUr NFNivmZ7GcZ69wUrSfvP93yEOFHRUPt+reB8V14jy1WVxbdjYr3tT3O77Sub39tHeA2p X/hCe2TB5YIgROGI8K6hkDQp71QEAgWoajLujc4Woqrp3Y3RvY2qNv6JThwd1DmQLQUd Wgmw== X-Gm-Message-State: AOJu0YzsiVc9hcsbP9z8v3J9iuh4ETIi7LMoa20G7W58cOFLvm663MIb f6+cMtZ//Z03QRFGMS1IAhhGb/jijXgF1hzvDVTZLaFZ4O1AtaKRBJZUrGNKLLXL08QgwVhS1Ne 3AbxGxUsV/z/bvai/GkPZIYywByJMY8pX4bY= X-Gm-Gg: ASbGncutabyGho0Nmr+61mw0AmlywNf8Pns5HSVtkvNcANu6a6cRI6xWxQP6ItpBQJO WvsVoidwdDyprwTMk1W2+JytgFJf4yccEbAuzUyH5HHrgkL1g+KWAjq7irePzpw2e8CdVr9/NZd j6t/KCclpFXpLwXh0p0ZCGN5s= X-Google-Smtp-Source: AGHT+IFVkvRIq/1jwtE5tKGvYEjBIHbbPtvkRS7+u855y2l4yEfK1AvIIkr6KuqqJg+XOd5V9TXVd9V8KFucr2IzHg8= X-Received: by 2002:a05:6102:3e15:b0:4c5:1bb6:8165 with SMTP id ada2fe7eead31-4dad35b9f59mr665966137.12.1745958824842; Tue, 29 Apr 2025 13:33:44 -0700 (PDT) MIME-Version: 1.0 From: Russell Greene Date: Tue, 29 Apr 2025 14:33:29 -0600 X-Gm-Features: ATxdqUHG8YIRJSquZAxfV1-NmJou8aivOb2SZV5Lyd-zLm0lBGGaR7pndx60z0k Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] hwcontext_vulkan: fix exporting multi-plane DRM modifiers 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 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: Previously, it was assumed that `drmFormatModifierPlaneCount` was one for all modifiers when exporting, which is not always the case, in particular for AMD GPUs and maybe others. Fetch the number of memory planes and fill the structs appropriately in this situation. The encoded stream is still bad in the case where modifiers are involved, but I think this patch still stands on its own and I suspect that may be a driver bug. --- libavutil/hwcontext_vulkan.c | 78 +++++++++++++++++++++++++++++++----- 1 file changed, 68 insertions(+), 10 deletions(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index ade0235ef1..1af4dca1d4 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -3787,6 +3787,17 @@ static inline uint32_t vulkan_fmt_to_drm(VkFormat vkfmt) return DRM_FORMAT_INVALID; } +#define MAX_MEMORY_PLANES 4 +static VkImageAspectFlags plane_index_to_aspect(int plane) { + if (plane == 0) return VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT; + if (plane == 1) return VK_IMAGE_ASPECT_MEMORY_PLANE_1_BIT_EXT; + if (plane == 2) return VK_IMAGE_ASPECT_MEMORY_PLANE_2_BIT_EXT; + if (plane == 3) return VK_IMAGE_ASPECT_MEMORY_PLANE_3_BIT_EXT; + + av_assert2 (false && "Invalid plane index"); + return VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT; +} + static int vulkan_map_to_drm(AVHWFramesContext *hwfc, AVFrame *dst, const AVFrame *src, int flags) { @@ -3855,14 +3866,65 @@ static int vulkan_map_to_drm(AVHWFramesContext *hwfc, AVFrame *dst, drm_desc->nb_layers = planes; for (int i = 0; i < drm_desc->nb_layers; i++) { - VkSubresourceLayout layout; - VkImageSubresource sub = { - .aspectMask = VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT, - }; VkFormat plane_vkfmt = av_vkfmt_from_pixfmt(hwfc->sw_format)[i]; - drm_desc->layers[i].format = vulkan_fmt_to_drm(plane_vkfmt); - drm_desc->layers[i].nb_planes = 1; + + VkDrmFormatModifierPropertiesListEXT modp = { + .sType = VK_STRUCTURE_TYPE_DRM_FORMAT_MODIFIER_PROPERTIES_LIST_EXT, + }; + VkFormatProperties2 fmtp = { + .sType = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2, + .pNext = &modp, + }; + + /* query drmFormatModifierCount by keeping pDrmFormatModifierProperties NULL */ + vk->GetPhysicalDeviceFormatProperties2(hwctx->phys_dev, plane_vkfmt, &fmtp); + + modp.pDrmFormatModifierProperties = + av_calloc(modp.drmFormatModifierCount, sizeof(*modp.pDrmFormatModifierProperties)); + if (!modp.pDrmFormatModifierProperties) { + err = AVERROR(ENOMEM); + goto end; + } + vk->GetPhysicalDeviceFormatProperties2(hwctx->phys_dev, plane_vkfmt, &fmtp); + + VkDrmFormatModifierPropertiesEXT *mod_props = NULL; + for (uint32_t i = 0; i < modp.drmFormatModifierCount; ++i) { + VkDrmFormatModifierPropertiesEXT *m = &modp.pDrmFormatModifierProperties[i]; + if (m->drmFormatModifier == drm_mod.drmFormatModifier) { + mod_props = m; + break; + } + } + + if (!mod_props) { + av_free(modp.pDrmFormatModifierProperties); + av_log(hwfc, AV_LOG_ERROR, "Cannot fetch modifier properties for modifier "PRIu64"!\n", + drm_mod.drmFormatModifier); + err = AVERROR_EXTERNAL; + goto end; + } + drm_desc->layers[i].nb_planes = mod_props->drmFormatModifierPlaneCount; + av_free(modp.pDrmFormatModifierProperties); + + if (drm_desc->layers[i].nb_planes > MAX_MEMORY_PLANES) { + av_log(hwfc, AV_LOG_ERROR, "Too many memory planes for DRM format!\n"); + err = AVERROR_EXTERNAL; + goto end; + } + + for (int j = 0; j < drm_desc->layers[i].nb_planes; j++) { + VkSubresourceLayout layout; + VkImageSubresource sub = { + .aspectMask = plane_index_to_aspect(j), + }; + + drm_desc->layers[i].planes[j].object_index = FFMIN(i, drm_desc->nb_objects - 1); + + vk->GetImageSubresourceLayout(hwctx->act_dev, f->img[i], &sub, &layout); + drm_desc->layers[i].planes[j].offset = layout.offset; + drm_desc->layers[i].planes[j].pitch = layout.rowPitch; + } if (drm_desc->layers[i].format == DRM_FORMAT_INVALID) { av_log(hwfc, AV_LOG_ERROR, "Cannot map to DRM layer, unsupported!\n"); @@ -3870,14 +3932,10 @@ static int vulkan_map_to_drm(AVHWFramesContext *hwfc, AVFrame *dst, goto end; } - drm_desc->layers[i].planes[0].object_index = FFMIN(i, drm_desc->nb_objects - 1); if (f->tiling == VK_IMAGE_TILING_OPTIMAL) continue; - vk->GetImageSubresourceLayout(hwctx->act_dev, f->img[i], &sub, &layout); - drm_desc->layers[i].planes[0].offset = layout.offset; - drm_desc->layers[i].planes[0].pitch = layout.rowPitch; } dst->width = src->width; -- 2.49.0 _______________________________________________ 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".