mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 21:21:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

vulkanupload: honor downstream pool allocation parameters

Browse source 
If a downstream buffer pool is offered, vulkanupload checks its allocation
parameters to honor them. Only adds to usage the TRANSFER bits, which are
required to upload buffers.

Also, fail if the buffer pool cannot be configured with the current parameters.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7219>
This commit is contained in:
Víctor Manuel Jáquez Leal 2024-07-29 20:59:58 +02:00
parent baac191d13
commit ef9875640e
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
subprojects/gst-plugins-bad/ext/vulkan/vkupload.c
View file

@ -1354,10 +1354,13 @@ gst_vulkan_upload_decide_allocation (GstBaseTransform * bt, GstQuery * query)
GstStructure *config; GstStructure *config;
GstCaps *caps; GstCaps *caps;
guint min, max, size; guint min, max, size;
gboolean update_pool; gboolean update_pool, is_vulkan_pool;
const VkImageUsageFlags usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT VkImageUsageFlags usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT
| VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT
| VK_IMAGE_USAGE_STORAGE_BIT; | VK_IMAGE_USAGE_STORAGE_BIT;
VkImageLayout layout = VK_IMAGE_LAYOUT_UNDEFINED;
VkMemoryPropertyFlags mem_props = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
guint64 access = 0; /* VK_ACCESS_NONE */
gst_query_parse_allocation (query, &caps, NULL); gst_query_parse_allocation (query, &caps, NULL);
if (!caps) if (!caps)
@ -1367,6 +1370,7 @@ gst_vulkan_upload_decide_allocation (GstBaseTransform * bt, GstQuery * query)
gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max); gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
update_pool = TRUE; update_pool = TRUE;
is_vulkan_pool = GST_IS_VULKAN_IMAGE_BUFFER_POOL (pool);
} else { } else {
GstVideoInfo vinfo; GstVideoInfo vinfo;
@ -1374,10 +1378,10 @@ gst_vulkan_upload_decide_allocation (GstBaseTransform * bt, GstQuery * query)
gst_video_info_from_caps (&vinfo, caps); gst_video_info_from_caps (&vinfo, caps);
size = vinfo.size; size = vinfo.size;
min = max = 0; min = max = 0;
update_pool = FALSE; is_vulkan_pool = update_pool = FALSE;
} }
if (!pool || !GST_IS_VULKAN_IMAGE_BUFFER_POOL (pool)) { if (!pool || !is_vulkan_pool) {
if (pool) if (pool)
gst_object_unref (pool); gst_object_unref (pool);
pool = gst_vulkan_image_buffer_pool_new (vk_upload->device); pool = gst_vulkan_image_buffer_pool_new (vk_upload->device);
@ -1385,14 +1389,22 @@ gst_vulkan_upload_decide_allocation (GstBaseTransform * bt, GstQuery * query)
config = gst_buffer_pool_get_config (pool); config = gst_buffer_pool_get_config (pool);
if (is_vulkan_pool) {
gst_vulkan_image_buffer_pool_config_get_allocation_params (config, &usage,
&mem_props, &layout, &access);
/* these usage parameters are essential for upload */
usage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT;
}
gst_buffer_pool_config_set_params (config, caps, size, min, max); gst_buffer_pool_config_set_params (config, caps, size, min, max);
gst_vulkan_image_buffer_pool_config_set_allocation_params (config, usage, gst_vulkan_image_buffer_pool_config_set_allocation_params (config, usage,
VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, VK_IMAGE_LAYOUT_UNDEFINED, mem_props, layout, access);
0 /* VK_ACCESS_NONE */ );
if (!gst_buffer_pool_set_config (pool, config)) { if (!gst_buffer_pool_set_config (pool, config)) {
GST_ERROR_OBJECT (pool, "Vulkan Image buffer pool doesn't support requested"
" configuration");
gst_object_unref (pool); gst_object_unref (pool);
return TRUE; return FALSE;
} }
if (update_pool) if (update_pool)