From patchwork Tue Oct 24 23:41:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 44351 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4999:b0:15d:8365:d4b8 with SMTP id fs25csp77507pzb; Tue, 24 Oct 2023 16:41:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHl0qIKp9Hhv1hGADuLvGeAysIlFBiGSeM3nxzb5g2iKBo3D8gth3BKTRaBlisC+KKUDZA1 X-Received: by 2002:ac2:4c95:0:b0:507:ce49:81bd with SMTP id d21-20020ac24c95000000b00507ce4981bdmr9439554lfl.61.1698190893461; Tue, 24 Oct 2023 16:41:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698190893; cv=none; d=google.com; s=arc-20160816; b=Pm6wyW9PPgFN/2KStLiOgJgQohwnhydZoPwO5K7g7wbADFQcNR47gripggPDT3vONP u4B2arEe/tf/b1ga9hSxyEEFPgfdomR1K18BjGhR3pjyIJlo7CA1Cms7TeGh8/pfoeMo C3siTBX09OviwfObMhqCSknk6D8O6sWYsypMdPhm9uxkeZCS3yDqJ7Rol3YH75VAw5cH FKhkaDSlwXys8XwR/oFWZOm19uXDtplpf7NR5ew+hmTVVW5EVnQ5nODMYSeoiJ53ZE+I GJoxIL4s0XdFLOBu3t3dlVa+R/dBN8eyUGzg5bjI0HFtRtF5DTV5MpSeRClRgRoSKxVt XMWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:to:from:date:dkim-signature:delivered-to; bh=re5OVZDcccWdnD10ww9Iy1gY5y8ArulEvmbERNngczA=; fh=Q46kXK7oI5D1Jhi90JBr53c7NIaTxGaU4KPeRZyM/hI=; b=LfdBOgwdgCdAxfEqcplNjxqtAeO3Vlb5oCVGoP59kfPLI7bzCiYpxkoyVUpLUcyCII ot3saDic9z3OQc6eVr+6y3JkywhKgCDMPJjlm3sTXWClyfEHBZ2aoSKKFqVu6Ayo39tR AJk+50XSuUO4UL7/gJS/zqgkHENB97nBtG1ZJ1P7ugw498Cqh0aQVRLNk+jkmOH6mKTT 4orSLsO9R5YjJ16IRexgcwmAliEyM918hkOTbr+EIO9ej9vdxotkPFMvUkCjjv7iiTmr nPsCNLSvMtN2jzB1YCjHOjsI2FCErxuBTJTKj3pc6R0poIEaWJM/7yMTysNj9NVcYodF e/jQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=ezAoWEhv; 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=NONE dis=NONE) header.from=lynne.ee Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b40-20020a509f2b000000b0053ee8113119si4849167edf.60.2023.10.24.16.41.33; Tue, 24 Oct 2023 16:41:33 -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=@lynne.ee header.s=s1 header.b=ezAoWEhv; 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=NONE dis=NONE) header.from=lynne.ee Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2EADD68CA66; Wed, 25 Oct 2023 02:41:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B605568C7CC for ; Wed, 25 Oct 2023 02:41:23 +0300 (EEST) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id 6AE9210602E3 for ; Tue, 24 Oct 2023 23:41:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1698190883; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=efjJKKzvw2AG60kcUmwjjDlwoB0b7YpXFFSYnFKBMpg=; b=ezAoWEhvBloMFk4689EtW0P/Vt2FWhh2G7Hd0RFff5iYrCwYHeJcCXJdV7gDkdyi d6xw3CWa3fpdntuzu6pQJnSoC94z27FbIuzGxjcdRq33rnD7nI4mYMPUbUkR30Bs2XI bzr/8ZQOVaLQqROtLJt4oxxOyLjsLAi0tPoM3zX8Kt5gwjo58X9PeutKRhBarQyAUGC Z8j28TBNX67RPir0JjlVv38i6snKW/eMd5IHpl1zhFyvtB7Oa8QoxPJsVjVRVG9rTGl 0+K+znrYLamAaxTxIaOPsfo39+FE114z9ZKFYsRlGkze4fc2UybznPpBEEw15GAAqOO gCuBMKkc5A== Date: Wed, 25 Oct 2023 01:41:23 +0200 (CEST) From: Lynne To: Ffmpeg Devel Message-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] vulkan_decode: fix pedantic validation issue 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: UiQNvUbZYsqU Meant to be applied on top of my previous patch to fix frame context dimension allocation. Fixes: "Validation Error: [ VUID-VkImageViewCreateInfo-imageViewType-04974 ] Object 0: handle = 0x9f9b41000000003c, type = VK_OBJECT_TYPE_IMAGE; | MessageID = 0xc120e150 | vkCreateImageView(): Using pCreateInfo->viewType VK_IMAGE_VIEW_TYPE_2D and the subresourceRange.layerCount VK_REMAINING_ARRAY_LAYERS=(17) and must 1 (try looking into VK_IMAGE_VIEW_TYPE_*_ARRAY). The Vulkan spec states: If viewType is VK_IMAGE_VIEW_TYPE_1D, VK_IMAGE_VIEW_TYPE_2D, or VK_IMAGE_VIEW_TYPE_3D; and subresourceRange.layerCount is VK_REMAINING_ARRAY_LAYERS, then the remaining number of layers must be 1" Patch attached. From af7bd8c40c1b54a065311f15c72ba676bded561b Mon Sep 17 00:00:00 2001 From: Lynne Date: Tue, 24 Oct 2023 22:43:06 +0200 Subject: [PATCH 1/2] vulkan_decode: fix pedantic validation issue "Validation Error: [ VUID-VkImageViewCreateInfo-imageViewType-04974 ] Object 0: handle = 0x9f9b41000000003c, type = VK_OBJECT_TYPE_IMAGE; | MessageID = 0xc120e150 | vkCreateImageView(): Using pCreateInfo->viewType VK_IMAGE_VIEW_TYPE_2D and the subresourceRange.layerCount VK_REMAINING_ARRAY_LAYERS=(17) and must 1 (try looking into VK_IMAGE_VIEW_TYPE_*_ARRAY). The Vulkan spec states: If viewType is VK_IMAGE_VIEW_TYPE_1D, VK_IMAGE_VIEW_TYPE_2D, or VK_IMAGE_VIEW_TYPE_3D; and subresourceRange.layerCount is VK_REMAINING_ARRAY_LAYERS, then the remaining number of layers must be 1" --- libavcodec/vulkan_decode.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c index 3b9576c0a9..c01eeb9cdc 100644 --- a/libavcodec/vulkan_decode.c +++ b/libavcodec/vulkan_decode.c @@ -113,11 +113,12 @@ int ff_vk_params_invalidate(AVCodecContext *avctx, int t, const uint8_t *b, uint return 0; } -static int vk_decode_create_view(FFVulkanDecodeShared *ctx, VkImageView *dst_view, +static int vk_decode_create_view(FFVulkanDecodeContext *dec, VkImageView *dst_view, VkImageAspectFlags *aspect, AVVkFrame *src, - VkFormat vkf) + VkFormat vkf, int is_current) { VkResult ret; + FFVulkanDecodeShared *ctx = dec->shared_ctx; FFVulkanFunctions *vk = &ctx->s.vkfn; VkImageAspectFlags aspect_mask = ff_vk_aspect_bits_from_vkfmt(vkf); @@ -128,7 +129,8 @@ static int vk_decode_create_view(FFVulkanDecodeShared *ctx, VkImageView *dst_vie VkImageViewCreateInfo img_view_create_info = { .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, .pNext = &yuv_sampler_info, - .viewType = VK_IMAGE_VIEW_TYPE_2D, + .viewType = dec->layered_dpb && !is_current ? + VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D, .format = vkf, .image = src->img[0], .components = (VkComponentMapping) { @@ -140,7 +142,8 @@ static int vk_decode_create_view(FFVulkanDecodeShared *ctx, VkImageView *dst_vie .subresourceRange = (VkImageSubresourceRange) { .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, .baseArrayLayer = 0, - .layerCount = VK_REMAINING_ARRAY_LAYERS, + .layerCount = dec->layered_dpb && !is_current ? + VK_REMAINING_ARRAY_LAYERS : 1, .levelCount = 1, }, }; @@ -203,10 +206,10 @@ int ff_vk_decode_prepare_frame(FFVulkanDecodeContext *dec, AVFrame *pic, if (!vkpic->dpb_frame) return AVERROR(ENOMEM); - err = vk_decode_create_view(ctx, &vkpic->img_view_ref, + err = vk_decode_create_view(dec, &vkpic->img_view_ref, &vkpic->img_aspect_ref, (AVVkFrame *)vkpic->dpb_frame->data[0], - dpb_hwfc->format[0]); + dpb_hwfc->format[0], is_current); if (err < 0) return err; @@ -217,10 +220,10 @@ int ff_vk_decode_prepare_frame(FFVulkanDecodeContext *dec, AVFrame *pic, AVHWFramesContext *frames = (AVHWFramesContext *)pic->hw_frames_ctx->data; AVVulkanFramesContext *hwfc = frames->hwctx; - err = vk_decode_create_view(ctx, &vkpic->img_view_out, + err = vk_decode_create_view(dec, &vkpic->img_view_out, &vkpic->img_aspect, (AVVkFrame *)pic->data[0], - hwfc->format[0]); + hwfc->format[0], is_current); if (err < 0) return err; @@ -1249,9 +1252,9 @@ int ff_vk_decode_init(AVCodecContext *avctx) goto fail; } - err = vk_decode_create_view(ctx, &ctx->layered_view, &ctx->layered_aspect, + err = vk_decode_create_view(dec, &ctx->layered_view, &ctx->layered_aspect, (AVVkFrame *)ctx->layered_frame->data[0], - s->hwfc->format[0]); + s->hwfc->format[0], 0); if (err < 0) goto fail; } -- 2.42.0 From patchwork Tue Oct 24 23:42:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 44352 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4999:b0:15d:8365:d4b8 with SMTP id fs25csp77913pzb; Tue, 24 Oct 2023 16:42:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IESumRszEgY7n7rEeZybDeldL9xpeDavXuF+/Hq+KJlocSX2rWklqIlGn2mvrOGWZ7IKNyC X-Received: by 2002:a17:907:360d:b0:9be:6ff7:1287 with SMTP id bk13-20020a170907360d00b009be6ff71287mr11562590ejc.57.1698190979198; Tue, 24 Oct 2023 16:42:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698190979; cv=none; d=google.com; s=arc-20160816; b=l9ZYPuq8vmjxn0haVWD+BZVdcJX3/0o3YC/MtCYXO704xfEWetRNmJiSCbiv40tZ+c SQLOX6LZqGIihylDBMzXY6roE8s4g9CkcmeqYTxSEA+ZOKkiiNOdt7gyXlmSR60COft5 k3HcLuzl7M4WxilIXv4utV6dXrLw+FsIJrf15UtR553Eg3bV6XUGg4idvNbBwjwfKxmy 0CQujK/KPag0TarhZBHRgtlGH7COnqNfvk0lHJ0R+XTygzETCZmf3VgJW5IsmAYjc9RB wsGTXUaQJFm6t5dZiTdnevxcti8ibHBoKUBewkWgSlBveFHDwAt4IyxIEQzcBZwOvNoX q+sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:to:from:date :dkim-signature:delivered-to; bh=EAtJBcjrAMFMSE9EF2lZp16h/XJQgkzfcTguU+UroI4=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=VcBkMyxulH95yHF9eQfKwsm5FYL86IYb9+gYh3FZ+R4bwgi4Egu3rhK885vkYIAifa OLJpTUxnGh3HUuGeCDTQr7N1LOa3rBwzoh1UleQXvQ21pR7JY6QGO729F/8WcoH7J7bN w1bCD6i1OgLyy/assVS5gmA3/H3PLiqz9ahHjbV3DCufflIxiIZFuzncYdfCtqwXD0ia Yz6OrenTKFLIDBc9CvFvrxownyMNIA8W/clrM7aid+xtpyVsO1LDJ0elDLdMo4etm5O0 aqMvo9Hiq3Q8sZhIca7fgcC9f6J6SE6UmjkiA/iuDgSzp6NfDN2Oinl3D0ZZHUWHbMUm ekMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=gUiWmSVb; 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=NONE dis=NONE) header.from=lynne.ee Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dc11-20020a170906c7cb00b009a18355fefbsi4735178ejb.925.2023.10.24.16.42.58; Tue, 24 Oct 2023 16:42:59 -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=@lynne.ee header.s=s1 header.b=gUiWmSVb; 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=NONE dis=NONE) header.from=lynne.ee Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4589768CA85; Wed, 25 Oct 2023 02:42:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C775568C7CC for ; Wed, 25 Oct 2023 02:42:49 +0300 (EEST) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id 8021110602E4 for ; Tue, 24 Oct 2023 23:42:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1698190969; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:References:Sender; bh=Dnshp2nxUaBigbPR1DnOCiSIeJ+JE/CYB90tGpcnAz4=; b=gUiWmSVbAiEOv5jIwYvnftFrhxhnCnyf7fACZXq3btz/Ttgipb1cvCN8NkewinR5 lK5Inxo3Bc3WEhXVtH41AHbXvTYFvNHXs6a6+iwtwrwxYG/+65YX10eZj+IKe8K9fAS /IKQN/NiAP515pCML41nWHFFAmrklyolu3XKyBnRnaFB3CgjSi2zTrJT4x1zFWJr/GL wPEk9/MNzZvYsEaBYPOqRcknankCBqqp9gJGlAGpBFzFWipfwqQ545R54sRLM18ANAF R7XGlUsAjx91IdX3WNpfkndrZQBEMdjKSimcWNYxDN53PeY0A75e3juJPNK6A5caeiO lqERVtc2ig== Date: Wed, 25 Oct 2023 01:42:49 +0200 (CEST) From: Lynne To: FFmpeg development discussions and patches Message-ID: In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] vulkan_decode: fix another validation issue 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cXx1ZtRcscN9 Surprising no one, the insane usage rule has a catch. Only happens in the layered_dpb path, which was poorly tested. Fixes: "[AVHWDeviceContext @ 0x557f4b87dc00] Validation Error: [ VUID-VkImageMemoryBarrier2-srcQueueFamilyIndex-07122 ] Object 0: handle = 0xaf31600000000ce, type = VK_OBJECT_TYPE_IMAGE; | MessageID = 0xfe471484 | vkCmdPipelineBarrier2(): pDependencyInfo->pImageMemoryBarriers[0].oldLayout (VK_IMAGE_LAYOUT_VIDEO_DECODE_DPB_KHR) is not compatible with VkImage 0xaf31600000000ce[] usage flags 0x405. The Vulkan spec states: If srcQueueFamilyIndex and dstQueueFamilyIndex define a queue family ownership transfer or oldLayout and newLayout define an image layout transition, and oldLayout or newLayout is VK_IMAGE_LAYOUT_VIDEO_DECODE_DPB_KHR then image must have been created with VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR (https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkImageMemoryBarrier2-srcQueueFamilyIndex-07122) " Patch attached. From 8594a95ca1c0819fdf7b04f57542787c5f574223 Mon Sep 17 00:00:00 2001 From: Lynne Date: Wed, 25 Oct 2023 01:32:20 +0200 Subject: [PATCH 2/2] vulkan_decode: fix another validation issue Surprising no one, the insane usage rule has a catch. --- libavcodec/vulkan_decode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c index c01eeb9cdc..7f575d1283 100644 --- a/libavcodec/vulkan_decode.c +++ b/libavcodec/vulkan_decode.c @@ -449,7 +449,8 @@ int ff_vk_decode_frame(AVCodecContext *avctx, .srcAccessMask = VK_ACCESS_2_NONE, .dstAccessMask = VK_ACCESS_2_VIDEO_DECODE_WRITE_BIT_KHR, .oldLayout = vkf->layout[0], - .newLayout = vp->dpb_frame ? VK_IMAGE_LAYOUT_VIDEO_DECODE_DST_KHR : + .newLayout = (dec->layered_dpb && vp->dpb_frame) ? + VK_IMAGE_LAYOUT_VIDEO_DECODE_DST_KHR : VK_IMAGE_LAYOUT_VIDEO_DECODE_DPB_KHR, /* Spec, 07252 utter madness */ .srcQueueFamilyIndex = vkf->queue_family[0], .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, -- 2.42.0