mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 14:08:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

vkimagebufferpool: use gst_vulkan_image_memory_alloc_with_image_info()

Browse source 
As the pool will be only used for images with usage
VK_IMAGE_LAYOUT_VIDEO_DECODE_DST_KHR only one layer has to be allocated.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
This commit is contained in:
Víctor Manuel Jáquez Leal 2023-04-03 20:17:56 +02:00 committed by GStreamer Marge Bot
parent 83e73a2f59
commit c7c5dedd7f
1 changed files with 62 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkimagebufferpool.c
View file

@ -103,6 +103,7 @@ gst_vulkan_image_buffer_pool_set_config (GstBufferPool * pool,
GstVulkanImageBufferPoolPrivate *priv = GET_PRIV (vk_pool); GstVulkanImageBufferPoolPrivate *priv = GET_PRIV (vk_pool);
VkImageTiling tiling; VkImageTiling tiling;
VkImageUsageFlags supported_usage; VkImageUsageFlags supported_usage;
VkImageCreateInfo image_info;
guint min_buffers, max_buffers; guint min_buffers, max_buffers;
GstCaps *caps = NULL; GstCaps *caps = NULL;
GstCapsFeatures *features; GstCapsFeatures *features;
@ -146,6 +147,25 @@ gst_vulkan_image_buffer_pool_set_config (GstBufferPool * pool,
} }
/* get the size of the buffer to allocate */ /* get the size of the buffer to allocate */
/* *INDENT-OFF* */
image_info = (VkImageCreateInfo) {
.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
.pNext = NULL,
.flags = 0,
.imageType = VK_IMAGE_TYPE_2D,
/* .format = fill per image, */
/* .extent = fill per plane, */
.mipLevels = 1,
.arrayLayers = 1,
.samples = VK_SAMPLE_COUNT_1_BIT,
.tiling = tiling,
.usage = priv->usage,
.sharingMode = VK_SHARING_MODE_EXCLUSIVE,
.queueFamilyIndexCount = 0,
.pQueueFamilyIndices = NULL,
.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED,
};
/* *INDENT-ON* */
priv->v_info.size = 0; priv->v_info.size = 0;
for (i = 0; i < priv->n_imgs; i++) { for (i = 0; i < priv->n_imgs; i++) {
GstVulkanImageMemory *img_mem; GstVulkanImageMemory *img_mem;
@ -159,9 +179,16 @@ gst_vulkan_image_buffer_pool_set_config (GstBufferPool * pool,
height = GST_VIDEO_INFO_COMP_HEIGHT (&priv->v_info, i); height = GST_VIDEO_INFO_COMP_HEIGHT (&priv->v_info, i);
} }
image_info.format = priv->vk_fmts[i];
/* *INDENT-OFF* */
image_info.extent = (VkExtent3D) { width, height, 1 };
/* *INDENT-ON* */
img_mem = (GstVulkanImageMemory *) img_mem = (GstVulkanImageMemory *)
gst_vulkan_image_memory_alloc (vk_pool->device, priv->vk_fmts[i], width, gst_vulkan_image_memory_alloc_with_image_info (vk_pool->device,
height, tiling, priv->usage, priv->mem_props); &image_info, priv->mem_props);
if (!img_mem)
goto mem_create_failed;
priv->v_info.offset[i] = priv->v_info.size; priv->v_info.offset[i] = priv->v_info.size;
priv->v_info.size += img_mem->requirements.size; priv->v_info.size += img_mem->requirements.size;
@ -197,6 +224,11 @@ no_vk_format:
gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (&priv->v_info))); gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (&priv->v_info)));
return FALSE; return FALSE;
} }
mem_create_failed:
{
GST_WARNING_OBJECT (pool, "Could not create Vulkan Memory");
return FALSE;
}
} }
/* This function handles GstBuffer creation */ /* This function handles GstBuffer creation */
@ -208,10 +240,30 @@ gst_vulkan_image_buffer_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer,
GstVulkanImageBufferPoolPrivate *priv = GET_PRIV (vk_pool); GstVulkanImageBufferPoolPrivate *priv = GET_PRIV (vk_pool);
VkImageTiling tiling = VkImageTiling tiling =
priv->raw_caps ? VK_IMAGE_TILING_LINEAR : VK_IMAGE_TILING_OPTIMAL; priv->raw_caps ? VK_IMAGE_TILING_LINEAR : VK_IMAGE_TILING_OPTIMAL;
VkImageCreateInfo image_info;
GstBuffer *buf; GstBuffer *buf;
guint i; guint i;
/* *INDENT-OFF* */
image_info = (VkImageCreateInfo) {
.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
.pNext = NULL,
.flags = 0,
.imageType = VK_IMAGE_TYPE_2D,
/* .format = fill per image, */
/* .extent = fill per plane, */
.mipLevels = 1,
.arrayLayers = 1,
.samples = VK_SAMPLE_COUNT_1_BIT,
.tiling = tiling,
.usage = priv->usage,
.sharingMode = VK_SHARING_MODE_EXCLUSIVE,
.queueFamilyIndexCount = 0,
.pQueueFamilyIndices = NULL,
.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED,
};
/* *INDENT-ON* */
if (!(buf = gst_buffer_new ())) { if (!(buf = gst_buffer_new ())) {
goto no_buffer; goto no_buffer;
} }
@ -228,8 +280,13 @@ gst_vulkan_image_buffer_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer,
height = GST_VIDEO_INFO_COMP_HEIGHT (&priv->v_info, i); height = GST_VIDEO_INFO_COMP_HEIGHT (&priv->v_info, i);
} }
mem = gst_vulkan_image_memory_alloc (vk_pool->device, priv->vk_fmts[i], image_info.format = priv->vk_fmts[i];
width, height, tiling, priv->usage, priv->mem_props); /* *INDENT-OFF* */
image_info.extent = (VkExtent3D) { width, height, 1 };
/* *INDENT-ON* */
mem = gst_vulkan_image_memory_alloc_with_image_info (vk_pool->device,
&image_info, priv->mem_props);
if (!mem) { if (!mem) {
gst_buffer_unref (buf); gst_buffer_unref (buf);
goto mem_create_failed; goto mem_create_failed;