diff options
| author | Lynne <dev@lynne.ee> | 2024-08-09 13:36:01 +0200 |
|---|---|---|
| committer | Lynne <dev@lynne.ee> | 2024-08-11 05:13:15 +0200 |
| commit | 83cd77563fe008e34b70dcf1dd4d94c048dbf4fa (patch) | |
| tree | b455678d5b1c3a0f6a6cc8f3afc5f47005cf525a /libavutil/vulkan.c | |
| parent | 2ce0e51503d9178b190660ede8e716f6a134c2ec (diff) | |
| download | ffmpeg-83cd77563fe008e34b70dcf1dd4d94c048dbf4fa.tar.gz | |
vulkan: add support for encode feedback queries
Diffstat (limited to 'libavutil/vulkan.c')
| -rw-r--r-- | libavutil/vulkan.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c index 7b45e43a89..13344b7aed 100644 --- a/libavutil/vulkan.c +++ b/libavutil/vulkan.c @@ -281,6 +281,15 @@ int ff_vk_exec_pool_init(FFVulkanContext *s, FFVkQueueFamilyCtx *qf, VkCommandPoolCreateInfo cqueue_create; VkCommandBufferAllocateInfo cbuf_create; + const VkQueryPoolVideoEncodeFeedbackCreateInfoKHR *ef = NULL; + + if (query_type == VK_QUERY_TYPE_VIDEO_ENCODE_FEEDBACK_KHR) { + ef = ff_vk_find_struct(query_create_pnext, + VK_STRUCTURE_TYPE_QUERY_POOL_VIDEO_ENCODE_FEEDBACK_CREATE_INFO_KHR); + if (!ef) + return AVERROR(EINVAL); + } + /* Create command pool */ cqueue_create = (VkCommandPoolCreateInfo) { .sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, @@ -338,21 +347,18 @@ int ff_vk_exec_pool_init(FFVulkanContext *s, FFVkQueueFamilyCtx *qf, } pool->nb_queries = nb_queries; - pool->query_status_stride = 2; + pool->query_status_stride = 1 + 1; /* One result, one status by default */ pool->query_results = nb_queries; - pool->query_statuses = 0; /* if radv supports it, nb_queries; */ + pool->query_statuses = nb_queries; -#if 0 /* CONFIG_VULKAN_ENCODE */ /* Video encode quieries produce two results per query */ if (query_type == VK_QUERY_TYPE_VIDEO_ENCODE_FEEDBACK_KHR) { - pool->query_status_stride = 3; /* skip,skip,result,skip,skip,result */ - pool->query_results *= 2; - } else -#endif - if (query_type == VK_QUERY_TYPE_RESULT_STATUS_ONLY_KHR) { + int nb_results = av_popcount(ef->encodeFeedbackFlags); + pool->query_status_stride = nb_results + 1; + pool->query_results *= nb_results; + } else if (query_type == VK_QUERY_TYPE_RESULT_STATUS_ONLY_KHR) { pool->query_status_stride = 1; pool->query_results = 0; - pool->query_statuses = nb_queries; } pool->qd_size = (pool->query_results + pool->query_statuses)*(query_64bit ? 8 : 4); @@ -444,7 +450,7 @@ VkResult ff_vk_exec_get_query(FFVulkanContext *s, FFVkExecContext *e, e->query_idx, pool->nb_queries, pool->qd_size, e->query_data, - pool->query_64bit ? 8 : 4, qf); + pool->qd_size, qf); if (ret != VK_SUCCESS) return ret; |