From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id B110B4CB44 for <ffmpegdev@gitmailbox.com>; Thu, 13 Mar 2025 17:05:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B29B368E739; Thu, 13 Mar 2025 19:04:10 +0200 (EET) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A95B68E54D for <ffmpeg-devel@ffmpeg.org>; Thu, 13 Mar 2025 19:03:58 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; s=202405r; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1741885437; bh=rvzfX+pSXkqAJgXxtJ/n5uV Esrpuuod3TaX2KbhUwoo=; b=F1Fm2YMBH1S1/wZzRC7DXbGaJCncIWeOgrXS23CSgjaLS7lI/s pMq7MzxNKMOfR/A15zbp9LmdBM2sYtAWirYnJXpzwDNONU0/F9sNFLTJcXubfKxyQPuWVg+948I mCQIfHEQ+0RhUaqJBeEppmPTCfD23rxCx3oaxeiaFz33LqgNFmdeS0UBfS87tX8d2nCQNy0Kjgw 46Gv60cAKWL4eYUHY3X5gb9uEJ+Nfp3g305rhQeY60VKgsK5XXGycEyuchkS1KUFLR4wDQPQKIl DY2OojR5S/9pICPyYDxt+QnU1Mcfk3TkjU5nQ2R8J7zetixpUaAcUc9Y8Z9w26GnY6w==; DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1741885437; bh=rvzfX+pSXkqAJgXxtJ/n5uV Esrpuuod3TaX2KbhUwoo=; b=IuDAkX79+5PjSB8EVNccPgPraCTDeI76AWpSM0Ebzo83tHbwRP tJr1vTC1+TP3bmir/eQDoAxUUnErAeyCMLDw==; From: Lynne <dev@lynne.ee> To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Mar 2025 18:03:37 +0100 Message-ID: <20250313170355.92290-6-dev@lynne.ee> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250313170355.92290-1-dev@lynne.ee> References: <20250313170355.92290-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 05/16] hwcontext_vulkan: use the common host map function to map frame data 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: Lynne <dev@lynne.ee> 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> Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250313170355.92290-6-dev@lynne.ee/> List-Archive: <https://master.gitmailbox.com/ffmpegdev/> List-Post: <mailto:ffmpegdev@gitmailbox.com> --- libavutil/hwcontext_vulkan.c | 190 ++++++++++------------------------- 1 file changed, 54 insertions(+), 136 deletions(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index fcff34b5e2..1104e02cfd 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -4033,155 +4033,73 @@ static int get_plane_buf(AVHWFramesContext *hwfc, AVBufferRef **dst, return 0; } -static int create_mapped_buffer(AVHWFramesContext *hwfc, - FFVkBuffer *vkb, VkBufferUsageFlags usage, - size_t size, - VkExternalMemoryBufferCreateInfo *create_desc, - VkImportMemoryHostPointerInfoEXT *import_desc, - VkMemoryHostPointerPropertiesEXT props) -{ - int err; - VkResult ret; - VulkanDevicePriv *p = hwfc->device_ctx->hwctx; - FFVulkanFunctions *vk = &p->vkctx.vkfn; - AVVulkanDeviceContext *hwctx = &p->p; - - VkBufferCreateInfo buf_spawn = { - .sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO, - .pNext = create_desc, - .usage = usage, - .sharingMode = VK_SHARING_MODE_EXCLUSIVE, - .size = size, - }; - VkMemoryRequirements req = { - .size = size, - .alignment = p->hprops.minImportedHostPointerAlignment, - .memoryTypeBits = props.memoryTypeBits, - }; - - err = ff_vk_alloc_mem(&p->vkctx, &req, - VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, - import_desc, &vkb->flags, &vkb->mem); - if (err < 0) - return err; - - ret = vk->CreateBuffer(hwctx->act_dev, &buf_spawn, hwctx->alloc, &vkb->buf); - if (ret != VK_SUCCESS) { - vk->FreeMemory(hwctx->act_dev, vkb->mem, hwctx->alloc); - return AVERROR_EXTERNAL; - } - - ret = vk->BindBufferMemory(hwctx->act_dev, vkb->buf, vkb->mem, 0); - if (ret != VK_SUCCESS) { - vk->FreeMemory(hwctx->act_dev, vkb->mem, hwctx->alloc); - vk->DestroyBuffer(hwctx->act_dev, vkb->buf, hwctx->alloc); - return AVERROR_EXTERNAL; - } - - return 0; -} - -static void destroy_avvkbuf(void *opaque, uint8_t *data) -{ - FFVulkanContext *s = opaque; - FFVkBuffer *buf = (FFVkBuffer *)data; - ff_vk_free_buf(s, buf); - av_free(buf); -} - static int host_map_frame(AVHWFramesContext *hwfc, AVBufferRef **dst, int *nb_bufs, AVFrame *swf, VkBufferImageCopy *region, int upload) { int err; - VkResult ret; VulkanDevicePriv *p = hwfc->device_ctx->hwctx; - FFVulkanFunctions *vk = &p->vkctx.vkfn; - AVVulkanDeviceContext *hwctx = &p->p; + uint32_t p_w, p_h; + int nb_src_bufs = 0; const int planes = av_pix_fmt_count_planes(swf->format); - VkExternalMemoryBufferCreateInfo create_desc = { - .sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO, - .handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT, - }; - VkImportMemoryHostPointerInfoEXT import_desc = { - .sType = VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT, - .handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT, - }; - VkMemoryHostPointerPropertiesEXT props; - - for (int i = 0; i < planes; i++) { - FFVkBuffer *vkb; - uint32_t p_w, p_h; - size_t offs; - size_t buffer_size; - - /* We can't host map images with negative strides */ - if (swf->linesize[i] < 0) { - err = AVERROR(EINVAL); - goto fail; - } - - get_plane_wh(&p_w, &p_h, swf->format, swf->width, swf->height, i); - - /* Get the previous point at which mapping was possible and use it */ - offs = (uintptr_t)swf->data[i] % p->hprops.minImportedHostPointerAlignment; - import_desc.pHostPointer = swf->data[i] - offs; - - props = (VkMemoryHostPointerPropertiesEXT) { - VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT, - }; - ret = vk->GetMemoryHostPointerPropertiesEXT(hwctx->act_dev, - import_desc.handleType, - import_desc.pHostPointer, - &props); - if (!(ret == VK_SUCCESS && props.memoryTypeBits)) { - err = AVERROR(EINVAL); - goto fail; - } - - /* Buffer region for this plane */ - region[i] = (VkBufferImageCopy) { - .bufferOffset = offs, - .bufferRowLength = swf->linesize[i], - .bufferImageHeight = p_h, - .imageSubresource.layerCount = 1, - .imageExtent = (VkExtent3D){ p_w, p_h, 1 }, - /* Rest of the fields adjusted/filled in later */ - }; + /* We can't host map images with negative strides */ + for (int i = 0; i < planes; i++) + if (swf->linesize[i] < 0) + return AVERROR(EINVAL); - /* Add the offset at the start, which gets ignored */ - buffer_size = offs + swf->linesize[i]*p_h; - buffer_size = FFALIGN(buffer_size, p->props.properties.limits.minMemoryMapAlignment); - buffer_size = FFALIGN(buffer_size, p->hprops.minImportedHostPointerAlignment); + /* Count the number of buffers in the software frame */ + while (swf->buf[nb_src_bufs++]); - /* Create a buffer */ - vkb = av_mallocz(sizeof(*vkb)); - if (!vkb) { - err = AVERROR(ENOMEM); - goto fail; - } + /* Single buffer contains all planes */ + if (nb_src_bufs == 1) { + err = ff_vk_host_map_buffer(&p->vkctx, &dst[0], + swf->data[0], swf->buf[0], + upload ? VK_BUFFER_USAGE_TRANSFER_SRC_BIT : + VK_BUFFER_USAGE_TRANSFER_DST_BIT); + if (err < 0) + return err; + (*nb_bufs)++; - err = create_mapped_buffer(hwfc, vkb, - upload ? VK_BUFFER_USAGE_TRANSFER_SRC_BIT : - VK_BUFFER_USAGE_TRANSFER_DST_BIT, - buffer_size, &create_desc, &import_desc, - props); - if (err < 0) { - av_free(vkb); - goto fail; + for (int i = 0; i < planes; i++) { + get_plane_wh(&p_w, &p_h, swf->format, swf->width, swf->height, i); + + /* Buffer region for this plane */ + region[i] = (VkBufferImageCopy) { + .bufferOffset = ((FFVkBuffer *)dst[0]->data)->virtual_offset + + swf->data[i] - swf->data[0], + .bufferRowLength = swf->linesize[i], + .bufferImageHeight = p_h, + .imageSubresource.layerCount = 1, + .imageExtent = (VkExtent3D){ p_w, p_h, 1 }, + /* Rest of the fields adjusted/filled in later */ + }; } - - /* Create a ref */ - dst[*nb_bufs] = av_buffer_create((uint8_t *)vkb, sizeof(*vkb), - destroy_avvkbuf, &p->vkctx, 0); - if (!dst[*nb_bufs]) { - destroy_avvkbuf(&p->vkctx, (uint8_t *)vkb); - err = AVERROR(ENOMEM); - goto fail; + } else if (nb_src_bufs == planes) { /* One buffer per plane */ + for (int i = 0; i < planes; i++) { + err = ff_vk_host_map_buffer(&p->vkctx, &dst[i], + swf->data[i], swf->buf[i], + upload ? VK_BUFFER_USAGE_TRANSFER_SRC_BIT : + VK_BUFFER_USAGE_TRANSFER_DST_BIT); + if (err < 0) + goto fail; + (*nb_bufs)++; + + get_plane_wh(&p_w, &p_h, swf->format, swf->width, swf->height, i); + + /* Buffer region for this plane */ + region[i] = (VkBufferImageCopy) { + .bufferOffset = ((FFVkBuffer *)dst[i]->data)->virtual_offset, + .bufferRowLength = swf->linesize[i], + .bufferImageHeight = p_h, + .imageSubresource.layerCount = 1, + .imageExtent = (VkExtent3D){ p_w, p_h, 1 }, + /* Rest of the fields adjusted/filled in later */ + }; } - - (*nb_bufs)++; + } else { + /* Weird layout (3 planes, 2 buffers), patch welcome, fallback to copy */ + return AVERROR_PATCHWELCOME; } return 0; -- 2.47.2 _______________________________________________ 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".