mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-22 17:51:16 +00:00
vkimagebufferpool: pass usage and memory properties
Pass, in config structure, usage and memory properties, assigning proper defaults if they aren't set. This parameters are used in image memory allocation. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
This commit is contained in:
parent
7b62c26139
commit
b1c166b53c
2 changed files with 48 additions and 12 deletions
|
@ -41,6 +41,8 @@ struct _GstVulkanImageBufferPoolPrivate
|
|||
GstCaps *caps;
|
||||
gboolean raw_caps;
|
||||
GstVideoInfo v_info;
|
||||
VkImageUsageFlags usage;
|
||||
VkMemoryPropertyFlags mem_props;
|
||||
};
|
||||
|
||||
static void gst_vulkan_image_buffer_pool_finalize (GObject * object);
|
||||
|
@ -56,6 +58,41 @@ G_DEFINE_TYPE_WITH_CODE (GstVulkanImageBufferPool, gst_vulkan_image_buffer_pool,
|
|||
GST_DEBUG_CATEGORY_INIT (GST_CAT_VULKAN_IMAGE_BUFFER_POOL,
|
||||
"vulkanimagebufferpool", 0, "Vulkan Image Buffer Pool"));
|
||||
|
||||
/**
|
||||
* gst_vulkan_image_buffer_pool_config_set_allocation_params:
|
||||
* @config: the #GstStructure with the pool's configuration.
|
||||
* @usage: The Vulkan image usage flags.
|
||||
* @mem_properties: Vulkan memory property flags.
|
||||
*
|
||||
* Sets the @usage and @mem_properties of the images to setup.
|
||||
*
|
||||
* Since: 1.24
|
||||
*/
|
||||
void
|
||||
gst_vulkan_image_buffer_pool_config_set_allocation_params (GstStructure *
|
||||
config, VkImageUsageFlags usage, VkMemoryPropertyFlags mem_properties)
|
||||
{
|
||||
/* assumption: G_TYPE_UINT is compatible with uint32_t (VkFlags) */
|
||||
gst_structure_set (config, "usage", G_TYPE_UINT, usage, "memory-properties",
|
||||
G_TYPE_UINT, mem_properties, NULL);
|
||||
}
|
||||
|
||||
static inline gboolean
|
||||
gst_vulkan_image_buffer_pool_config_get_allocation_params (GstStructure *
|
||||
config, VkImageUsageFlags * usage, VkMemoryPropertyFlags * mem_props)
|
||||
{
|
||||
if (!gst_structure_get_uint (config, "usage", usage)) {
|
||||
*usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT
|
||||
| VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT
|
||||
| VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT;
|
||||
}
|
||||
|
||||
if (!gst_structure_get_uint (config, "memory-properties", mem_props))
|
||||
*mem_props = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
gst_vulkan_image_buffer_pool_set_config (GstBufferPool * pool,
|
||||
GstStructure * config)
|
||||
|
@ -88,6 +125,9 @@ gst_vulkan_image_buffer_pool_set_config (GstBufferPool * pool,
|
|||
priv->raw_caps = features == NULL || gst_caps_features_is_equal (features,
|
||||
GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY);
|
||||
|
||||
gst_vulkan_image_buffer_pool_config_get_allocation_params (config,
|
||||
&priv->usage, &priv->mem_props);
|
||||
|
||||
/* get the size of the buffer to allocate */
|
||||
priv->v_info.size = 0;
|
||||
for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&priv->v_info); i++) {
|
||||
|
@ -104,11 +144,7 @@ gst_vulkan_image_buffer_pool_set_config (GstBufferPool * pool,
|
|||
|
||||
img_mem = (GstVulkanImageMemory *)
|
||||
gst_vulkan_image_memory_alloc (vk_pool->device, vk_format, width,
|
||||
height, tiling,
|
||||
VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT |
|
||||
VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT |
|
||||
VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT,
|
||||
VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
|
||||
height, tiling, priv->usage, priv->mem_props);
|
||||
|
||||
priv->v_info.offset[i] = priv->v_info.size;
|
||||
priv->v_info.size += img_mem->requirements.size;
|
||||
|
@ -165,13 +201,8 @@ gst_vulkan_image_buffer_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer,
|
|||
|
||||
mem = gst_vulkan_image_memory_alloc (vk_pool->device,
|
||||
vk_format, GST_VIDEO_INFO_COMP_WIDTH (&priv->v_info, i),
|
||||
GST_VIDEO_INFO_COMP_HEIGHT (&priv->v_info, i), tiling,
|
||||
/* FIXME: choose from outside */
|
||||
VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT |
|
||||
VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT |
|
||||
VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT,
|
||||
/* FIXME: choose from outside */
|
||||
VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
|
||||
GST_VIDEO_INFO_COMP_HEIGHT (&priv->v_info, i), tiling, priv->usage,
|
||||
priv->mem_props);
|
||||
if (!mem) {
|
||||
gst_buffer_unref (buf);
|
||||
goto mem_create_failed;
|
||||
|
|
|
@ -80,6 +80,11 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVulkanImageBufferPool, gst_object_unref);
|
|||
GST_VULKAN_API
|
||||
GstBufferPool *gst_vulkan_image_buffer_pool_new (GstVulkanDevice * device);
|
||||
|
||||
GST_VULKAN_API
|
||||
void gst_vulkan_image_buffer_pool_config_set_allocation_params (GstStructure * config,
|
||||
VkImageUsageFlags usage,
|
||||
VkMemoryPropertyFlags mem_properties);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GST_VULKAN_IMAGE_BUFFER_POOL_H__ */
|
||||
|
|
Loading…
Reference in a new issue