From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id A17104DCD3
for <ffmpegdev@gitmailbox.com>; Wed, 4 Jun 2025 15:54:33 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id B924268D442;
Wed, 4 Jun 2025 18:54:09 +0300 (EEST)
Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101])
by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id D7BC168C50D
for <ffmpeg-devel@ffmpeg.org>; Wed, 4 Jun 2025 18:54:02 +0300 (EEST)
DKIM-Signature: v=1; a=rsa-sha256; s=202405r; d=lynne.ee; c=relaxed/relaxed;
h=Message-ID:Date:Subject:To:From; t=1749052442; bh=8aDz2WZIZzRBkyYbh+YTiTm
r2xLiIsslWIPl9iZ9w4s=; b=mQeeRUVx/LnfdE1M2qtwrmIWNfoyVPgGs0sudccsq6s9tTmr3/
NpJh9+izbImKFbspZcKVLFs1Vi0PFPZ+DNC5IkA0lq8wSD6Zn9hkUS2frHb/OnmsuQHoPQbWN0M
r0wVaxqe9uucXX1Dv1cdqUZJgBknu8R03UPVQi2m2A2u4NfJq6JUl0v+NUJv/E9qP+lEJ6aP6oD
PSraloXfYRS+3/Oxg9++6e4zkX0WB8qqa3w5yk6lQtqV1Eam0I75VhxHFRVilPqxkalYXl1JUM6
F4pq9/K0qGeWEhLAusevjWGv4ctAKCV8F7AkFRpEx5ygKu1lMAW0Ych8WvWIudP63pw==;
DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed;
h=Message-ID:Date:Subject:To:From; t=1749052442; bh=8aDz2WZIZzRBkyYbh+YTiTm
r2xLiIsslWIPl9iZ9w4s=; b=Q5toWfCr+JO5/d2QLzDOAqZVWC/jp/xvqsZz97lgtCKTRuZPkX
3U4Q8Iag5UpmvFLFlw7bSdMDPa/8JRr7WDCA==;
From: Lynne <dev@lynne.ee>
To: ffmpeg-devel@ffmpeg.org
Date: Thu, 5 Jun 2025 00:53:49 +0900
Message-ID: <20250604155355.1681074-3-dev@lynne.ee>
X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
In-Reply-To: <20250604155355.1681074-1-dev@lynne.ee>
References: <20250604155355.1681074-1-dev@lynne.ee>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v2 3/3] hwcontext_vulkan: add a setting to
limit queues
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/20250604155355.1681074-3-dev@lynne.ee/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
If its a problem, you'll likely want to set it to 1 than more fine-grained
control, which you can already do via the API.
---
libavutil/hwcontext_vulkan.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index 243d68dc44..2d3a95d263 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -143,6 +143,9 @@ typedef struct VulkanDevicePriv {
/* Disable multiplane images */
int disable_multiplane;
+ /* Maximum queues */
+ int limit_queues;
+
/* Nvidia */
int dev_is_nvidia;
} VulkanDevicePriv;
@@ -1509,13 +1512,18 @@ static int setup_queue_families(AVHWDeviceContext *ctx, VkDeviceCreateInfo *cd)
if (i == hwctx->nb_qf) { \
hwctx->qf[i].idx = idx; \
hwctx->qf[i].num = qf[idx].queueFamilyProperties.queueCount; \
- if (dprops.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY) { \
+ if (p->limit_queues || \
+ dprops.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY) { \
+ int max = p->limit_queues; \
if (type == VK_QUEUE_GRAPHICS_BIT) \
- hwctx->qf[i].num = FFMIN(hwctx->qf[i].num, 1); \
+ hwctx->qf[i].num = FFMIN(hwctx->qf[i].num, \
+ max ? max : 1); \
if (type == VK_QUEUE_COMPUTE_BIT) \
- hwctx->qf[i].num = FFMIN(hwctx->qf[i].num, 4); \
+ hwctx->qf[i].num = FFMIN(hwctx->qf[i].num, \
+ max ? max : 4); \
if (type == VK_QUEUE_TRANSFER_BIT) \
- hwctx->qf[i].num = FFMIN(hwctx->qf[i].num, 2); \
+ hwctx->qf[i].num = FFMIN(hwctx->qf[i].num, \
+ max ? max : 2); \
} \
hwctx->qf[i].flags = type; \
hwctx->qf[i].video_caps = vid_op; \
@@ -1722,6 +1730,11 @@ static int vulkan_device_create_internal(AVHWDeviceContext *ctx,
if (opt_d)
p->use_linear_images = strtol(opt_d->value, NULL, 10);
+ /* Limit queues to a given number if needed */
+ opt_d = av_dict_get(opts, "limit_queues", NULL, 0);
+ if (opt_d)
+ p->limit_queues = strtol(opt_d->value, NULL, 10);
+
/* The disable_multiplane argument takes precedent over the option */
p->disable_multiplane = disable_multiplane;
if (!p->disable_multiplane) {
--
2.49.0.395.g12beb8f557c
_______________________________________________
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".