[FFmpeg-devel] Vulkan hwcontext and filters
Checks
| Context |
Check |
Description |
| andriy/ffmpeg-patchwork |
fail
|
Failed to apply patch
|
Commit Message
Patches attached
Also pushed to https://github.com/cyanreg/FFmpeg/ master branch because they're 9 and they add about 7000 lines.
Filtering won't work without a recent glslang version since they moved a header and broke API because they felt like it.
Git log:
commit aa9f0ea2cf210234ed26df349d3a1562b7de1110
Author: Philip Langdale <philipl@overt.org>
Date: Tue Dec 31 09:41:57 2019 -0800
lavu/hwcontext_cuda: refactor context initialisation
There's enough going on here now that it should not be duplicated
between cuda_device_create and cuda_device_derive.
commit bb734edb10b6f1853e1f2f5735b7ffd0a1d48468
Author: Lynne <dev@lynne.ee>
Date: Sun Oct 27 14:48:16 2019 +0000
lavfi: add an chromaber_vulkan filter
This commit adds a chromatic aberration filter for Vulkan that attempts to
emulate a lens chromatic aberration effect.
For a YUV frame it will instead shift the chroma channels, providing a
simple approximation.
commit 1e3a50fbe4399f76c0ab0f62bf6d6c65b8565db4
Author: Lynne <dev@lynne.ee>
Date: Sun Oct 27 14:47:18 2019 +0000
lavfi: add an avgblur_vulkan filter
This commit adds a fast avgblur Vulkan filter.
This will reset Intel GPUs on Windows due to a known, year-old driver bug.
commit f4c77d10e5e2c37ec1bf305773ec94898b99a5e5
Author: Lynne <dev@lynne.ee>
Date: Sun Oct 27 14:46:16 2019 +0000
lavfi: add an overlay_vulkan filter
This commit adds a basic, non-converting overlay filter for Vulkan.
commit 0badbf31effc16cf8f0be86f1de4fbdd029cebe4
Author: Lynne <dev@lynne.ee>
Date: Sun Oct 27 14:45:36 2019 +0000
lavfi: add an scale_vulkan filter
This commit adds a basic, non-converting Vulkan scaling filter.
commit 04c1836f89d89dcdc892cef66ee82afbcfda9f2d
Author: Lynne <dev@lynne.ee>
Date: Sun Oct 27 14:44:00 2019 +0000
lavfi: add Vulkan filtering framework
This commit adds a Vulkan filtering infrastructure for libavfilter.
It attempts to abstract as much as possible of the Vulkan API from filters.
The way the hwcontext and the framework are designed permits for parallel,
non-CPU-blocking filtering throughout, with the exception of up/downloading
and mapping.
commit e2d18e03e3a5fa8ef82159c68212b720198a9b91
Author: Philip Langdale <philipl@overt.org>
Date: Wed Oct 23 18:11:37 2019 -0700
lavfi/vf_hwupload: Add support for HW -> HW transfers
As we find ourselves wanting a way to transfer frames between
HW devices (or more realistically, between APIs on the same device),
it's desirable to have a way to describe the relationship. While
we could imagine introducing a `hwtransfer` filter, there is
almost no difference from `hwupload`. The main new feature we need
is a way to specify the target device. Having a single device
for the filter chain is obviously insufficient if we're dealing
with two devices.
So let's add a way to specify the upload target device, and if none
is specified, continue with the existing behaviour.
We must also correctly preserve the sw_format on such a transfer.
commit d5f1bbc61fab452803443511b1241931169359b7
Author: Lynne <dev@lynne.ee>
Date: Wed Aug 28 21:58:10 2019 +0100
lavu: add Vulkan hwcontext code
This commit adds the necessary code to initialize and use a Vulkan device
within the hwcontext libavutil framework.
Currently direct mapping to VAAPI and DRM frames is functional, and
transfers to CUDA and native frames are supported.
Lets hope the future Vulkan video decode extension fits well within this
framework.
commit 2fefb0b7ff760f2fb019751da8c37cfd0578ef00
Author: Philip Langdale <philipl@overt.org>
Date: Wed Oct 23 18:01:52 2019 -0700
lavu/hwcontext: Add support for HW -> HW transfers
We are beginning to consider scenarios where a given HW Context
may be able to transfer frames to another HW Context without
passing via system memory - this would usually be when two
contexts represent different APIs on the same device (eg: Vulkan
and CUDA).
This is modelled as a transfer, as we have today, but where both
the src and the dst are hardware frames with hw contexts. We need
to be careful to ensure the contexts are compatible - particularly,
we cannot do transfers where one of the frames has been mapped via
a derived frames context - we can only do transfers for frames that
were directly allocated by the specified context.
Additionally, as we have two hardware contexts, the transfer function
could be implemented by either (or indeed both). To handle this
uncertainty, we explicitly look for ENOSYS as an indicator to try
the transfer in the other direction before giving up.
Comments
On Fri, 10 Jan 2020 22:05:21 +0100 (CET)
Lynne <dev@lynne.ee> wrote:
> Patches attached
> Also pushed to https://github.com/cyanreg/FFmpeg/ master branch
> because they're 9 and they add about 7000 lines. Filtering won't work
> without a recent glslang version since they moved a header and broke
> API because they felt like it.
I'm obviously biased because I made some contributions to this effort,
but I think it is valuable functionality and gets us into a good
position to support GPU accelerated filters in a cross-vendor,
cross-platform fashion, as well as getting us into the right place to
handle the Vulkan video decode/encode API stuff that's coming down the
pipe.
--phil
On 10/01/2020 21:05, Lynne wrote:
> From d5f1bbc61fab452803443511b1241931169359b7 Mon Sep 17 00:00:00 2001
> From: Lynne <dev@lynne.ee>
> Date: Wed, 28 Aug 2019 21:58:10 +0100
> Subject: [PATCH 2/9] lavu: add Vulkan hwcontext code
>
> This commit adds the necessary code to initialize and use a Vulkan device
> within the hwcontext libavutil framework.
> Currently direct mapping to VAAPI and DRM frames is functional, and
> transfers to CUDA and native frames are supported.
>
> Lets hope the future Vulkan video decode extension fits well within this
> framework.
> ---
Yay!
> configure | 17 +-
> doc/APIchanges | 4 +
> libavutil/Makefile | 3 +
> libavutil/hwcontext.c | 4 +
> libavutil/hwcontext.h | 1 +
> libavutil/hwcontext_cuda.c | 121 ++
> libavutil/hwcontext_internal.h | 1 +
> libavutil/hwcontext_vulkan.c | 2804 ++++++++++++++++++++++++++++++++
> libavutil/hwcontext_vulkan.h | 152 ++
> libavutil/pixdesc.c | 4 +
> libavutil/pixfmt.h | 7 +
> 11 files changed, 3112 insertions(+), 6 deletions(-)
> create mode 100644 libavutil/hwcontext_vulkan.c
> create mode 100644 libavutil/hwcontext_vulkan.h
The CUDA parts look like they could be split off into a separate commit? (It's already huge.)
>
> diff --git a/configure b/configure
> index 46f2038627..3113ebfdd8 100755
> --- a/configure
> +++ b/configure
> @@ -309,6 +309,7 @@ External library support:
> --enable-openssl enable openssl, needed for https support
> if gnutls, libtls or mbedtls is not used [no]
> --enable-pocketsphinx enable PocketSphinx, needed for asr filter [no]
> + --enable-vulkan enable Vulkan code [no]
Alphabetical order.
> --disable-sndio disable sndio support [autodetect]
> --disable-schannel disable SChannel SSP, needed for TLS support on
> Windows if openssl and gnutls are not used [autodetect]
> @@ -1549,11 +1550,11 @@ require_cc(){
> }
>
> require_cpp(){
> - name="$1"
> - headers="$2"
> - classes="$3"
> - shift 3
> - check_lib_cpp "$headers" "$classes" "$@" || die "ERROR: $name not found"
> + log require_cpp "$@"
> + name_version="$1"
> + name="${1%% *}"
> + shift
> + check_lib_cpp "$name" "$@" || die "ERROR: $name_version not found"
> }
This change looks unrelated. (require_cpp isn't used in this patch at all.)
>
> require_headers(){
> @@ -1854,6 +1855,7 @@ HWACCEL_LIBRARY_LIST="
> mmal
> omx
> opencl
> + vulkan
> "
>
> DOCUMENT_LIST="
> @@ -3639,7 +3641,7 @@ avformat_deps="avcodec avutil"
> avformat_suggest="libm network zlib"
> avresample_deps="avutil"
> avresample_suggest="libm"
> -avutil_suggest="clock_gettime ffnvcodec libm libdrm libmfx opencl user32 vaapi videotoolbox corefoundation corevideo coremedia bcrypt"
> +avutil_suggest="clock_gettime ffnvcodec libm libdrm libmfx opencl user32 vaapi vulkan videotoolbox corefoundation corevideo coremedia bcrypt"
> postproc_deps="avutil gpl"
> postproc_suggest="libm"
> swresample_deps="avutil"
> @@ -6626,6 +6628,9 @@ enabled vdpau &&
>
> enabled crystalhd && check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd
>
> +enabled vulkan &&
> + require_pkg_config vulkan "vulkan >= 1.1.97" "vulkan/vulkan.h" vkCreateInstance
Presumably you have some specific requirement in mind which wants this version - can you note it somewhere? (Either here or in the commit message.)
> +
> if enabled x86; then
> case $target_os in
> mingw32*|mingw64*|win32|win64|linux|cygwin*)
> ...
> diff --git a/libavutil/hwcontext.h b/libavutil/hwcontext.h
> index f5a4b62387..f874af9f8f 100644
> --- a/libavutil/hwcontext.h
> +++ b/libavutil/hwcontext.h
> @@ -36,6 +36,7 @@ enum AVHWDeviceType {
> AV_HWDEVICE_TYPE_DRM,
> AV_HWDEVICE_TYPE_OPENCL,
> AV_HWDEVICE_TYPE_MEDIACODEC,
> + AV_HWDEVICE_TYPE_VULKAN,
> };
>
> typedef struct AVHWDeviceInternal AVHWDeviceInternal;
> diff --git a/libavutil/hwcontext_cuda.c b/libavutil/hwcontext_cuda.c
> index 30611b1912..18abb87bbd 100644
> --- a/libavutil/hwcontext_cuda.c
> +++ b/libavutil/hwcontext_cuda.c
> @@ -21,6 +21,9 @@
> #include "hwcontext.h"
> #include "hwcontext_internal.h"
> #include "hwcontext_cuda_internal.h"
> +#if CONFIG_VULKAN
> +#include "hwcontext_vulkan.h"
> +#endif
> #include "cuda_check.h"
> #include "mem.h"
> #include "pixdesc.h"
> @@ -42,6 +45,9 @@ static const enum AVPixelFormat supported_formats[] = {
> AV_PIX_FMT_YUV444P16,
> AV_PIX_FMT_0RGB32,
> AV_PIX_FMT_0BGR32,
> +#if CONFIG_VULKAN
> + AV_PIX_FMT_VULKAN,
> +#endif
Do all devices we can do CUDA on also support Vulkan? If not, this should probably filter it out in get_constraints() to avoid exposing something which can't possibly work.
> };
>
> #define CHECK_CU(x) FF_CUDA_CHECK_DL(device_ctx, cu, x)
> @@ -205,6 +211,10 @@ static int cuda_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst,
> CUcontext dummy;
> int i, ret;
>
> + /* We don't support transfers to HW devices. */
> + if (dst->hw_frames_ctx)
> + return AVERROR(ENOSYS);
> +
> ret = CHECK_CU(cu->cuCtxPushCurrent(hwctx->cuda_ctx));
> if (ret < 0)
> return ret;
> @@ -247,6 +257,10 @@ static int cuda_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst,
> CUcontext dummy;
> int i, ret;
>
> + /* We don't support transfers from HW devices. */
> + if (src->hw_frames_ctx)
> + return AVERROR(ENOSYS);
> +
> ret = CHECK_CU(cu->cuCtxPushCurrent(hwctx->cuda_ctx));
> if (ret < 0)
> return ret;
> @@ -389,6 +403,112 @@ error:
> return AVERROR_UNKNOWN;
> }
>
> +static int cuda_device_derive(AVHWDeviceContext *device_ctx,
> + AVHWDeviceContext *src_ctx,
> + int flags) {
> + AVCUDADeviceContext *hwctx = device_ctx->hwctx;
> + CudaFunctions *cu;
> + const char *src_uuid = NULL;
> + CUcontext dummy;
> + int ret, i, device_count, dev_active = 0;
> + unsigned int dev_flags = 0;
> +
> + const unsigned int desired_flags = CU_CTX_SCHED_BLOCKING_SYNC;
> +
> + switch (src_ctx->type) {
> +#if CONFIG_VULKAN
> + case AV_HWDEVICE_TYPE_VULKAN: {
> + AVVulkanDeviceContext *vkctx = src_ctx->hwctx;
> + src_uuid = vkctx->device_uuid;
> + break;
> + }
> +#endif
> + default:
> + return AVERROR(ENOSYS);
> + }
> +
> + if (!src_uuid) {
> + av_log(device_ctx, AV_LOG_ERROR,
> + "Failed to get UUID of source device.\n");
> + goto error;
> + }
> +
> + if (cuda_device_init(device_ctx) < 0)
> + goto error;
> +
> + cu = hwctx->internal->cuda_dl;
> +
> + ret = CHECK_CU(cu->cuInit(0));
> + if (ret < 0)
> + goto error;
> +
> + ret = CHECK_CU(cu->cuDeviceGetCount(&device_count));
> + if (ret < 0)
> + goto error;
> +
> + hwctx->internal->cuda_device = -1;
> + for (i = 0; i < device_count; i++) {
> + CUdevice dev;
> + CUuuid uuid;
> +
> + ret = CHECK_CU(cu->cuDeviceGet(&dev, i));
> + if (ret < 0)
> + goto error;
> +
> + ret = CHECK_CU(cu->cuDeviceGetUuid(&uuid, dev));
> + if (ret < 0)
> + goto error;
> +
> + if (memcmp(src_uuid, uuid.bytes, sizeof (uuid.bytes)) == 0) {
> + hwctx->internal->cuda_device = dev;
> + break;
> + }
> + }
> +
> + if (hwctx->internal->cuda_device == -1) {
> + av_log(device_ctx, AV_LOG_ERROR, "Could not derive CUDA device.\n");
This error is maybe more like "Can't find the matching CUDA device to the supplied Vulkan device".
> + goto error;
> + }
> +
> + hwctx->internal->flags = flags;
> +
> + if (flags & AV_CUDA_USE_PRIMARY_CONTEXT) {
> + ret = CHECK_CU(cu->cuDevicePrimaryCtxGetState(hwctx->internal->cuda_device, &dev_flags, &dev_active));
> + if (ret < 0)
> + goto error;
> +
> + if (dev_active && dev_flags != desired_flags) {
> + av_log(device_ctx, AV_LOG_ERROR, "Primary context already active with incompatible flags.\n");
> + goto error;
> + } else if (dev_flags != desired_flags) {
> + ret = CHECK_CU(cu->cuDevicePrimaryCtxSetFlags(hwctx->internal->cuda_device, desired_flags));
> + if (ret < 0)
> + goto error;
> + }
> +
> + ret = CHECK_CU(cu->cuDevicePrimaryCtxRetain(&hwctx->cuda_ctx, hwctx->internal->cuda_device));
> + if (ret < 0)
> + goto error;
> + } else {
> + ret = CHECK_CU(cu->cuCtxCreate(&hwctx->cuda_ctx, desired_flags, hwctx->internal->cuda_device));
> + if (ret < 0)
> + goto error;
> +
> + CHECK_CU(cu->cuCtxPopCurrent(&dummy));
> + }
> +
> + hwctx->internal->is_allocated = 1;
> +
> + // Setting stream to NULL will make functions automatically use the default CUstream
> + hwctx->stream = NULL;
> +
> + return 0;
> +
> +error:
> + cuda_device_uninit(device_ctx);
> + return AVERROR_UNKNOWN;
> +}
> +
> const HWContextType ff_hwcontext_type_cuda = {
> .type = AV_HWDEVICE_TYPE_CUDA,
> .name = "CUDA",
> @@ -397,6 +517,7 @@ const HWContextType ff_hwcontext_type_cuda = {
> .frames_priv_size = sizeof(CUDAFramesContext),
>
> .device_create = cuda_device_create,
> + .device_derive = cuda_device_derive,
> .device_init = cuda_device_init,
> .device_uninit = cuda_device_uninit,
> .frames_get_constraints = cuda_frames_get_constraints,
> ...
> diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
> new file mode 100644
> index 0000000000..d4eb8ffd35
> --- /dev/null
> +++ b/libavutil/hwcontext_vulkan.c
> @@ -0,0 +1,2804 @@
> ...
> +
> +static const struct {
> + enum AVPixelFormat pixfmt;
> + const VkFormat vkfmts[3];
> +} vk_pixfmt_map[] = {
> + { AV_PIX_FMT_GRAY8, { VK_FORMAT_R8_UNORM } },
> + { AV_PIX_FMT_GRAY16, { VK_FORMAT_R16_UNORM } },
> + { AV_PIX_FMT_GRAYF32, { VK_FORMAT_R32_SFLOAT } },
> +
> + { AV_PIX_FMT_NV12, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8G8_UNORM } },
> + { AV_PIX_FMT_P010, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16G16_UNORM } },
Is P010 still safe when the low bits might have any value?
> + { AV_PIX_FMT_P016, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16G16_UNORM } },
> +
> + { AV_PIX_FMT_YUV420P, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM } },
> + { AV_PIX_FMT_YUV422P, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM } },
> + { AV_PIX_FMT_YUV444P, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM } },
> +
> + { AV_PIX_FMT_YUV420P16, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
> + { AV_PIX_FMT_YUV422P16, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
> + { AV_PIX_FMT_YUV444P16, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
> +
> + { AV_PIX_FMT_ABGR, { VK_FORMAT_A8B8G8R8_UNORM_PACK32 } },
> + { AV_PIX_FMT_BGRA, { VK_FORMAT_B8G8R8A8_UNORM } },
> + { AV_PIX_FMT_RGBA, { VK_FORMAT_R8G8B8A8_UNORM } },
> + { AV_PIX_FMT_RGB24, { VK_FORMAT_R8G8B8_UNORM } },
> + { AV_PIX_FMT_BGR24, { VK_FORMAT_B8G8R8_UNORM } },
> + { AV_PIX_FMT_RGB48, { VK_FORMAT_R16G16B16_UNORM } },
> + { AV_PIX_FMT_RGBA64, { VK_FORMAT_R16G16B16A16_UNORM } },
> + { AV_PIX_FMT_RGB565, { VK_FORMAT_R5G6B5_UNORM_PACK16 } },
> + { AV_PIX_FMT_BGR565, { VK_FORMAT_B5G6R5_UNORM_PACK16 } },
> + { AV_PIX_FMT_BGR0, { VK_FORMAT_B8G8R8A8_UNORM } },
> + { AV_PIX_FMT_0BGR, { VK_FORMAT_A8B8G8R8_UNORM_PACK32 } },
> + { AV_PIX_FMT_RGB0, { VK_FORMAT_R8G8B8A8_UNORM } },
> +
> + { AV_PIX_FMT_GBRPF32, { VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32_SFLOAT } },
> +};
> +
> ...
> +static int check_extensions(AVHWDeviceContext *ctx, int dev,
> + const char * const **dst, uint32_t *num, int debug)
> +{
> + const char *tstr;
> + const char **extension_names = NULL;
> + VulkanDevicePriv *p = ctx->internal->priv;
> + AVVulkanDeviceContext *hwctx = ctx->hwctx;
> + int err = 0, found, extensions_found = 0;
> +
> + const char *mod;
> + int optional_exts_num;
> + uint32_t sup_ext_count;
> + VkExtensionProperties *sup_ext;
> + const VulkanOptExtension *optional_exts;
> +
> + if (!dev) {
> + mod = "instance";
> + optional_exts = optional_instance_exts;
> + optional_exts_num = FF_ARRAY_ELEMS(optional_instance_exts);
> + vkEnumerateInstanceExtensionProperties(NULL, &sup_ext_count, NULL);
> + sup_ext = av_malloc_array(sup_ext_count, sizeof(VkExtensionProperties));
> + if (!sup_ext)
> + return AVERROR(ENOMEM);
> + vkEnumerateInstanceExtensionProperties(NULL, &sup_ext_count, sup_ext);
> + } else {
> + mod = "device";
> + optional_exts = optional_device_exts;
> + optional_exts_num = FF_ARRAY_ELEMS(optional_device_exts);
> + vkEnumerateDeviceExtensionProperties(hwctx->phys_dev, NULL,
> + &sup_ext_count, NULL);
> + sup_ext = av_malloc_array(sup_ext_count, sizeof(VkExtensionProperties));
> + if (!sup_ext)
> + return AVERROR(ENOMEM);
> + vkEnumerateDeviceExtensionProperties(hwctx->phys_dev, NULL,
> + &sup_ext_count, sup_ext);
> + }
> +
> + for (int i = 0; i < optional_exts_num; i++) {
> + int req = optional_exts[i].flag & EXT_REQUIRED;
> + tstr = optional_exts[i].name;
> +
> + found = 0;
> + for (int j = 0; j < sup_ext_count; j++) {
> + if (!strcmp(tstr, sup_ext[j].extensionName)) {
> + found = 1;
> + break;
> + }
> + }
> + if (!found) {
> + int lvl = req ? AV_LOG_ERROR : AV_LOG_VERBOSE;
> + av_log(ctx, lvl, "Extension \"%s\" not found!\n", tstr);
> + if (req) {
> + err = AVERROR(EINVAL);
> + goto end;
> + }
> + continue;
> + }
> + if (!req)
> + p->extensions |= optional_exts[i].flag;
> +
> + av_log(ctx, AV_LOG_VERBOSE, "Using %s extension \"%s\"\n", mod, tstr);
> +
> + ADD_VAL_TO_LIST(extension_names, extensions_found, tstr);
> + }
> +
> + if (debug && !dev) {
> + tstr = VK_EXT_DEBUG_UTILS_EXTENSION_NAME;
> + found = 0;
> + for (int j = 0; j < sup_ext_count; j++) {
> + if (!strcmp(tstr, sup_ext[j].extensionName)) {
> + found = 1;
> + break;
> + }
> + }
> + if (found) {
> + ADD_VAL_TO_LIST(extension_names, extensions_found, tstr);
> + } else {
> + av_log(ctx, AV_LOG_ERROR, "Debug extension \"%s\" not found!\n",
> + tstr);
> + err = AVERROR(EINVAL);
> + goto end;
> + }
> + }
> +
> + *dst = extension_names;
> + *num = extensions_found;
> +
> +end:
> + av_free(sup_ext);
I think this leaks the extension_names array with some of the later failures.
> + return err;
> +}
> +
> ...
> +
> +typedef struct VulkanDeviceSelection {
> + uint8_t uuid[VK_UUID_SIZE]; /* Will use this first unless !has_uuid */
> + int has_uuid;
> + const char *name; /* Will use this second unless NULL */
> + uint32_t pci_device; /* Will use this second unless 0x0 */
> + uint32_t vendor_id; /* Last resort to find something deterministic */
> + int index; /* Finally fall back to index */
> +} VulkanDeviceSelection;
> +
> +static const char *vk_dev_type(enum VkPhysicalDeviceType type)
> +{
> + switch (type) {
> + case VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU: return "integrated";
> + case VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU: return "discrete";
> + case VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU: return "virtual";
> + case VK_PHYSICAL_DEVICE_TYPE_CPU: return "software";
> + default: return "unknown";
> + }
> +}
> +
> +/* Finds a device */
> +static int find_device(AVHWDeviceContext *ctx, VulkanDeviceSelection *select)
> +{
> ...
Yay, I like the improvement to the selection options :)
> +}
> +
> ...
> +
> +static void free_exec_ctx(AVHWDeviceContext *ctx, VulkanExecCtx *cmd)
> +{
> + AVVulkanDeviceContext *hwctx = ctx->hwctx;
> +
> + vkDestroyFence(hwctx->act_dev, cmd->fence, hwctx->alloc);
> +
> + if (cmd->buf)
> + vkFreeCommandBuffers(hwctx->act_dev, cmd->pool, 1, &cmd->buf);
> + if (cmd->pool)
> + vkDestroyCommandPool(hwctx->act_dev, cmd->pool, hwctx->alloc);
> +}
> +
> +static void vulkan_device_free(AVHWDeviceContext *ctx)
> +{
> + VulkanDevicePriv *p = ctx->internal->priv;
> + AVVulkanDeviceContext *hwctx = ctx->hwctx;
> +
> + free_exec_ctx(ctx, &p->cmd);
A device destroyed before it is fully created need not have a valid exec_ctx.
(E.g. "./ffmpeg_g -init_hw_device vulkan:123456789" segfaults here.)
> ...
> +
> +static int vulkan_device_init(AVHWDeviceContext *ctx)
> +{
> + int err;
> + uint32_t queue_num;
> + AVVulkanDeviceContext *hwctx = ctx->hwctx;
> + VulkanDevicePriv *p = ctx->internal->priv;
> +
> + vkGetPhysicalDeviceQueueFamilyProperties(hwctx->phys_dev, &queue_num, NULL);
> + if (!queue_num) {
> + av_log(ctx, AV_LOG_ERROR, "Failed to get queues!\n");
> + return AVERROR_EXTERNAL;
> + }
> +
> + if (hwctx->queue_family_index >= queue_num ||
> + hwctx->queue_family_tx_index >= queue_num ||
> + hwctx->queue_family_comp_index >= queue_num) {
> + av_log(ctx, AV_LOG_ERROR, "Invalid queue index!\n");
Maybe say the invalid indices.
> + return AVERROR_EXTERNAL;
I think this is EINVAL - the user supplied the invalid queue index.
> + }
> +
> + /* Create exec context - if there's something invalid this will error out */
> + err = create_exec_ctx(ctx, &p->cmd, hwctx->queue_family_tx_index);
> + if (err)
> + return err;
> +
> + /* Get device capabilities */
> + vkGetPhysicalDeviceMemoryProperties(hwctx->phys_dev, &p->mprops);
> +
> + return 0;
> +}
> +
> +static int vulkan_device_create(AVHWDeviceContext *ctx, const char *device,
> + AVDictionary *opts, int flags)
> +{
> + VulkanDeviceSelection dev_select = { 0 };
> + if (device && device[0]) {
> + char *end = NULL;
> + dev_select.index = strtol(device, &end, 10);
> + if (end == device) {
> + dev_select.index = 0;
> + dev_select.name = device;
> + }
> + }
Is it worth making uuid=f00 work here as well? (From opts rather than device: "-init_hw_device vulkan:,uuid=f00".)
> +
> + return vulkan_device_create_internal(ctx, &dev_select, opts, flags);
> +}
> +
> +static int vulkan_device_derive(AVHWDeviceContext *ctx,
> + AVHWDeviceContext *src_ctx, int flags)
> +{
> + av_unused VulkanDeviceSelection dev_select = { 0 };
> +
> + /* If there's only one device on the system, then even if its not covered
> + * by the following checks (e.g. non-PCIe ARM GPU), having an empty
> + * dev_select will mean it'll get picked. */
Kindof evil, but makes sense.
> + switch(src_ctx->type) {
> +#if CONFIG_LIBDRM
> +#if CONFIG_VAAPI
> + case AV_HWDEVICE_TYPE_VAAPI: {
> + AVVAAPIDeviceContext *src_hwctx = src_ctx->hwctx;
> +
> + const char *vendor = vaQueryVendorString(src_hwctx->display);
> + if (!vendor) {
> + av_log(ctx, AV_LOG_ERROR, "Unable to get device info from VAAPI!\n");
> + return AVERROR_EXTERNAL;
> + }
> +
> + if (strstr(vendor, "Intel"))
> + dev_select.vendor_id = 0x8086;
> + if (strstr(vendor, "AMD"))
> + dev_select.vendor_id = 0x1002;
Yuck, but I don't see a better way :(
I might look into adding something to libva to allow this to work properly, since this combination will happen.
> +
> + return vulkan_device_create_internal(ctx, &dev_select, NULL, flags);
> + }
> +#endif
> + case AV_HWDEVICE_TYPE_DRM: {
> + AVDRMDeviceContext *src_hwctx = src_ctx->hwctx;
> +
> + drmDevice *drm_dev_info;
> + int err = drmGetDevice(src_hwctx->fd, &drm_dev_info);
> + if (err) {
> + av_log(ctx, AV_LOG_ERROR, "Unable to get device info from DRM fd!\n");
> + return AVERROR_EXTERNAL;
> + }
> +
> + if (drm_dev_info->bustype == DRM_BUS_PCI)
> + dev_select.pci_device = drm_dev_info->deviceinfo.pci->device_id;
> +
> + drmFreeDevice(&drm_dev_info);
> +
> + return vulkan_device_create_internal(ctx, &dev_select, NULL, flags);
> + }
> +#endif
> +#if CONFIG_CUDA
> + case AV_HWDEVICE_TYPE_CUDA: {
> + AVHWDeviceContext *cuda_cu = src_ctx;
> + AVCUDADeviceContext *src_hwctx = src_ctx->hwctx;
> + AVCUDADeviceContextInternal *cu_internal = src_hwctx->internal;
> + CudaFunctions *cu = cu_internal->cuda_dl;
> +
> + int ret = CHECK_CU(cu->cuDeviceGetUuid((CUuuid *)&dev_select.uuid,
> + cu_internal->cuda_device));
> + if (ret < 0) {
> + av_log(ctx, AV_LOG_ERROR, "Unable to get UUID from CUDA!\n");
> + return AVERROR_EXTERNAL;
> + }
> +
> + dev_select.has_uuid = 1;
> +
> + return vulkan_device_create_internal(ctx, &dev_select, NULL, flags);
> + }
> +#endif
> + default:
> + return AVERROR(ENOSYS);
> + }
> +}
> +
> +static int vulkan_frames_get_constraints(AVHWDeviceContext *ctx,
> + const void *hwconfig,
> + AVHWFramesConstraints *constraints)
> +{
> + int count = 0;
> + AVVulkanDeviceContext *hwctx = ctx->hwctx;
> + VulkanDevicePriv *p = ctx->internal->priv;
> +
> + for (enum AVPixelFormat i = 0; i < AV_PIX_FMT_NB; i++)
> + count += pixfmt_is_supported(hwctx, i, p->use_linear_images);
> +
> +#if CONFIG_CUDA
> + count++;
I think you should be able to test whether a device supports CUDA here, so it isn't included for non-Nvidia devices?
> +#endif
> +
> + constraints->valid_sw_formats = av_malloc_array(count + 1,
> + sizeof(enum AVPixelFormat));
> + if (!constraints->valid_sw_formats)
> + return AVERROR(ENOMEM);
> +
> + count = 0;
> + for (enum AVPixelFormat i = 0; i < AV_PIX_FMT_NB; i++)
> + if (pixfmt_is_supported(hwctx, i, p->use_linear_images))
> + constraints->valid_sw_formats[count++] = i;
> +
> +#if CONFIG_CUDA
> + constraints->valid_sw_formats[count++] = AV_PIX_FMT_CUDA;
> +#endif
> + constraints->valid_sw_formats[count++] = AV_PIX_FMT_NONE;
> +
> + constraints->min_width = 0;
> + constraints->min_height = 0;
> + constraints->max_width = p->props.limits.maxImageDimension2D;
> + constraints->max_height = p->props.limits.maxImageDimension2D;
> +
> + constraints->valid_hw_formats = av_malloc_array(2, sizeof(enum AVPixelFormat));
> + if (!constraints->valid_hw_formats)
> + return AVERROR(ENOMEM);
> +
> + constraints->valid_hw_formats[0] = AV_PIX_FMT_VULKAN;
> + constraints->valid_hw_formats[1] = AV_PIX_FMT_NONE;
> +
> + return 0;
> +}
> +
> ...
> +
> +typedef struct VulkanFramesPriv {
> + VulkanExecCtx cmd;
> +} VulkanFramesPriv;
I think put this definition at the top so that it's easy to find what priv on a Vulkan HWFC is.
> ...
> +
> +static void vulkan_frame_free(void *opaque, uint8_t *data)
> +{
> + AVVkFrame *f = (AVVkFrame *)data;
> + AVHWFramesContext *hwfc = opaque;
> + AVVulkanDeviceContext *hwctx = hwfc->device_ctx->hwctx;
> + int planes = av_pix_fmt_count_planes(hwfc->sw_format);
> +
> + if (!f)
> + return;
When can you have !f? That seems invalid in an "assert that f is not null" type of way.
> +
> + vulkan_free_internal(f->internal);
> +
> + for (int i = 0; i < planes; i++) {
> + vkDestroyImage(hwctx->act_dev, f->img[i], hwctx->alloc);
> + vkFreeMemory(hwctx->act_dev, f->mem[i], hwctx->alloc);
> + vkDestroySemaphore(hwctx->act_dev, f->sem[i], hwctx->alloc);
> + }
> +
> + av_free(f);
> +}
> +
> ...
> +
> +static int vulkan_frames_init(AVHWFramesContext *hwfc)
> +{
> + int err;
> + AVVkFrame *f;
> + AVVulkanFramesContext *hwctx = hwfc->hwctx;
> + VulkanFramesPriv *fp = hwfc->internal->priv;
> + AVVulkanDeviceContext *dev_hwctx = hwfc->device_ctx->hwctx;
> + VulkanDevicePriv *p = hwfc->device_ctx->internal->priv;
> +
> + if (hwfc->pool)
> + return 0;
> +
> + /* Default pool flags */
> + hwctx->tiling = hwctx->tiling ? hwctx->tiling : p->use_linear_images ?
> + VK_IMAGE_TILING_LINEAR : VK_IMAGE_TILING_OPTIMAL;
> +
> + hwctx->usage |= DEFAULT_USAGE_FLAGS;
Is it possible that this disallows some use-cases in a device where those default flags need not be not supported? For example, some sort of magic image-writer like a video decoder where the output images can only ever be used as a source by non-magic operations. Baking that into the API (as in the comment on usage in the header) seems bad if so.
> +
> + err = create_exec_ctx(hwfc->device_ctx, &fp->cmd,
> + dev_hwctx->queue_family_tx_index);
> + if (err)
> + return err;
> +
> + /* Test to see if allocation will fail */
> + err = create_frame(hwfc, &f, hwctx->tiling, hwctx->usage,
> + hwctx->create_pnext);
> + if (err)
> + return err;
> +
> + vulkan_frame_free(hwfc, (uint8_t *)f);
> +
> + hwfc->internal->pool_internal = av_buffer_pool_init2(sizeof(AVVkFrame),
> + hwfc, vulkan_pool_alloc,
> + NULL);
> + if (!hwfc->internal->pool_internal)
> + return AVERROR(ENOMEM);
> +
> + return 0;
> +}
> +
> ...
> +
> +static const struct {
> + uint32_t va_fourcc;
va_fourcc?
> + VkFormat vk_format;
> +} vulkan_drm_format_map[] = {
> + { DRM_FORMAT_R8, VK_FORMAT_R8_UNORM },
> + { DRM_FORMAT_R16, VK_FORMAT_R16_UNORM },
> + { DRM_FORMAT_GR88, VK_FORMAT_R8G8_UNORM },
> + { DRM_FORMAT_RG88, VK_FORMAT_R8G8_UNORM },
> + { DRM_FORMAT_GR1616, VK_FORMAT_R16G16_UNORM },
> + { DRM_FORMAT_RG1616, VK_FORMAT_R16G16_UNORM },
Are RG88 and RG1616 right? I thought you would always want them reversed.
> + { DRM_FORMAT_ARGB8888, VK_FORMAT_B8G8R8A8_UNORM },
> + { DRM_FORMAT_XRGB8888, VK_FORMAT_B8G8R8A8_UNORM },
> + { DRM_FORMAT_ABGR8888, VK_FORMAT_R8G8B8A8_UNORM },
> + { DRM_FORMAT_XBGR8888, VK_FORMAT_R8G8B8A8_UNORM },
> +};
> +
> +static inline VkFormat drm_to_vulkan_fmt(uint32_t va_fourcc)
va_fourcc?
> +{
> + for (int i = 0; i < FF_ARRAY_ELEMS(vulkan_drm_format_map); i++)
> + if (vulkan_drm_format_map[i].va_fourcc == va_fourcc)
> + return vulkan_drm_format_map[i].vk_format;
> + return VK_FORMAT_UNDEFINED;
> +}
> +
> +static int vulkan_map_from_drm_frame_desc(AVHWFramesContext *hwfc, AVVkFrame **frame,
> + AVDRMFrameDescriptor *desc)
> +{
> + int err = 0;
> + VkResult ret;
> + AVVkFrame *f;
> + AVHWDeviceContext *ctx = hwfc->device_ctx;
> + AVVulkanDeviceContext *hwctx = ctx->hwctx;
> + VulkanDevicePriv *p = ctx->internal->priv;
> + const int planes = av_pix_fmt_count_planes(hwfc->sw_format);
> + const AVPixFmtDescriptor *fmt_desc = av_pix_fmt_desc_get(hwfc->sw_format);
> + const int has_modifiers = p->extensions & EXT_DRM_MODIFIER_FLAGS;
> + VkSubresourceLayout plane_data[AV_NUM_DATA_POINTERS];
> + VkBindImageMemoryInfo bind_info[AV_NUM_DATA_POINTERS];
> + VkExternalMemoryHandleTypeFlagBits htype = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT;
> +
> + VK_LOAD_PFN(hwctx->inst, vkGetMemoryFdPropertiesKHR);
> +
> + for (int i = 0; i < desc->nb_layers; i++) {
> + if (desc->layers[i].nb_planes > 1) {
> + av_log(ctx, AV_LOG_ERROR, "Cannot import DMABUFS with more than 1 "
> + "plane per layer!\n");
> + return AVERROR(EINVAL);
> + }
> +
> + if (drm_to_vulkan_fmt(desc->layers[i].format) == VK_FORMAT_UNDEFINED) {
> + av_log(ctx, AV_LOG_ERROR, "Unsupported DMABUF layer format!\n");
Maybe say what the unsupported format is for someone reporting the message, since this is probably relatively easy to hit (e.g. YUYV).
> + return AVERROR(EINVAL);
> + }
> + }
> +
> + if (!(f = av_mallocz(sizeof(*f)))) {
> + av_log(ctx, AV_LOG_ERROR, "Unable to allocate memory for AVVkFrame!\n");
> + err = AVERROR(ENOMEM);
> + goto fail;
> + }
> +
> + for (int i = 0; i < desc->nb_objects; i++) {
> + VkMemoryFdPropertiesKHR fdmp = {
> + .sType = VK_STRUCTURE_TYPE_MEMORY_FD_PROPERTIES_KHR,
> + };
> + VkMemoryRequirements req = {
> + .size = desc->objects[i].size,
> + };
> + VkImportMemoryFdInfoKHR idesc = {
> + .sType = VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR,
> + .handleType = htype,
> + .fd = desc->objects[i].fd,
> + };
> +
> + ret = pfn_vkGetMemoryFdPropertiesKHR(hwctx->act_dev, htype,
> + desc->objects[i].fd, &fdmp);
> + if (ret != VK_SUCCESS) {
> + av_log(hwfc, AV_LOG_ERROR, "Failed to get FD properties: %s\n",
> + vk_ret2str(ret));
> + err = AVERROR_EXTERNAL;
> + goto fail;
> + }
> +
> + req.memoryTypeBits = fdmp.memoryTypeBits;
> +
> + err = alloc_mem(ctx, &req, 0x0, &idesc, &f->flags, &f->mem[i]);
> + if (err)
> + return err;
> +
> + f->size[i] = desc->objects[i].size;
> + }
> +
> + f->tiling = has_modifiers ? VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT :
> + desc->objects[0].format_modifier == DRM_FORMAT_MOD_LINEAR ?
> + VK_IMAGE_TILING_LINEAR : VK_IMAGE_TILING_OPTIMAL;
> +
> + for (int i = 0; i < desc->nb_layers; i++) {
> + VkImageDrmFormatModifierExplicitCreateInfoEXT drm_info = {
> + .sType = VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_EXPLICIT_CREATE_INFO_EXT,
> + .drmFormatModifier = desc->objects[0].format_modifier,
> + .drmFormatModifierPlaneCount = desc->layers[i].nb_planes,
> + .pPlaneLayouts = (const VkSubresourceLayout *)&plane_data,
> + };
> +
> + VkExternalMemoryImageCreateInfo einfo = {
> + .sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO,
> + .pNext = has_modifiers ? &drm_info : NULL,
> + .handleTypes = htype,
> + };
> +
> + VkSemaphoreCreateInfo sem_spawn = {
> + .sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO,
> + };
> +
> + const int p_w = i > 0 ? AV_CEIL_RSHIFT(hwfc->width, fmt_desc->log2_chroma_w) : hwfc->width;
> + const int p_h = i > 0 ? AV_CEIL_RSHIFT(hwfc->height, fmt_desc->log2_chroma_h) : hwfc->height;
> +
> + VkImageCreateInfo image_create_info = {
> + .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
> + .pNext = &einfo,
> + .imageType = VK_IMAGE_TYPE_2D,
> + .format = drm_to_vulkan_fmt(desc->layers[i].format),
> + .extent.width = p_w,
> + .extent.height = p_h,
> + .extent.depth = 1,
> + .mipLevels = 1,
> + .arrayLayers = 1,
> + .flags = VK_IMAGE_CREATE_ALIAS_BIT,
> + .tiling = f->tiling,
> + .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED, /* specs say so */
> + .usage = DEFAULT_USAGE_FLAGS,
> + .sharingMode = VK_SHARING_MODE_EXCLUSIVE,
> + .samples = VK_SAMPLE_COUNT_1_BIT,
> + };
> +
> + for (int j = 0; j < desc->layers[i].nb_planes; j++) {
> + plane_data[j].offset = desc->layers[i].planes[j].offset;
> + plane_data[j].rowPitch = desc->layers[i].planes[j].pitch;
> + plane_data[j].size = 0; /* The specs say so for all 3 */
> + plane_data[j].arrayPitch = 0;
> + plane_data[j].depthPitch = 0;
> + }
> +
> + /* Create image */
> + ret = vkCreateImage(hwctx->act_dev, &image_create_info,
> + hwctx->alloc, &f->img[i]);
> + if (ret != VK_SUCCESS) {
> + av_log(ctx, AV_LOG_ERROR, "Image creation failure: %s\n",
> + vk_ret2str(ret));
> + err = AVERROR(EINVAL);
> + goto fail;
> + }
> +
> + ret = vkCreateSemaphore(hwctx->act_dev, &sem_spawn,
> + hwctx->alloc, &f->sem[i]);
> + if (ret != VK_SUCCESS) {
> + av_log(hwctx, AV_LOG_ERROR, "Failed to create semaphore: %s\n",
> + vk_ret2str(ret));
> + return AVERROR_EXTERNAL;
> + }
> +
> + /* We'd import a semaphore onto the one we created using
> + * vkImportSemaphoreFdKHR but unfortunately neither DRM nor VAAPI
> + * offer us anything we could import and sync with, so instead
> + * leave the semaphore unsignalled and enjoy the validation spam. */
I have some vague intent to look into this subject myself. VAAPI needs proper async, and interop with Vulkan is an important use of that.
> +
> + f->layout[i] = image_create_info.initialLayout;
> + f->access[i] = 0x0;
> +
> + /* TODO: Fix to support more than 1 plane per layer */
> + bind_info[i].sType = VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO;
> + bind_info[i].pNext = NULL;
> + bind_info[i].image = f->img[i];
> + bind_info[i].memory = f->mem[desc->layers[i].planes[0].object_index];
> + bind_info[i].memoryOffset = desc->layers[i].planes[0].offset;
> + }
> +
> + /* Bind the allocated memory to the images */
> + ret = vkBindImageMemory2(hwctx->act_dev, planes, bind_info);
> + if (ret != VK_SUCCESS) {
> + av_log(ctx, AV_LOG_ERROR, "Failed to bind memory: %s\n",
> + vk_ret2str(ret));
> + return AVERROR_EXTERNAL;
> + }
> +
> + *frame = f;
> +
> + return 0;
> +
> +fail:
> + for (int i = 0; i < planes; i++) {
> + vkDestroyImage(hwctx->act_dev, f->img[i], hwctx->alloc);
> + vkFreeMemory(hwctx->act_dev, f->mem[i], hwctx->alloc);
> + vkDestroySemaphore(hwctx->act_dev, f->sem[i], hwctx->alloc);
> + }
> +
> + av_free(f);
> +
> + return err;
> +}
> +
> ...
> +
> +static int vulkan_map_to_drm(AVHWFramesContext *hwfc, AVFrame *dst,
> + const AVFrame *src, int flags)
> +{
> + int err = 0;
> + VkResult ret;
> + AVVkFrame *f = (AVVkFrame *)src->data[0];
> + VulkanDevicePriv *p = hwfc->device_ctx->internal->priv;
> + AVVulkanDeviceContext *hwctx = hwfc->device_ctx->hwctx;
> + const int planes = av_pix_fmt_count_planes(hwfc->sw_format);
> + VK_LOAD_PFN(hwctx->inst, vkGetMemoryFdKHR);
> + VkImageDrmFormatModifierPropertiesEXT drm_mod = {
> + .sType = VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT,
> + };
Do you need a sync here for any writing being finished, or is it implicit somehow below?
> +
> + AVDRMFrameDescriptor *drm_desc = av_mallocz(sizeof(*drm_desc));
> + if (!drm_desc)
> + return AVERROR(ENOMEM);
> +
> + err = ff_hwframe_map_create(src->hw_frames_ctx, dst, src, &vulkan_unmap_to_drm, drm_desc);
> + if (err < 0)
> + goto end;
> +
> + if (p->extensions & EXT_DRM_MODIFIER_FLAGS) {
> + VK_LOAD_PFN(hwctx->inst, vkGetImageDrmFormatModifierPropertiesEXT);
> + ret = pfn_vkGetImageDrmFormatModifierPropertiesEXT(hwctx->act_dev, f->img[0],
> + &drm_mod);
> + if (ret != VK_SUCCESS) {
> + av_log(hwfc, AV_LOG_ERROR, "Failed to retrieve DRM format modifier!\n");
> + err = AVERROR_EXTERNAL;
> + goto end;
> + }
> + }
> +
> + for (int i = 0; (i < planes) && (f->mem[i]); i++) {
> + VkMemoryGetFdInfoKHR export_info = {
> + .sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR,
> + .memory = f->mem[i],
> + .handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
> + };
> +
> + ret = pfn_vkGetMemoryFdKHR(hwctx->act_dev, &export_info,
> + &drm_desc->objects[i].fd);
> + if (ret != VK_SUCCESS) {
> + av_log(hwfc, AV_LOG_ERROR, "Unable to export the image as a FD!\n");
> + err = AVERROR_EXTERNAL;
> + goto end;
> + }
> +
> + drm_desc->nb_objects++;
> + drm_desc->objects[i].size = f->size[i];
> + drm_desc->objects[i].format_modifier = drm_mod.drmFormatModifier;
> + }
> +
> + drm_desc->nb_layers = planes;
> + for (int i = 0; i < drm_desc->nb_layers; i++) {
> + VkSubresourceLayout layout;
> + VkImageSubresource sub = {
> + .aspectMask = p->extensions & EXT_DRM_MODIFIER_FLAGS ?
> + VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT :
> + VK_IMAGE_ASPECT_COLOR_BIT,
> + };
> + VkFormat plane_vkfmt = av_vkfmt_from_pixfmt(hwfc->sw_format)[i];
> +
> + drm_desc->layers[i].format = vulkan_fmt_to_drm(plane_vkfmt);
> + drm_desc->layers[i].nb_planes = 1;
> +
> + if (drm_desc->layers[i].format == DRM_FORMAT_INVALID) {
> + av_log(hwfc, AV_LOG_ERROR, "Cannot map to DRM layer, unsupported!\n");
> + err = AVERROR_PATCHWELCOME;
> + goto end;
> + }
> +
> + drm_desc->layers[i].planes[0].object_index = FFMIN(i, drm_desc->nb_objects - 1);
> +
> + if (f->tiling != VK_IMAGE_TILING_OPTIMAL)
> + continue;
> +
> + vkGetImageSubresourceLayout(hwctx->act_dev, f->img[i], &sub, &layout);
> + drm_desc->layers[i].planes[0].offset = layout.offset;
> + drm_desc->layers[i].planes[0].pitch = layout.rowPitch;
> + }
> +
> + dst->width = src->width;
> + dst->height = src->height;
> + dst->data[0] = (uint8_t *)drm_desc;
> +
> + av_log(hwfc, AV_LOG_VERBOSE, "Mapped AVVkFrame to a DRM object!\n");
> +
> + return 0;
> +
> +end:
> + av_free(drm_desc);
> + return err;
> +}
> +
> ...
> +
> +/* Technically we can use VK_EXT_external_memory_host to upload and download,
> + * however the alignment requirements make this unfeasible as both the pointer
> + * and the size of each plane need to be aligned to the minimum alignment
> + * requirement, which on all current implementations (anv, radv) is 4096.
> + * If the requirement gets relaxed (unlikely) this can easily be implemented. */
What does the pointer alignment requirement actually apply to?
(Could we lie about the start of the image by rounding to a page, and then do the transfer with an offset?)
> ...
> +
> +static int vulkan_transfer_data_to_mem(AVHWFramesContext *hwfc, AVFrame *dst,
> + const AVFrame *src)
> +{
> + int err = 0;
> + AVFrame tmp;
> + AVVkFrame *f = (AVVkFrame *)src->data[0];
> + AVHWDeviceContext *dev_ctx = hwfc->device_ctx;
> + ImageBuffer buf[AV_NUM_DATA_POINTERS] = { { 0 } };
> + const int planes = av_pix_fmt_count_planes(dst->format);
> + int log2_chroma = av_pix_fmt_desc_get(dst->format)->log2_chroma_h;
> +
> + if (dst->width > hwfc->width || dst->height > hwfc->height)
> + return AVERROR(EINVAL);
> +
> + /* For linear, host visiable images */
> + if (f->tiling == VK_IMAGE_TILING_LINEAR &&
> + f->flags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) {
Is it generally expected that this is actually faster than the next option? (Because evil uncached memory is a thing.)
> + AVFrame *map = av_frame_alloc();
> + if (!map)
> + return AVERROR(ENOMEM);
> + map->format = dst->format;
> +
> + err = vulkan_map_frame_to_mem(hwfc, map, src, AV_HWFRAME_MAP_READ);
> + if (err)
> + return err;
> +
> + err = av_frame_copy(dst, map);
> + av_frame_free(&map);
> + return err;
> + }
> +
> + /* Create buffers */
> + for (int i = 0; i < planes; i++) {
> + int h = dst->height;
> + int p_height = i > 0 ? AV_CEIL_RSHIFT(h, log2_chroma) : h;
> +
> + tmp.linesize[i] = dst->linesize[i];
> + err = create_buf(dev_ctx, &buf[i], p_height,
> + &tmp.linesize[i], VK_BUFFER_USAGE_TRANSFER_DST_BIT,
> + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, NULL, NULL);
> + }
> +
> + /* Copy image to buffer */
> + if ((err = transfer_image_buf(dev_ctx, f, buf, tmp.linesize,
> + dst->width, dst->height, dst->format, 1)))
> + goto end;
> +
> + /* Map, copy buffer to frame, unmap */
> + if ((err = map_buffers(dev_ctx, buf, tmp.data, planes, 1)))
> + goto end;
> +
> + av_image_copy(dst->data, dst->linesize, (const uint8_t **)tmp.data,
> + tmp.linesize, dst->format, dst->width, dst->height);
> +
> + err = unmap_buffers(dev_ctx, buf, planes, 0);
> +
> +end:
> + for (int i = 0; i < planes; i++)
> + free_buf(dev_ctx, &buf[i]);
> +
> + return err;
> +}
> ...
> diff --git a/libavutil/hwcontext_vulkan.h b/libavutil/hwcontext_vulkan.h
> new file mode 100644
> index 0000000000..4146f14d6e
> --- /dev/null
> +++ b/libavutil/hwcontext_vulkan.h
> @@ -0,0 +1,152 @@
> +/*
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> +#ifndef AVUTIL_HWCONTEXT_VULKAN_H
> +#define AVUTIL_HWCONTEXT_VULKAN_H
> +
> +#include <vulkan/vulkan.h>
> +
> +/**
> + * @file
> + * API-specific header for AV_HWDEVICE_TYPE_VULKAN.
> + *
> + * For user-allocated pools, AVHWFramesContext.pool must return AVBufferRefs
> + * with the data pointer set to an AVVkFrame.
> + */
> +
> +/**
> + * Main Vulkan context, allocated as AVHWDeviceContext.hwctx.
> + * All of these can be set before init to change what the context uses
> + */
> +typedef struct AVVulkanDeviceContext {
> + /**
> + * Custom memory allocator, else NULL
> + */
> + const VkAllocationCallbacks *alloc;
Do you have some specific use-case in mind for this? (You haven't used it in anything so far.)
> + /**
> + * Instance
> + */
> + VkInstance inst;
> + /**
> + * Physical device
> + */
> + VkPhysicalDevice phys_dev;
> + /**
> + * Activated physical device
> + */
> + VkDevice act_dev;
I weakly argue for not abbreviating names in the public API like this (but feel free to ignore me).
> + /**
> + * Queue family index for graphics
> + */
> + int queue_family_index;
> + /**
> + * Queue family index for transfer ops only. By default, the priority order
> + * is dedicated transfer > dedicated compute > graphics.
> + */
> + int queue_family_tx_index;
In my experience "tx" is always short for "transmit", not for "transfer".
> + /**
> + * Queue family index for compute ops. Will be equal to the graphics
> + * one unless a dedicated transfer queue is found.
> + */
> + int queue_family_comp_index;
> + /**
> + * The UUID of the selected physical device.
> + */
> + uint8_t device_uuid[VK_UUID_SIZE];
> +} AVVulkanDeviceContext;
> +
> +/**
> + * Allocated as AVHWFramesContext.hwctx, used to set pool-specific options
> + */
> +typedef struct AVVulkanFramesContext {
> + /**
> + * Controls the tiling of output frames.
> + */
> + VkImageTiling tiling;
> + /**
> + * Defines extra usage of output frames. This is bitwise OR'd with the
> + * standard usage flags (SAMPLED, STORAGE, TRANSFER_SRC and TRANSFER_DST).
(Referred to somewhere above.)
> + */
> + VkImageUsageFlagBits usage;
> + /**
> + * Extension data for image creation. By default, if the extension is
> + * available, this will be chained to a VkImageFormatListCreateInfoKHR.
> + */
> + void *create_pnext;
> + /**
> + * Extension data for memory allocation. Must have as many entries as
> + * the number of planes of the sw_format.
> + * This will be chained to VkExportMemoryAllocateInfo, which is used
> + * to make all pool images exportable to other APIs.
> + */
> + void *alloc_pnext[AV_NUM_DATA_POINTERS];
> +} AVVulkanFramesContext;
> +
> +/*
> + * Frame structure, the VkFormat of the image will always match
> + * the pool's sw_format.
> + * All frames, imported or allocated, will be created with the
> + * VK_IMAGE_CREATE_ALIAS_BIT flag set, so the memory may be aliased if needed.
> + */
> +typedef struct AVVkFrame {
> + /**
> + * Vulkan images to which the memory is bound to.
> + */
> + VkImage img[AV_NUM_DATA_POINTERS];
> +
> + /**
> + * Same tiling must be used for all images.
> + */
> + VkImageTiling tiling;
> +
> + /**
> + * Memory backing the images. Could be less than the amount of images
> + * if importing from a DRM or VAAPI frame.
Or absent entirely?
> + */
> + VkDeviceMemory mem[AV_NUM_DATA_POINTERS];
> + size_t size[AV_NUM_DATA_POINTERS];
> +
> + /**
> + * OR'd flags for all memory allocated
> + */
> + VkMemoryPropertyFlagBits flags;
> +
> + /**
> + * Updated after every barrier
> + */
> + VkAccessFlagBits access[AV_NUM_DATA_POINTERS];
> + VkImageLayout layout[AV_NUM_DATA_POINTERS];
> +
> + /**
> + * Per-image semaphores. Must not be freed manually. Must be waited on
> + * and signalled at every queue submission.
Perhaps a little more explanation of exactly what is needed on reads/writes would be helpful here. As written it sounds like multiple readers must be serialised by it, which I'm not sure is intended.
> + */
> + VkSemaphore sem[AV_NUM_DATA_POINTERS];
> +
> + /**
> + * Internal data.
> + */
> + struct AVVkFrameInternal *internal;
> +} AVVkFrame;
> +
> +/**
> + * Returns the format of each image up to the number of planes for a given sw_format.
> + */
> +const VkFormat *av_vkfmt_from_pixfmt(enum AVPixelFormat p);
> +
> +#endif /* AVUTIL_HWCONTEXT_VULKAN_H */
> ...
> diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
> index 37ecebd501..5640c9f23d 100644
> --- a/libavutil/pixfmt.h
> +++ b/libavutil/pixfmt.h
> @@ -348,6 +348,13 @@ enum AVPixelFormat {
> AV_PIX_FMT_NV24, ///< planar YUV 4:4:4, 24bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
> AV_PIX_FMT_NV42, ///< as above, but U and V bytes are swapped
>
> + /**
> + * Vulkan hardware images.
> + *
> + * data[0] contain an AVVkFrame
points to an AVVkFrame?
> + */
> + AV_PIX_FMT_VULKAN,
> +
> AV_PIX_FMT_NB ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
> };
>
> --
> 2.25.0.rc2
>
Thanks,
- Mark
On 10/01/2020 21:05, Lynne wrote:
> From 2fefb0b7ff760f2fb019751da8c37cfd0578ef00 Mon Sep 17 00:00:00 2001
> From: Philip Langdale <philipl@overt.org>
> Date: Wed, 23 Oct 2019 18:01:52 -0700
> Subject: [PATCH 1/9] lavu/hwcontext: Add support for HW -> HW transfers
>
> We are beginning to consider scenarios where a given HW Context
> may be able to transfer frames to another HW Context without
> passing via system memory - this would usually be when two
> contexts represent different APIs on the same device (eg: Vulkan
> and CUDA).
>
> This is modelled as a transfer, as we have today, but where both
> the src and the dst are hardware frames with hw contexts. We need
> to be careful to ensure the contexts are compatible - particularly,
> we cannot do transfers where one of the frames has been mapped via
> a derived frames context - we can only do transfers for frames that
> were directly allocated by the specified context.
Why? A derived frames context should be mostly treatable as a normal frames context in the mapped-to device, so I'm not seeing where this restriction is coming from.
(Is there some particular case which doesn't work that this helps to avoid?)
>
> Additionally, as we have two hardware contexts, the transfer function
> could be implemented by either (or indeed both). To handle this
> uncertainty, we explicitly look for ENOSYS as an indicator to try
> the transfer in the other direction before giving up.
> ---
> libavutil/hwcontext.c | 53 +++++++++++++++++++++++++++++++++++--------
> 1 file changed, 43 insertions(+), 10 deletions(-)
>
> diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c
> index f1e404ab20..3189391c07 100644
> --- a/libavutil/hwcontext.c
> +++ b/libavutil/hwcontext.c
> @@ -444,21 +444,54 @@ int av_hwframe_transfer_data(AVFrame *dst, const AVFrame *src, int flags)
> if (!dst->buf[0])
> return transfer_data_alloc(dst, src, flags);
>
> - if (src->hw_frames_ctx) {
> - ctx = (AVHWFramesContext*)src->hw_frames_ctx->data;
> + /*
> + * Hardware -> Hardware Transfer.
> + * Unlike Software -> Hardware or Hardware -> Software, the transfer
> + * function could be provided by either the src or dst, depending on
> + * the specific combination of hardware.
> + */
> + if (src->hw_frames_ctx && dst->hw_frames_ctx) {
> + AVHWFramesContext *src_ctx =
> + (AVHWFramesContext*)src->hw_frames_ctx->data;
> + AVHWFramesContext *dst_ctx =
> + (AVHWFramesContext*)dst->hw_frames_ctx->data;
> +
> + if (src_ctx->internal->source_frames) {
> + av_log(src_ctx, AV_LOG_ERROR,
> + "A device with a derived frame context cannot be used as "
> + "the source of a HW -> HW transfer.");
> + return AVERROR(ENOSYS);
> + }
>
> - ret = ctx->internal->hw_type->transfer_data_from(ctx, dst, src);
> - if (ret < 0)
> - return ret;
> - } else if (dst->hw_frames_ctx) {
> - ctx = (AVHWFramesContext*)dst->hw_frames_ctx->data;
> + if (dst_ctx->internal->source_frames) {
> + av_log(src_ctx, AV_LOG_ERROR,
> + "A device with a derived frame context cannot be used as "
> + "the destination of a HW -> HW transfer.");
> + return AVERROR(ENOSYS);
> + }
>
> - ret = ctx->internal->hw_type->transfer_data_to(ctx, dst, src);
> + ret = src_ctx->internal->hw_type->transfer_data_from(src_ctx, dst, src);
> + if (ret == AVERROR(ENOSYS))
> + ret = dst_ctx->internal->hw_type->transfer_data_to(dst_ctx, dst, src);
> if (ret < 0)
> return ret;
> - } else
> - return AVERROR(ENOSYS);
> + } else {
> + if (src->hw_frames_ctx) {
> + ctx = (AVHWFramesContext*)src->hw_frames_ctx->data;
> +
> + ret = ctx->internal->hw_type->transfer_data_from(ctx, dst, src);
> + if (ret < 0)
> + return ret;
> + } else if (dst->hw_frames_ctx) {
> + ctx = (AVHWFramesContext*)dst->hw_frames_ctx->data;
>
> + ret = ctx->internal->hw_type->transfer_data_to(ctx, dst, src);
> + if (ret < 0)
> + return ret;
> + } else {
> + return AVERROR(ENOSYS);
> + }
> + }
> return 0;
> }
>
> --
> 2.25.0.rc2
>
This looks fine with the intent of the extra condition clarified.
Thanks,
- Mark
On 10/01/2020 21:05, Lynne wrote:
> From e2d18e03e3a5fa8ef82159c68212b720198a9b91 Mon Sep 17 00:00:00 2001
> From: Philip Langdale <philipl@overt.org>
> Date: Wed, 23 Oct 2019 18:11:37 -0700
> Subject: [PATCH 3/9] lavfi/vf_hwupload: Add support for HW -> HW transfers
>
> As we find ourselves wanting a way to transfer frames between
> HW devices (or more realistically, between APIs on the same device),
> it's desirable to have a way to describe the relationship. While
> we could imagine introducing a `hwtransfer` filter, there is
> almost no difference from `hwupload`. The main new feature we need
> is a way to specify the target device. Having a single device
> for the filter chain is obviously insufficient if we're dealing
> with two devices.
>
> So let's add a way to specify the upload target device, and if none
> is specified, continue with the existing behaviour.
>
> We must also correctly preserve the sw_format on such a transfer.
> ---
> doc/filters.texi | 13 ++++++++-
> libavfilter/vf_hwupload.c | 51 +++++++++++++++++++++++++---------
> libavfilter/vf_hwupload_cuda.c | 10 ++++++-
> 3 files changed, 59 insertions(+), 15 deletions(-)
>
> diff --git a/doc/filters.texi b/doc/filters.texi
> index 6fb660b05a..d0a564c8e7 100644
> --- a/doc/filters.texi
> +++ b/doc/filters.texi
> @@ -11938,7 +11938,18 @@ Upload system memory frames to hardware surfaces.
>
> The device to upload to must be supplied when the filter is initialised. If
> using ffmpeg, select the appropriate device with the @option{-filter_hw_device}
> -option.
> +option or with the @option{derive_device} option. The input and output devices
> +must be of different types and compatible - the exact meaning of this is
> +system-dependent, but typically it means that they must refer to the same
> +underlying hardware context (for example, refer to the same graphics card).
> +
> +The following additional parameters are accepted:
> +
> +@table @option
> +@item derive_device @var{type}
> +Rather than using the device supplied at initialisation, instead derive a new
> +device of type @var{type} from the device the input frames exist on.
> +@end table
Maybe make it a bit clearer that this can only apply to device-to-device transfers?
>
> @anchor{hwupload_cuda}
> @section hwupload_cuda
> diff --git a/libavfilter/vf_hwupload.c b/libavfilter/vf_hwupload.c
> index 50bc7e10f6..7c5dd497b0 100644
> --- a/libavfilter/vf_hwupload.c
> +++ b/libavfilter/vf_hwupload.c
> @@ -32,10 +32,11 @@ typedef struct HWUploadContext {
> const AVClass *class;
>
> AVBufferRef *hwdevice_ref;
> - AVHWDeviceContext *hwdevice;
>
> AVBufferRef *hwframes_ref;
> AVHWFramesContext *hwframes;
> +
> + char *device_type;
> } HWUploadContext;
>
> static int hwupload_query_formats(AVFilterContext *avctx)
> @@ -46,17 +47,27 @@ static int hwupload_query_formats(AVFilterContext *avctx)
> AVFilterFormats *input_formats = NULL;
> int err, i;
>
> - if (!avctx->hw_device_ctx) {
> + if (ctx->hwdevice_ref) {
> + /* We already have a specified device. */
> + } else if (avctx->hw_device_ctx) {
> + if (ctx->device_type) {
> + err = av_hwdevice_ctx_create_derived(
> + &ctx->hwdevice_ref,
> + av_hwdevice_find_type_by_name(ctx->device_type),
> + avctx->hw_device_ctx, 0);
> + if (err < 0)
Add an error message here to say that the derivation went wrong so the user knows what to check.
> + return err;
> + } else {
> + ctx->hwdevice_ref = av_buffer_ref(avctx->hw_device_ctx);
> + if (!ctx->hwdevice_ref)
> + return AVERROR(ENOMEM);
> + }
> + } else {
> av_log(ctx, AV_LOG_ERROR, "A hardware device reference is required "
> "to upload frames to.\n");
> return AVERROR(EINVAL);
> }
>
> - ctx->hwdevice_ref = av_buffer_ref(avctx->hw_device_ctx);
> - if (!ctx->hwdevice_ref)
> - return AVERROR(ENOMEM);
> - ctx->hwdevice = (AVHWDeviceContext*)ctx->hwdevice_ref->data;
> -
> constraints = av_hwdevice_get_hwframe_constraints(ctx->hwdevice_ref, NULL);
> if (!constraints) {
> err = AVERROR(EINVAL);
> @@ -127,7 +138,13 @@ static int hwupload_config_output(AVFilterLink *outlink)
> av_get_pix_fmt_name(inlink->format));
>
> ctx->hwframes->format = outlink->format;
> - ctx->hwframes->sw_format = inlink->format;
> + if (inlink->hw_frames_ctx) {
> + AVHWFramesContext *in_hwframe_ctx =
> + (AVHWFramesContext*)inlink->hw_frames_ctx->data;
> + ctx->hwframes->sw_format = in_hwframe_ctx->sw_format;
> + } else {
> + ctx->hwframes->sw_format = inlink->format;
> + }
> ctx->hwframes->width = inlink->w;
> ctx->hwframes->height = inlink->h;
>
> @@ -200,13 +217,21 @@ static av_cold void hwupload_uninit(AVFilterContext *avctx)
> av_buffer_unref(&ctx->hwdevice_ref);
> }
>
> -static const AVClass hwupload_class = {
> - .class_name = "hwupload",
> - .item_name = av_default_item_name,
> - .option = NULL,
> - .version = LIBAVUTIL_VERSION_INT,
> +#define OFFSET(x) offsetof(HWUploadContext, x)
> +#define FLAGS (AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM)
> +static const AVOption hwupload_options[] = {
> + {
> + "derive_device", "Derive a new device of this type",
> + OFFSET(device_type), AV_OPT_TYPE_STRING,
> + { .str = NULL }, 0, 0, FLAGS
> + },
> + {
> + NULL
> + }
> };
>
> +AVFILTER_DEFINE_CLASS(hwupload);
> +
> static const AVFilterPad hwupload_inputs[] = {
> {
> .name = "default",
> diff --git a/libavfilter/vf_hwupload_cuda.c b/libavfilter/vf_hwupload_cuda.c
> index 4d83e6c8f2..8ee0825859 100644
> --- a/libavfilter/vf_hwupload_cuda.c
> +++ b/libavfilter/vf_hwupload_cuda.c
> @@ -60,6 +60,9 @@ static int cudaupload_query_formats(AVFilterContext *ctx)
> AV_PIX_FMT_NV12, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV444P,
> AV_PIX_FMT_P010, AV_PIX_FMT_P016, AV_PIX_FMT_YUV444P16,
> AV_PIX_FMT_0RGB32, AV_PIX_FMT_0BGR32,
> +#if CONFIG_VULKAN
> + AV_PIX_FMT_VULKAN,
> +#endif
I guess there is no way to make sure this is only exposed on actually-supported devices?
> AV_PIX_FMT_NONE,
> };
> static const enum AVPixelFormat output_pix_fmts[] = {
> @@ -97,7 +100,12 @@ static int cudaupload_config_output(AVFilterLink *outlink)
>
> hwframe_ctx = (AVHWFramesContext*)s->hwframe->data;
> hwframe_ctx->format = AV_PIX_FMT_CUDA;
> - hwframe_ctx->sw_format = inlink->format;
> + if (inlink->hw_frames_ctx) {
> + AVHWFramesContext *in_hwframe_ctx = (AVHWFramesContext*)inlink->hw_frames_ctx->data;
> + hwframe_ctx->sw_format = in_hwframe_ctx->sw_format;
> + } else {
> + hwframe_ctx->sw_format = inlink->format;
> + }
> hwframe_ctx->width = inlink->w;
> hwframe_ctx->height = inlink->h;
>
> --
> 2.25.0.rc2
>
Thanks,
- Mark
Jan 18, 2020, 20:23 by sw@jkqxz.net:
> On 10/01/2020 21:05, Lynne wrote:
>
> The CUDA parts look like they could be split off into a separate commit? (It's already huge.)
>
I don't really want broken commits or commits with dead code.
>>
>> diff --git a/configure b/configure
>> index 46f2038627..3113ebfdd8 100755
>> --- a/configure
>> +++ b/configure
>> @@ -309,6 +309,7 @@ External library support:
>> --enable-openssl enable openssl, needed for https support
>> if gnutls, libtls or mbedtls is not used [no]
>> --enable-pocketsphinx enable PocketSphinx, needed for asr filter [no]
>> + --enable-vulkan enable Vulkan code [no]
>>
>
> Alphabetical order.
>
Fixed in the git.
>> --disable-sndio disable sndio support [autodetect]
>> --disable-schannel disable SChannel SSP, needed for TLS support on
>> Windows if openssl and gnutls are not used [autodetect]
>> @@ -1549,11 +1550,11 @@ require_cc(){
>> }
>>
>> require_cpp(){
>> - name="$1"
>> - headers="$2"
>> - classes="$3"
>> - shift 3
>> - check_lib_cpp "$headers" "$classes" "$@" || die "ERROR: $name not found"
>> + log require_cpp "$@"
>> + name_version="$1"
>> + name="${1%% *}"
>> + shift
>> + check_lib_cpp "$name" "$@" || die "ERROR: $name_version not found"
>> }
>>
>
> This change looks unrelated. (require_cpp isn't used in this patch at all.)
>
Its used in the lavfi vulkan patch, moved.
>>
>> require_headers(){
>> @@ -1854,6 +1855,7 @@ HWACCEL_LIBRARY_LIST="
>> mmal
>> omx
>> opencl
>> + vulkan
>> "
>>
>> DOCUMENT_LIST="
>> @@ -3639,7 +3641,7 @@ avformat_deps="avcodec avutil"
>> avformat_suggest="libm network zlib"
>> avresample_deps="avutil"
>> avresample_suggest="libm"
>> -avutil_suggest="clock_gettime ffnvcodec libm libdrm libmfx opencl user32 vaapi videotoolbox corefoundation corevideo coremedia bcrypt"
>> +avutil_suggest="clock_gettime ffnvcodec libm libdrm libmfx opencl user32 vaapi vulkan videotoolbox corefoundation corevideo coremedia bcrypt"
>> postproc_deps="avutil gpl"
>> postproc_suggest="libm"
>> swresample_deps="avutil"
>> @@ -6626,6 +6628,9 @@ enabled vdpau &&
>>
>> enabled crystalhd && check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd
>>
>> +enabled vulkan &&
>> + require_pkg_config vulkan "vulkan >= 1.1.97" "vulkan/vulkan.h" vkCreateInstance
>>
>
> Presumably you have some specific requirement in mind which wants this version - can you note it somewhere? (Either here or in the commit message.)
>
The DRM export/import and I think the semaphore import API.
Its not a new version, its been out for a long time.
>> +
>> if enabled x86; then
>> case $target_os in
>> mingw32*|mingw64*|win32|win64|linux|cygwin*)
>> ...
>> diff --git a/libavutil/hwcontext.h b/libavutil/hwcontext.h
>> index f5a4b62387..f874af9f8f 100644
>> --- a/libavutil/hwcontext.h
>> +++ b/libavutil/hwcontext.h
>> @@ -36,6 +36,7 @@ enum AVHWDeviceType {
>> AV_HWDEVICE_TYPE_DRM,
>> AV_HWDEVICE_TYPE_OPENCL,
>> AV_HWDEVICE_TYPE_MEDIACODEC,
>> + AV_HWDEVICE_TYPE_VULKAN,
>> };
>>
>> typedef struct AVHWDeviceInternal AVHWDeviceInternal;
>> diff --git a/libavutil/hwcontext_cuda.c b/libavutil/hwcontext_cuda.c
>> index 30611b1912..18abb87bbd 100644
>> --- a/libavutil/hwcontext_cuda.c
>> +++ b/libavutil/hwcontext_cuda.c
>> @@ -21,6 +21,9 @@
>> #include "hwcontext.h"
>> #include "hwcontext_internal.h"
>> #include "hwcontext_cuda_internal.h"
>> +#if CONFIG_VULKAN
>> +#include "hwcontext_vulkan.h"
>> +#endif
>> #include "cuda_check.h"
>> #include "mem.h"
>> #include "pixdesc.h"
>> @@ -42,6 +45,9 @@ static const enum AVPixelFormat supported_formats[] = {
>> AV_PIX_FMT_YUV444P16,
>> AV_PIX_FMT_0RGB32,
>> AV_PIX_FMT_0BGR32,
>> +#if CONFIG_VULKAN
>> + AV_PIX_FMT_VULKAN,
>> +#endif
>>
>
> Do all devices we can do CUDA on also support Vulkan? If not, this should probably filter it out in get_constraints() to avoid exposing something which can't possibly work.
>
Fixed with more pci vendor id checking :(
>> };
>>
>> #define CHECK_CU(x) FF_CUDA_CHECK_DL(device_ctx, cu, x)
>> @@ -205,6 +211,10 @@ static int cuda_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst,
>> CUcontext dummy;
>> int i, ret;
>>
>> + /* We don't support transfers to HW devices. */
>> + if (dst->hw_frames_ctx)
>> + return AVERROR(ENOSYS);
>> +
>> ret = CHECK_CU(cu->cuCtxPushCurrent(hwctx->cuda_ctx));
>> if (ret < 0)
>> return ret;
>> @@ -247,6 +257,10 @@ static int cuda_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst,
>> CUcontext dummy;
>> int i, ret;
>>
>> + /* We don't support transfers from HW devices. */
>> + if (src->hw_frames_ctx)
>> + return AVERROR(ENOSYS);
>> +
>> ret = CHECK_CU(cu->cuCtxPushCurrent(hwctx->cuda_ctx));
>> if (ret < 0)
>> return ret;
>> @@ -389,6 +403,112 @@ error:
>> return AVERROR_UNKNOWN;
>> }
>>
>> +static int cuda_device_derive(AVHWDeviceContext *device_ctx,
>> + AVHWDeviceContext *src_ctx,
>> + int flags) {
>> + AVCUDADeviceContext *hwctx = device_ctx->hwctx;
>> + CudaFunctions *cu;
>> + const char *src_uuid = NULL;
>> + CUcontext dummy;
>> + int ret, i, device_count, dev_active = 0;
>> + unsigned int dev_flags = 0;
>> +
>> + const unsigned int desired_flags = CU_CTX_SCHED_BLOCKING_SYNC;
>> +
>> + switch (src_ctx->type) {
>> +#if CONFIG_VULKAN
>> + case AV_HWDEVICE_TYPE_VULKAN: {
>> + AVVulkanDeviceContext *vkctx = src_ctx->hwctx;
>> + src_uuid = vkctx->device_uuid;
>> + break;
>> + }
>> +#endif
>> + default:
>> + return AVERROR(ENOSYS);
>> + }
>> +
>> + if (!src_uuid) {
>> + av_log(device_ctx, AV_LOG_ERROR,
>> + "Failed to get UUID of source device.\n");
>> + goto error;
>> + }
>> +
>> + if (cuda_device_init(device_ctx) < 0)
>> + goto error;
>> +
>> + cu = hwctx->internal->cuda_dl;
>> +
>> + ret = CHECK_CU(cu->cuInit(0));
>> + if (ret < 0)
>> + goto error;
>> +
>> + ret = CHECK_CU(cu->cuDeviceGetCount(&device_count));
>> + if (ret < 0)
>> + goto error;
>> +
>> + hwctx->internal->cuda_device = -1;
>> + for (i = 0; i < device_count; i++) {
>> + CUdevice dev;
>> + CUuuid uuid;
>> +
>> + ret = CHECK_CU(cu->cuDeviceGet(&dev, i));
>> + if (ret < 0)
>> + goto error;
>> +
>> + ret = CHECK_CU(cu->cuDeviceGetUuid(&uuid, dev));
>> + if (ret < 0)
>> + goto error;
>> +
>> + if (memcmp(src_uuid, uuid.bytes, sizeof (uuid.bytes)) == 0) {
>> + hwctx->internal->cuda_device = dev;
>> + break;
>> + }
>> + }
>> +
>> + if (hwctx->internal->cuda_device == -1) {
>> + av_log(device_ctx, AV_LOG_ERROR, "Could not derive CUDA device.\n");
>>
>
> This error is maybe more like "Can't find the matching CUDA device to the supplied Vulkan device".
>
Let's keep it that way, its not meant to be vulkan specific, though its only used by vulkan currently.
>> + goto error;
>> + }
>> +
>> + hwctx->internal->flags = flags;
>> +
>> + if (flags & AV_CUDA_USE_PRIMARY_CONTEXT) {
>> + ret = CHECK_CU(cu->cuDevicePrimaryCtxGetState(hwctx->internal->cuda_device, &dev_flags, &dev_active));
>> + if (ret < 0)
>> + goto error;
>> +
>> + if (dev_active && dev_flags != desired_flags) {
>> + av_log(device_ctx, AV_LOG_ERROR, "Primary context already active with incompatible flags.\n");
>> + goto error;
>> + } else if (dev_flags != desired_flags) {
>> + ret = CHECK_CU(cu->cuDevicePrimaryCtxSetFlags(hwctx->internal->cuda_device, desired_flags));
>> + if (ret < 0)
>> + goto error;
>> + }
>> +
>> + ret = CHECK_CU(cu->cuDevicePrimaryCtxRetain(&hwctx->cuda_ctx, hwctx->internal->cuda_device));
>> + if (ret < 0)
>> + goto error;
>> + } else {
>> + ret = CHECK_CU(cu->cuCtxCreate(&hwctx->cuda_ctx, desired_flags, hwctx->internal->cuda_device));
>> + if (ret < 0)
>> + goto error;
>> +
>> + CHECK_CU(cu->cuCtxPopCurrent(&dummy));
>> + }
>> +
>> + hwctx->internal->is_allocated = 1;
>> +
>> + // Setting stream to NULL will make functions automatically use the default CUstream
>> + hwctx->stream = NULL;
>> +
>> + return 0;
>> +
>> +error:
>> + cuda_device_uninit(device_ctx);
>> + return AVERROR_UNKNOWN;
>> +}
>> +
>> const HWContextType ff_hwcontext_type_cuda = {
>> .type = AV_HWDEVICE_TYPE_CUDA,
>> .name = "CUDA",
>> @@ -397,6 +517,7 @@ const HWContextType ff_hwcontext_type_cuda = {
>> .frames_priv_size = sizeof(CUDAFramesContext),
>>
>> .device_create = cuda_device_create,
>> + .device_derive = cuda_device_derive,
>> .device_init = cuda_device_init,
>> .device_uninit = cuda_device_uninit,
>> .frames_get_constraints = cuda_frames_get_constraints,
>> ...
>> diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
>> new file mode 100644
>> index 0000000000..d4eb8ffd35
>> --- /dev/null
>> +++ b/libavutil/hwcontext_vulkan.c
>> @@ -0,0 +1,2804 @@
>> ...
>> +
>> +static const struct {
>> + enum AVPixelFormat pixfmt;
>> + const VkFormat vkfmts[3];
>> +} vk_pixfmt_map[] = {
>> + { AV_PIX_FMT_GRAY8, { VK_FORMAT_R8_UNORM } },
>> + { AV_PIX_FMT_GRAY16, { VK_FORMAT_R16_UNORM } },
>> + { AV_PIX_FMT_GRAYF32, { VK_FORMAT_R32_SFLOAT } },
>> +
>> + { AV_PIX_FMT_NV12, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8G8_UNORM } },
>> + { AV_PIX_FMT_P010, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16G16_UNORM } },
>>
>
> Is P010 still safe when the low bits might have any value?
>
Our padding is in the top bits. Vulkan defines it in the bottom bits, hence we can't use it.
I can't see why it wouldn't be safe. Every code that deals with user-supplied frames must rely they're junk.
>> + { AV_PIX_FMT_P016, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16G16_UNORM } },
>> +
>> + { AV_PIX_FMT_YUV420P, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM } },
>> + { AV_PIX_FMT_YUV422P, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM } },
>> + { AV_PIX_FMT_YUV444P, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM } },
>> +
>> + { AV_PIX_FMT_YUV420P16, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
>> + { AV_PIX_FMT_YUV422P16, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
>> + { AV_PIX_FMT_YUV444P16, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
>> +
>> + { AV_PIX_FMT_ABGR, { VK_FORMAT_A8B8G8R8_UNORM_PACK32 } },
>> + { AV_PIX_FMT_BGRA, { VK_FORMAT_B8G8R8A8_UNORM } },
>> + { AV_PIX_FMT_RGBA, { VK_FORMAT_R8G8B8A8_UNORM } },
>> + { AV_PIX_FMT_RGB24, { VK_FORMAT_R8G8B8_UNORM } },
>> + { AV_PIX_FMT_BGR24, { VK_FORMAT_B8G8R8_UNORM } },
>> + { AV_PIX_FMT_RGB48, { VK_FORMAT_R16G16B16_UNORM } },
>> + { AV_PIX_FMT_RGBA64, { VK_FORMAT_R16G16B16A16_UNORM } },
>> + { AV_PIX_FMT_RGB565, { VK_FORMAT_R5G6B5_UNORM_PACK16 } },
>> + { AV_PIX_FMT_BGR565, { VK_FORMAT_B5G6R5_UNORM_PACK16 } },
>> + { AV_PIX_FMT_BGR0, { VK_FORMAT_B8G8R8A8_UNORM } },
>> + { AV_PIX_FMT_0BGR, { VK_FORMAT_A8B8G8R8_UNORM_PACK32 } },
>> + { AV_PIX_FMT_RGB0, { VK_FORMAT_R8G8B8A8_UNORM } },
>> +
>> + { AV_PIX_FMT_GBRPF32, { VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32_SFLOAT } },
>> +};
>> +
>> ...
>> +static int check_extensions(AVHWDeviceContext *ctx, int dev,
>> + const char * const **dst, uint32_t *num, int debug)
>> +{
>> + const char *tstr;
>> + const char **extension_names = NULL;
>> + VulkanDevicePriv *p = ctx->internal->priv;
>> + AVVulkanDeviceContext *hwctx = ctx->hwctx;
>> + int err = 0, found, extensions_found = 0;
>> +
>> + const char *mod;
>> + int optional_exts_num;
>> + uint32_t sup_ext_count;
>> + VkExtensionProperties *sup_ext;
>> + const VulkanOptExtension *optional_exts;
>> +
>> + if (!dev) {
>> + mod = "instance";
>> + optional_exts = optional_instance_exts;
>> + optional_exts_num = FF_ARRAY_ELEMS(optional_instance_exts);
>> + vkEnumerateInstanceExtensionProperties(NULL, &sup_ext_count, NULL);
>> + sup_ext = av_malloc_array(sup_ext_count, sizeof(VkExtensionProperties));
>> + if (!sup_ext)
>> + return AVERROR(ENOMEM);
>> + vkEnumerateInstanceExtensionProperties(NULL, &sup_ext_count, sup_ext);
>> + } else {
>> + mod = "device";
>> + optional_exts = optional_device_exts;
>> + optional_exts_num = FF_ARRAY_ELEMS(optional_device_exts);
>> + vkEnumerateDeviceExtensionProperties(hwctx->phys_dev, NULL,
>> + &sup_ext_count, NULL);
>> + sup_ext = av_malloc_array(sup_ext_count, sizeof(VkExtensionProperties));
>> + if (!sup_ext)
>> + return AVERROR(ENOMEM);
>> + vkEnumerateDeviceExtensionProperties(hwctx->phys_dev, NULL,
>> + &sup_ext_count, sup_ext);
>> + }
>> +
>> + for (int i = 0; i < optional_exts_num; i++) {
>> + int req = optional_exts[i].flag & EXT_REQUIRED;
>> + tstr = optional_exts[i].name;
>> +
>> + found = 0;
>> + for (int j = 0; j < sup_ext_count; j++) {
>> + if (!strcmp(tstr, sup_ext[j].extensionName)) {
>> + found = 1;
>> + break;
>> + }
>> + }
>> + if (!found) {
>> + int lvl = req ? AV_LOG_ERROR : AV_LOG_VERBOSE;
>> + av_log(ctx, lvl, "Extension \"%s\" not found!\n", tstr);
>> + if (req) {
>> + err = AVERROR(EINVAL);
>> + goto end;
>> + }
>> + continue;
>> + }
>> + if (!req)
>> + p->extensions |= optional_exts[i].flag;
>> +
>> + av_log(ctx, AV_LOG_VERBOSE, "Using %s extension \"%s\"\n", mod, tstr);
>> +
>> + ADD_VAL_TO_LIST(extension_names, extensions_found, tstr);
>> + }
>> +
>> + if (debug && !dev) {
>> + tstr = VK_EXT_DEBUG_UTILS_EXTENSION_NAME;
>> + found = 0;
>> + for (int j = 0; j < sup_ext_count; j++) {
>> + if (!strcmp(tstr, sup_ext[j].extensionName)) {
>> + found = 1;
>> + break;
>> + }
>> + }
>> + if (found) {
>> + ADD_VAL_TO_LIST(extension_names, extensions_found, tstr);
>> + } else {
>> + av_log(ctx, AV_LOG_ERROR, "Debug extension \"%s\" not found!\n",
>> + tstr);
>> + err = AVERROR(EINVAL);
>> + goto end;
>> + }
>> + }
>> +
>> + *dst = extension_names;
>> + *num = extensions_found;
>> +
>> +end:
>> + av_free(sup_ext);
>>
>
> I think this leaks the extension_names array with some of the later failures.
>
One, fixed.
>> + return err;
>> +}
>> +
>> ...
>> +
>> +typedef struct VulkanDeviceSelection {
>> + uint8_t uuid[VK_UUID_SIZE]; /* Will use this first unless !has_uuid */
>> + int has_uuid;
>> + const char *name; /* Will use this second unless NULL */
>> + uint32_t pci_device; /* Will use this second unless 0x0 */
>> + uint32_t vendor_id; /* Last resort to find something deterministic */
>> + int index; /* Finally fall back to index */
>> +} VulkanDeviceSelection;
>> +
>> +static const char *vk_dev_type(enum VkPhysicalDeviceType type)
>> +{
>> + switch (type) {
>> + case VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU: return "integrated";
>> + case VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU: return "discrete";
>> + case VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU: return "virtual";
>> + case VK_PHYSICAL_DEVICE_TYPE_CPU: return "software";
>> + default: return "unknown";
>> + }
>> +}
>> +
>> +/* Finds a device */
>> +static int find_device(AVHWDeviceContext *ctx, VulkanDeviceSelection *select)
>> +{
>> ...
>>
>
> Yay, I like the improvement to the selection options :)
>
>> +}
>> +
>> ...
>> +
>> +static void free_exec_ctx(AVHWDeviceContext *ctx, VulkanExecCtx *cmd)
>> +{
>> + AVVulkanDeviceContext *hwctx = ctx->hwctx;
>> +
>> + vkDestroyFence(hwctx->act_dev, cmd->fence, hwctx->alloc);
>> +
>> + if (cmd->buf)
>> + vkFreeCommandBuffers(hwctx->act_dev, cmd->pool, 1, &cmd->buf);
>> + if (cmd->pool)
>> + vkDestroyCommandPool(hwctx->act_dev, cmd->pool, hwctx->alloc);
>> +}
>> +
>> +static void vulkan_device_free(AVHWDeviceContext *ctx)
>> +{
>> + VulkanDevicePriv *p = ctx->internal->priv;
>> + AVVulkanDeviceContext *hwctx = ctx->hwctx;
>> +
>> + free_exec_ctx(ctx, &p->cmd);
>>
>
> A device destroyed before it is fully created need not have a valid exec_ctx.
>
> (E.g. "./ffmpeg_g -init_hw_device vulkan:123456789" segfaults here.)
>
Fixed.
>> ...
>> +
>> +static int vulkan_device_init(AVHWDeviceContext *ctx)
>> +{
>> + int err;
>> + uint32_t queue_num;
>> + AVVulkanDeviceContext *hwctx = ctx->hwctx;
>> + VulkanDevicePriv *p = ctx->internal->priv;
>> +
>> + vkGetPhysicalDeviceQueueFamilyProperties(hwctx->phys_dev, &queue_num, NULL);
>> + if (!queue_num) {
>> + av_log(ctx, AV_LOG_ERROR, "Failed to get queues!\n");
>> + return AVERROR_EXTERNAL;
>> + }
>> +
>> + if (hwctx->queue_family_index >= queue_num ||
>> + hwctx->queue_family_tx_index >= queue_num ||
>> + hwctx->queue_family_comp_index >= queue_num) {
>> + av_log(ctx, AV_LOG_ERROR, "Invalid queue index!\n");
>>
>
> Maybe say the invalid indices.
>
Fixed.
>> + return AVERROR_EXTERNAL;
>>
>
> I think this is EINVAL - the user supplied the invalid queue index.
>
Fixed.
>> + }
>> +
>> + /* Create exec context - if there's something invalid this will error out */
>> + err = create_exec_ctx(ctx, &p->cmd, hwctx->queue_family_tx_index);
>> + if (err)
>> + return err;
>> +
>> + /* Get device capabilities */
>> + vkGetPhysicalDeviceMemoryProperties(hwctx->phys_dev, &p->mprops);
>> +
>> + return 0;
>> +}
>> +
>> +static int vulkan_device_create(AVHWDeviceContext *ctx, const char *device,
>> + AVDictionary *opts, int flags)
>> +{
>> + VulkanDeviceSelection dev_select = { 0 };
>> + if (device && device[0]) {
>> + char *end = NULL;
>> + dev_select.index = strtol(device, &end, 10);
>> + if (end == device) {
>> + dev_select.index = 0;
>> + dev_select.name = device;
>> + }
>> + }
>>
>
> Is it worth making uuid=f00 work here as well? (From opts rather than device: "-init_hw_device vulkan:,uuid=f00".)
>
Would like to, but I don't think its worth the extra dependency (libuuid, its widespread on linux but I'd rather not NIH parsing).
>> +
>> + return vulkan_device_create_internal(ctx, &dev_select, opts, flags);
>> +}
>> +
>> +static int vulkan_device_derive(AVHWDeviceContext *ctx,
>> + AVHWDeviceContext *src_ctx, int flags)
>> +{
>> + av_unused VulkanDeviceSelection dev_select = { 0 };
>> +
>> + /* If there's only one device on the system, then even if its not covered
>> + * by the following checks (e.g. non-PCIe ARM GPU), having an empty
>> + * dev_select will mean it'll get picked. */
>>
>
> Kindof evil, but makes sense.
>
>> + switch(src_ctx->type) {
>> +#if CONFIG_LIBDRM
>> +#if CONFIG_VAAPI
>> + case AV_HWDEVICE_TYPE_VAAPI: {
>> + AVVAAPIDeviceContext *src_hwctx = src_ctx->hwctx;
>> +
>> + const char *vendor = vaQueryVendorString(src_hwctx->display);
>> + if (!vendor) {
>> + av_log(ctx, AV_LOG_ERROR, "Unable to get device info from VAAPI!\n");
>> + return AVERROR_EXTERNAL;
>> + }
>> +
>> + if (strstr(vendor, "Intel"))
>> + dev_select.vendor_id = 0x8086;
>> + if (strstr(vendor, "AMD"))
>> + dev_select.vendor_id = 0x1002;
>>
>
> Yuck, but I don't see a better way :(
>
> I might look into adding something to libva to allow this to work properly, since this combination will happen.
>
>> +
>> + return vulkan_device_create_internal(ctx, &dev_select, NULL, flags);
>> + }
>> +#endif
>> + case AV_HWDEVICE_TYPE_DRM: {
>> + AVDRMDeviceContext *src_hwctx = src_ctx->hwctx;
>> +
>> + drmDevice *drm_dev_info;
>> + int err = drmGetDevice(src_hwctx->fd, &drm_dev_info);
>> + if (err) {
>> + av_log(ctx, AV_LOG_ERROR, "Unable to get device info from DRM fd!\n");
>> + return AVERROR_EXTERNAL;
>> + }
>> +
>> + if (drm_dev_info->bustype == DRM_BUS_PCI)
>> + dev_select.pci_device = drm_dev_info->deviceinfo.pci->device_id;
>> +
>> + drmFreeDevice(&drm_dev_info);
>> +
>> + return vulkan_device_create_internal(ctx, &dev_select, NULL, flags);
>> + }
>> +#endif
>> +#if CONFIG_CUDA
>> + case AV_HWDEVICE_TYPE_CUDA: {
>> + AVHWDeviceContext *cuda_cu = src_ctx;
>> + AVCUDADeviceContext *src_hwctx = src_ctx->hwctx;
>> + AVCUDADeviceContextInternal *cu_internal = src_hwctx->internal;
>> + CudaFunctions *cu = cu_internal->cuda_dl;
>> +
>> + int ret = CHECK_CU(cu->cuDeviceGetUuid((CUuuid *)&dev_select.uuid,
>> + cu_internal->cuda_device));
>> + if (ret < 0) {
>> + av_log(ctx, AV_LOG_ERROR, "Unable to get UUID from CUDA!\n");
>> + return AVERROR_EXTERNAL;
>> + }
>> +
>> + dev_select.has_uuid = 1;
>> +
>> + return vulkan_device_create_internal(ctx, &dev_select, NULL, flags);
>> + }
>> +#endif
>> + default:
>> + return AVERROR(ENOSYS);
>> + }
>> +}
>> +
>> +static int vulkan_frames_get_constraints(AVHWDeviceContext *ctx,
>> + const void *hwconfig,
>> + AVHWFramesConstraints *constraints)
>> +{
>> + int count = 0;
>> + AVVulkanDeviceContext *hwctx = ctx->hwctx;
>> + VulkanDevicePriv *p = ctx->internal->priv;
>> +
>> + for (enum AVPixelFormat i = 0; i < AV_PIX_FMT_NB; i++)
>> + count += pixfmt_is_supported(hwctx, i, p->use_linear_images);
>> +
>> +#if CONFIG_CUDA
>> + count++;
>>
>
> I think you should be able to test whether a device supports CUDA here, so it isn't included for non-Nvidia devices?
>
Fixed.
>> +#endif
>> +
>> + constraints->valid_sw_formats = av_malloc_array(count + 1,
>> + sizeof(enum AVPixelFormat));
>> + if (!constraints->valid_sw_formats)
>> + return AVERROR(ENOMEM);
>> +
>> + count = 0;
>> + for (enum AVPixelFormat i = 0; i < AV_PIX_FMT_NB; i++)
>> + if (pixfmt_is_supported(hwctx, i, p->use_linear_images))
>> + constraints->valid_sw_formats[count++] = i;
>> +
>> +#if CONFIG_CUDA
>> + constraints->valid_sw_formats[count++] = AV_PIX_FMT_CUDA;
>> +#endif
>> + constraints->valid_sw_formats[count++] = AV_PIX_FMT_NONE;
>> +
>> + constraints->min_width = 0;
>> + constraints->min_height = 0;
>> + constraints->max_width = p->props.limits.maxImageDimension2D;
>> + constraints->max_height = p->props.limits.maxImageDimension2D;
>> +
>> + constraints->valid_hw_formats = av_malloc_array(2, sizeof(enum AVPixelFormat));
>> + if (!constraints->valid_hw_formats)
>> + return AVERROR(ENOMEM);
>> +
>> + constraints->valid_hw_formats[0] = AV_PIX_FMT_VULKAN;
>> + constraints->valid_hw_formats[1] = AV_PIX_FMT_NONE;
>> +
>> + return 0;
>> +}
>> +
>> ...
>> +
>> +typedef struct VulkanFramesPriv {
>> + VulkanExecCtx cmd;
>> +} VulkanFramesPriv;
>>
>
> I think put this definition at the top so that it's easy to find what priv on a Vulkan HWFC is.
>
Done.
>> ...
>> +
>> +static void vulkan_frame_free(void *opaque, uint8_t *data)
>> +{
>> + AVVkFrame *f = (AVVkFrame *)data;
>> + AVHWFramesContext *hwfc = opaque;
>> + AVVulkanDeviceContext *hwctx = hwfc->device_ctx->hwctx;
>> + int planes = av_pix_fmt_count_planes(hwfc->sw_format);
>> +
>> + if (!f)
>> + return;
>>
>
> When can you have !f? That seems invalid in an "assert that f is not null" type of way.
>
Fixed.
>> +
>> + vulkan_free_internal(f->internal);
>> +
>> + for (int i = 0; i < planes; i++) {
>> + vkDestroyImage(hwctx->act_dev, f->img[i], hwctx->alloc);
>> + vkFreeMemory(hwctx->act_dev, f->mem[i], hwctx->alloc);
>> + vkDestroySemaphore(hwctx->act_dev, f->sem[i], hwctx->alloc);
>> + }
>> +
>> + av_free(f);
>> +}
>> +
>> ...
>> +
>> +static int vulkan_frames_init(AVHWFramesContext *hwfc)
>> +{
>> + int err;
>> + AVVkFrame *f;
>> + AVVulkanFramesContext *hwctx = hwfc->hwctx;
>> + VulkanFramesPriv *fp = hwfc->internal->priv;
>> + AVVulkanDeviceContext *dev_hwctx = hwfc->device_ctx->hwctx;
>> + VulkanDevicePriv *p = hwfc->device_ctx->internal->priv;
>> +
>> + if (hwfc->pool)
>> + return 0;
>> +
>> + /* Default pool flags */
>> + hwctx->tiling = hwctx->tiling ? hwctx->tiling : p->use_linear_images ?
>> + VK_IMAGE_TILING_LINEAR : VK_IMAGE_TILING_OPTIMAL;
>> +
>> + hwctx->usage |= DEFAULT_USAGE_FLAGS;
>>
>
> Is it possible that this disallows some use-cases in a device where those default flags need not be not supported? For example, some sort of magic image-writer like a video decoder where the output images can only ever be used as a source by non-magic operations. Baking that into the API (as in the comment on usage in the header) seems bad if so.
>
You need to support those flags to do anything useful with the images.
This restricts read-only images since those don't support the STORAGE flag. Such images are the planar images, which DO support the STORAGE flag but only for their subimages (e.g. individual planes). This is in spec, regardless what Intel says and disagrees with (they advise to alias memory instead). We don't use them anyway, and if a user wanted to repackage received frames as planar (or unpackage them) they still can.
>> +
>> + err = create_exec_ctx(hwfc->device_ctx, &fp->cmd,
>> + dev_hwctx->queue_family_tx_index);
>> + if (err)
>> + return err;
>> +
>> + /* Test to see if allocation will fail */
>> + err = create_frame(hwfc, &f, hwctx->tiling, hwctx->usage,
>> + hwctx->create_pnext);
>> + if (err)
>> + return err;
>> +
>> + vulkan_frame_free(hwfc, (uint8_t *)f);
>> +
>> + hwfc->internal->pool_internal = av_buffer_pool_init2(sizeof(AVVkFrame),
>> + hwfc, vulkan_pool_alloc,
>> + NULL);
>> + if (!hwfc->internal->pool_internal)
>> + return AVERROR(ENOMEM);
>> +
>> + return 0;
>> +}
>> +
>> ...
>> +
>> +static const struct {
>> + uint32_t va_fourcc;
>>
>
> va_fourcc?
>
drm_fourcc now.
>> + VkFormat vk_format;
>> +} vulkan_drm_format_map[] = {
>> + { DRM_FORMAT_R8, VK_FORMAT_R8_UNORM },
>> + { DRM_FORMAT_R16, VK_FORMAT_R16_UNORM },
>> + { DRM_FORMAT_GR88, VK_FORMAT_R8G8_UNORM },
>> + { DRM_FORMAT_RG88, VK_FORMAT_R8G8_UNORM },
>> + { DRM_FORMAT_GR1616, VK_FORMAT_R16G16_UNORM },
>> + { DRM_FORMAT_RG1616, VK_FORMAT_R16G16_UNORM },
>>
>
> Are RG88 and RG1616 right? I thought you would always want them reversed.
>
I think so. I forgot why I did it that way, probably because of something I saw in hwcontext_vaapi. I'd rather leave them as-is for any weird implementation. Or Intel to break.
>> +{
>> + for (int i = 0; i < FF_ARRAY_ELEMS(vulkan_drm_format_map); i++)
>> + if (vulkan_drm_format_map[i].va_fourcc == va_fourcc)
>> + return vulkan_drm_format_map[i].vk_format;
>> + return VK_FORMAT_UNDEFINED;
>> +}
>> +
>> +static int vulkan_map_from_drm_frame_desc(AVHWFramesContext *hwfc, AVVkFrame **frame,
>> + AVDRMFrameDescriptor *desc)
>> +{
>> + int err = 0;
>> + VkResult ret;
>> + AVVkFrame *f;
>> + AVHWDeviceContext *ctx = hwfc->device_ctx;
>> + AVVulkanDeviceContext *hwctx = ctx->hwctx;
>> + VulkanDevicePriv *p = ctx->internal->priv;
>> + const int planes = av_pix_fmt_count_planes(hwfc->sw_format);
>> + const AVPixFmtDescriptor *fmt_desc = av_pix_fmt_desc_get(hwfc->sw_format);
>> + const int has_modifiers = p->extensions & EXT_DRM_MODIFIER_FLAGS;
>> + VkSubresourceLayout plane_data[AV_NUM_DATA_POINTERS];
>> + VkBindImageMemoryInfo bind_info[AV_NUM_DATA_POINTERS];
>> + VkExternalMemoryHandleTypeFlagBits htype = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT;
>> +
>> + VK_LOAD_PFN(hwctx->inst, vkGetMemoryFdPropertiesKHR);
>> +
>> + for (int i = 0; i < desc->nb_layers; i++) {
>> + if (desc->layers[i].nb_planes > 1) {
>> + av_log(ctx, AV_LOG_ERROR, "Cannot import DMABUFS with more than 1 "
>> + "plane per layer!\n");
>> + return AVERROR(EINVAL);
>> + }
>> +
>> + if (drm_to_vulkan_fmt(desc->layers[i].format) == VK_FORMAT_UNDEFINED) {
>> + av_log(ctx, AV_LOG_ERROR, "Unsupported DMABUF layer format!\n");
>>
>
> Maybe say what the unsupported format is for someone reporting the message, since this is probably relatively easy to hit (e.g. YUYV).
>
Sure, I'll just use the handy DRM API/define to translate DRM FOURCC uint32_t to a string.
Oh wait, I can't because there is no such API. I've had to manually go through every single define in the past, relying on blind luck and speculation to match those up. DRM devs want people to suffer, as if the big-endian confusion-inducing FOURCC isn't evidence enough for it.
Not willing to NIH something to pull the chars out of it yet. Next time I have to look up a drm format id maybe.
>> + return AVERROR(EINVAL);
>> + }
>> + }
>> +
>> + if (!(f = av_mallocz(sizeof(*f)))) {
>> + av_log(ctx, AV_LOG_ERROR, "Unable to allocate memory for AVVkFrame!\n");
>> + err = AVERROR(ENOMEM);
>> + goto fail;
>> + }
>> +
>> + for (int i = 0; i < desc->nb_objects; i++) {
>> + VkMemoryFdPropertiesKHR fdmp = {
>> + .sType = VK_STRUCTURE_TYPE_MEMORY_FD_PROPERTIES_KHR,
>> + };
>> + VkMemoryRequirements req = {
>> + .size = desc->objects[i].size,
>> + };
>> + VkImportMemoryFdInfoKHR idesc = {
>> + .sType = VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR,
>> + .handleType = htype,
>> + .fd = desc->objects[i].fd,
>> + };
>> +
>> + ret = pfn_vkGetMemoryFdPropertiesKHR(hwctx->act_dev, htype,
>> + desc->objects[i].fd, &fdmp);
>> + if (ret != VK_SUCCESS) {
>> + av_log(hwfc, AV_LOG_ERROR, "Failed to get FD properties: %s\n",
>> + vk_ret2str(ret));
>> + err = AVERROR_EXTERNAL;
>> + goto fail;
>> + }
>> +
>> + req.memoryTypeBits = fdmp.memoryTypeBits;
>> +
>> + err = alloc_mem(ctx, &req, 0x0, &idesc, &f->flags, &f->mem[i]);
>> + if (err)
>> + return err;
>> +
>> + f->size[i] = desc->objects[i].size;
>> + }
>> +
>> + f->tiling = has_modifiers ? VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT :
>> + desc->objects[0].format_modifier == DRM_FORMAT_MOD_LINEAR ?
>> + VK_IMAGE_TILING_LINEAR : VK_IMAGE_TILING_OPTIMAL;
>> +
>> + for (int i = 0; i < desc->nb_layers; i++) {
>> + VkImageDrmFormatModifierExplicitCreateInfoEXT drm_info = {
>> + .sType = VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_EXPLICIT_CREATE_INFO_EXT,
>> + .drmFormatModifier = desc->objects[0].format_modifier,
>> + .drmFormatModifierPlaneCount = desc->layers[i].nb_planes,
>> + .pPlaneLayouts = (const VkSubresourceLayout *)&plane_data,
>> + };
>> +
>> + VkExternalMemoryImageCreateInfo einfo = {
>> + .sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO,
>> + .pNext = has_modifiers ? &drm_info : NULL,
>> + .handleTypes = htype,
>> + };
>> +
>> + VkSemaphoreCreateInfo sem_spawn = {
>> + .sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO,
>> + };
>> +
>> + const int p_w = i > 0 ? AV_CEIL_RSHIFT(hwfc->width, fmt_desc->log2_chroma_w) : hwfc->width;
>> + const int p_h = i > 0 ? AV_CEIL_RSHIFT(hwfc->height, fmt_desc->log2_chroma_h) : hwfc->height;
>> +
>> + VkImageCreateInfo image_create_info = {
>> + .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
>> + .pNext = &einfo,
>> + .imageType = VK_IMAGE_TYPE_2D,
>> + .format = drm_to_vulkan_fmt(desc->layers[i].format),
>> + .extent.width = p_w,
>> + .extent.height = p_h,
>> + .extent.depth = 1,
>> + .mipLevels = 1,
>> + .arrayLayers = 1,
>> + .flags = VK_IMAGE_CREATE_ALIAS_BIT,
>> + .tiling = f->tiling,
>> + .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED, /* specs say so */
>> + .usage = DEFAULT_USAGE_FLAGS,
>> + .sharingMode = VK_SHARING_MODE_EXCLUSIVE,
>> + .samples = VK_SAMPLE_COUNT_1_BIT,
>> + };
>> +
>> + for (int j = 0; j < desc->layers[i].nb_planes; j++) {
>> + plane_data[j].offset = desc->layers[i].planes[j].offset;
>> + plane_data[j].rowPitch = desc->layers[i].planes[j].pitch;
>> + plane_data[j].size = 0; /* The specs say so for all 3 */
>> + plane_data[j].arrayPitch = 0;
>> + plane_data[j].depthPitch = 0;
>> + }
>> +
>> + /* Create image */
>> + ret = vkCreateImage(hwctx->act_dev, &image_create_info,
>> + hwctx->alloc, &f->img[i]);
>> + if (ret != VK_SUCCESS) {
>> + av_log(ctx, AV_LOG_ERROR, "Image creation failure: %s\n",
>> + vk_ret2str(ret));
>> + err = AVERROR(EINVAL);
>> + goto fail;
>> + }
>> +
>> + ret = vkCreateSemaphore(hwctx->act_dev, &sem_spawn,
>> + hwctx->alloc, &f->sem[i]);
>> + if (ret != VK_SUCCESS) {
>> + av_log(hwctx, AV_LOG_ERROR, "Failed to create semaphore: %s\n",
>> + vk_ret2str(ret));
>> + return AVERROR_EXTERNAL;
>> + }
>> +
>> + /* We'd import a semaphore onto the one we created using
>> + * vkImportSemaphoreFdKHR but unfortunately neither DRM nor VAAPI
>> + * offer us anything we could import and sync with, so instead
>> + * leave the semaphore unsignalled and enjoy the validation spam. */
>>
>
> I have some vague intent to look into this subject myself. VAAPI needs proper async, and interop with Vulkan is an important use of that.
>
Would be nice. libdrm already has a public API to manage semaphores (create, destroy, export/import from fd, exactly what we need) but no way at all to link semaphores to a DRM surface. Its actually already used by drivers already too.
>> +
>> + f->layout[i] = image_create_info.initialLayout;
>> + f->access[i] = 0x0;
>> +
>> + /* TODO: Fix to support more than 1 plane per layer */
>> + bind_info[i].sType = VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO;
>> + bind_info[i].pNext = NULL;
>> + bind_info[i].image = f->img[i];
>> + bind_info[i].memory = f->mem[desc->layers[i].planes[0].object_index];
>> + bind_info[i].memoryOffset = desc->layers[i].planes[0].offset;
>> + }
>> +
>> + /* Bind the allocated memory to the images */
>> + ret = vkBindImageMemory2(hwctx->act_dev, planes, bind_info);
>> + if (ret != VK_SUCCESS) {
>> + av_log(ctx, AV_LOG_ERROR, "Failed to bind memory: %s\n",
>> + vk_ret2str(ret));
>> + return AVERROR_EXTERNAL;
>> + }
>> +
>> + *frame = f;
>> +
>> + return 0;
>> +
>> +fail:
>> + for (int i = 0; i < planes; i++) {
>> + vkDestroyImage(hwctx->act_dev, f->img[i], hwctx->alloc);
>> + vkFreeMemory(hwctx->act_dev, f->mem[i], hwctx->alloc);
>> + vkDestroySemaphore(hwctx->act_dev, f->sem[i], hwctx->alloc);
>> + }
>> +
>> + av_free(f);
>> +
>> + return err;
>> +}
>> +
>> ...
>> +
>> +static int vulkan_map_to_drm(AVHWFramesContext *hwfc, AVFrame *dst,
>> + const AVFrame *src, int flags)
>> +{
>> + int err = 0;
>> + VkResult ret;
>> + AVVkFrame *f = (AVVkFrame *)src->data[0];
>> + VulkanDevicePriv *p = hwfc->device_ctx->internal->priv;
>> + AVVulkanDeviceContext *hwctx = hwfc->device_ctx->hwctx;
>> + const int planes = av_pix_fmt_count_planes(hwfc->sw_format);
>> + VK_LOAD_PFN(hwctx->inst, vkGetMemoryFdKHR);
>> + VkImageDrmFormatModifierPropertiesEXT drm_mod = {
>> + .sType = VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT,
>> + };
>>
>
> Do you need a sync here for any writing being finished, or is it implicit somehow below?
>
There isn't. This would be where we export a semaphore to VAAPI.
We could make a CPU sync by converting the image to read optimal and waiting on the command queue's semaphore, but that would need another exec context.
Should we?
I don't have a way to test this ATM, my test program is gone, so if I do touch it I'll need to write a new one, which is a lot of work. With ffmpeg I can only test raw exporting without it actually being used by anything, since everything complains about some missing contexts IIRC.
>> +
>> + AVDRMFrameDescriptor *drm_desc = av_mallocz(sizeof(*drm_desc));
>> + if (!drm_desc)
>> + return AVERROR(ENOMEM);
>> +
>> + err = ff_hwframe_map_create(src->hw_frames_ctx, dst, src, &vulkan_unmap_to_drm, drm_desc);
>> + if (err < 0)
>> + goto end;
>> +
>> + if (p->extensions & EXT_DRM_MODIFIER_FLAGS) {
>> + VK_LOAD_PFN(hwctx->inst, vkGetImageDrmFormatModifierPropertiesEXT);
>> + ret = pfn_vkGetImageDrmFormatModifierPropertiesEXT(hwctx->act_dev, f->img[0],
>> + &drm_mod);
>> + if (ret != VK_SUCCESS) {
>> + av_log(hwfc, AV_LOG_ERROR, "Failed to retrieve DRM format modifier!\n");
>> + err = AVERROR_EXTERNAL;
>> + goto end;
>> + }
>> + }
>> +
>> + for (int i = 0; (i < planes) && (f->mem[i]); i++) {
>> + VkMemoryGetFdInfoKHR export_info = {
>> + .sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR,
>> + .memory = f->mem[i],
>> + .handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
>> + };
>> +
>> + ret = pfn_vkGetMemoryFdKHR(hwctx->act_dev, &export_info,
>> + &drm_desc->objects[i].fd);
>> + if (ret != VK_SUCCESS) {
>> + av_log(hwfc, AV_LOG_ERROR, "Unable to export the image as a FD!\n");
>> + err = AVERROR_EXTERNAL;
>> + goto end;
>> + }
>> +
>> + drm_desc->nb_objects++;
>> + drm_desc->objects[i].size = f->size[i];
>> + drm_desc->objects[i].format_modifier = drm_mod.drmFormatModifier;
>> + }
>> +
>> + drm_desc->nb_layers = planes;
>> + for (int i = 0; i < drm_desc->nb_layers; i++) {
>> + VkSubresourceLayout layout;
>> + VkImageSubresource sub = {
>> + .aspectMask = p->extensions & EXT_DRM_MODIFIER_FLAGS ?
>> + VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT :
>> + VK_IMAGE_ASPECT_COLOR_BIT,
>> + };
>> + VkFormat plane_vkfmt = av_vkfmt_from_pixfmt(hwfc->sw_format)[i];
>> +
>> + drm_desc->layers[i].format = vulkan_fmt_to_drm(plane_vkfmt);
>> + drm_desc->layers[i].nb_planes = 1;
>> +
>> + if (drm_desc->layers[i].format == DRM_FORMAT_INVALID) {
>> + av_log(hwfc, AV_LOG_ERROR, "Cannot map to DRM layer, unsupported!\n");
>> + err = AVERROR_PATCHWELCOME;
>> + goto end;
>> + }
>> +
>> + drm_desc->layers[i].planes[0].object_index = FFMIN(i, drm_desc->nb_objects - 1);
>> +
>> + if (f->tiling != VK_IMAGE_TILING_OPTIMAL)
>> + continue;
>> +
>> + vkGetImageSubresourceLayout(hwctx->act_dev, f->img[i], &sub, &layout);
>> + drm_desc->layers[i].planes[0].offset = layout.offset;
>> + drm_desc->layers[i].planes[0].pitch = layout.rowPitch;
>> + }
>> +
>> + dst->width = src->width;
>> + dst->height = src->height;
>> + dst->data[0] = (uint8_t *)drm_desc;
>> +
>> + av_log(hwfc, AV_LOG_VERBOSE, "Mapped AVVkFrame to a DRM object!\n");
>> +
>> + return 0;
>> +
>> +end:
>> + av_free(drm_desc);
>> + return err;
>> +}
>> +
>> ...
>> +
>> +/* Technically we can use VK_EXT_external_memory_host to upload and download,
>> + * however the alignment requirements make this unfeasible as both the pointer
>> + * and the size of each plane need to be aligned to the minimum alignment
>> + * requirement, which on all current implementations (anv, radv) is 4096.
>> + * If the requirement gets relaxed (unlikely) this can easily be implemented. */
>>
>
> What does the pointer alignment requirement actually apply to?
>
> (Could we lie about the start of the image by rounding to a page, and then do the transfer with an offset?)
>
The problem is the luma plane - in normal AVFrames the luma starts on the first data entry, and that's only aligned to the CPU vector size. That's orders of magnitude less that 4096 bytes.
>> ...
>> +
>> +static int vulkan_transfer_data_to_mem(AVHWFramesContext *hwfc, AVFrame *dst,
>> + const AVFrame *src)
>> +{
>> + int err = 0;
>> + AVFrame tmp;
>> + AVVkFrame *f = (AVVkFrame *)src->data[0];
>> + AVHWDeviceContext *dev_ctx = hwfc->device_ctx;
>> + ImageBuffer buf[AV_NUM_DATA_POINTERS] = { { 0 } };
>> + const int planes = av_pix_fmt_count_planes(dst->format);
>> + int log2_chroma = av_pix_fmt_desc_get(dst->format)->log2_chroma_h;
>> +
>> + if (dst->width > hwfc->width || dst->height > hwfc->height)
>> + return AVERROR(EINVAL);
>> +
>> + /* For linear, host visiable images */
>> + if (f->tiling == VK_IMAGE_TILING_LINEAR &&
>> + f->flags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) {
>>
>
> Is it generally expected that this is actually faster than the next option? (Because evil uncached memory is a thing.)
>
Could be. On Intel it was faster, but now its as fast as tiled images. On NVIDIA its slower. Its still faster on Intel for simple short filter chains. Keeping it for cheap devices.
>> + AVFrame *map = av_frame_alloc();
>> + if (!map)
>> + return AVERROR(ENOMEM);
>> + map->format = dst->format;
>> +
>> + err = vulkan_map_frame_to_mem(hwfc, map, src, AV_HWFRAME_MAP_READ);
>> + if (err)
>> + return err;
>> +
>> + err = av_frame_copy(dst, map);
>> + av_frame_free(&map);
>> + return err;
>> + }
>> +
>> + /* Create buffers */
>> + for (int i = 0; i < planes; i++) {
>> + int h = dst->height;
>> + int p_height = i > 0 ? AV_CEIL_RSHIFT(h, log2_chroma) : h;
>> +
>> + tmp.linesize[i] = dst->linesize[i];
>> + err = create_buf(dev_ctx, &buf[i], p_height,
>> + &tmp.linesize[i], VK_BUFFER_USAGE_TRANSFER_DST_BIT,
>> + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, NULL, NULL);
>> + }
>> +
>> + /* Copy image to buffer */
>> + if ((err = transfer_image_buf(dev_ctx, f, buf, tmp.linesize,
>> + dst->width, dst->height, dst->format, 1)))
>> + goto end;
>> +
>> + /* Map, copy buffer to frame, unmap */
>> + if ((err = map_buffers(dev_ctx, buf, tmp.data, planes, 1)))
>> + goto end;
>> +
>> + av_image_copy(dst->data, dst->linesize, (const uint8_t **)tmp.data,
>> + tmp.linesize, dst->format, dst->width, dst->height);
>> +
>> + err = unmap_buffers(dev_ctx, buf, planes, 0);
>> +
>> +end:
>> + for (int i = 0; i < planes; i++)
>> + free_buf(dev_ctx, &buf[i]);
>> +
>> + return err;
>> +}
>> ...
>> diff --git a/libavutil/hwcontext_vulkan.h b/libavutil/hwcontext_vulkan.h
>> new file mode 100644
>> index 0000000000..4146f14d6e
>> --- /dev/null
>> +++ b/libavutil/hwcontext_vulkan.h
>> @@ -0,0 +1,152 @@
>> +/*
>> + * This file is part of FFmpeg.
>> + *
>> + * FFmpeg is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU Lesser General Public
>> + * License as published by the Free Software Foundation; either
>> + * version 2.1 of the License, or (at your option) any later version.
>> + *
>> + * FFmpeg is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>> + * Lesser General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU Lesser General Public
>> + * License along with FFmpeg; if not, write to the Free Software
>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>> + */
>> +
>> +#ifndef AVUTIL_HWCONTEXT_VULKAN_H
>> +#define AVUTIL_HWCONTEXT_VULKAN_H
>> +
>> +#include <vulkan/vulkan.h>
>> +
>> +/**
>> + * @file
>> + * API-specific header for AV_HWDEVICE_TYPE_VULKAN.
>> + *
>> + * For user-allocated pools, AVHWFramesContext.pool must return AVBufferRefs
>> + * with the data pointer set to an AVVkFrame.
>> + */
>> +
>> +/**
>> + * Main Vulkan context, allocated as AVHWDeviceContext.hwctx.
>> + * All of these can be set before init to change what the context uses
>> + */
>> +typedef struct AVVulkanDeviceContext {
>> + /**
>> + * Custom memory allocator, else NULL
>> + */
>> + const VkAllocationCallbacks *alloc;
>>
>
> Do you have some specific use-case in mind for this? (You haven't used it in anything so far.)
>
For some weird API users who want/use a custom allocator. The spec does say to use the same allocator throughout all the API.
We could link it by default to av_malloc, but its a lot of unnecessary code.
>> + /**
>> + * Instance
>> + */
>> + VkInstance inst;
>> + /**
>> + * Physical device
>> + */
>> + VkPhysicalDevice phys_dev;
>> + /**
>> + * Activated physical device
>> + */
>> + VkDevice act_dev;
>>
>
> I weakly argue for not abbreviating names in the public API like this (but feel free to ignore me).
>
They're commented. I'd rather not go through so many lines of code realigning every substitution.
>> + /**
>> + * Queue family index for graphics
>> + */
>> + int queue_family_index;
>> + /**
>> + * Queue family index for transfer ops only. By default, the priority order
>> + * is dedicated transfer > dedicated compute > graphics.
>> + */
>> + int queue_family_tx_index;
>>
>
> In my experience "tx" is always short for "transmit", not for "transfer".
>
In codecs it rarely means anything other than "transform". In radio and some other software it rarely means anything other than "transfer". I'll keep it.
>> + /**
>> + * Queue family index for compute ops. Will be equal to the graphics
>> + * one unless a dedicated transfer queue is found.
>> + */
>> + int queue_family_comp_index;
>> + /**
>> + * The UUID of the selected physical device.
>> + */
>> + uint8_t device_uuid[VK_UUID_SIZE];
>> +} AVVulkanDeviceContext;
>> +
>> +/**
>> + * Allocated as AVHWFramesContext.hwctx, used to set pool-specific options
>> + */
>> +typedef struct AVVulkanFramesContext {
>> + /**
>> + * Controls the tiling of output frames.
>> + */
>> + VkImageTiling tiling;
>> + /**
>> + * Defines extra usage of output frames. This is bitwise OR'd with the
>> + * standard usage flags (SAMPLED, STORAGE, TRANSFER_SRC and TRANSFER_DST).
>>
>
> (Referred to somewhere above.)
>
>> + */
>> + VkImageUsageFlagBits usage;
>> + /**
>> + * Extension data for image creation. By default, if the extension is
>> + * available, this will be chained to a VkImageFormatListCreateInfoKHR.
>> + */
>> + void *create_pnext;
>> + /**
>> + * Extension data for memory allocation. Must have as many entries as
>> + * the number of planes of the sw_format.
>> + * This will be chained to VkExportMemoryAllocateInfo, which is used
>> + * to make all pool images exportable to other APIs.
>> + */
>> + void *alloc_pnext[AV_NUM_DATA_POINTERS];
>> +} AVVulkanFramesContext;
>> +
>> +/*
>> + * Frame structure, the VkFormat of the image will always match
>> + * the pool's sw_format.
>> + * All frames, imported or allocated, will be created with the
>> + * VK_IMAGE_CREATE_ALIAS_BIT flag set, so the memory may be aliased if needed.
>> + */
>> +typedef struct AVVkFrame {
>> + /**
>> + * Vulkan images to which the memory is bound to.
>> + */
>> + VkImage img[AV_NUM_DATA_POINTERS];
>> +
>> + /**
>> + * Same tiling must be used for all images.
>> + */
>> + VkImageTiling tiling;
>> +
>> + /**
>> + * Memory backing the images. Could be less than the amount of images
>> + * if importing from a DRM or VAAPI frame.
>>
>
> Or absent entirely?
>
No, there must always be memory backing the image. With DRM/VAAPI they're the imported FD(s).
>> + */
>> + VkDeviceMemory mem[AV_NUM_DATA_POINTERS];
>> + size_t size[AV_NUM_DATA_POINTERS];
>> +
>> + /**
>> + * OR'd flags for all memory allocated
>> + */
>> + VkMemoryPropertyFlagBits flags;
>> +
>> + /**
>> + * Updated after every barrier
>> + */
>> + VkAccessFlagBits access[AV_NUM_DATA_POINTERS];
>> + VkImageLayout layout[AV_NUM_DATA_POINTERS];
>> +
>> + /**
>> + * Per-image semaphores. Must not be freed manually. Must be waited on
>> + * and signalled at every queue submission.
>>
>
> Perhaps a little more explanation of exactly what is needed on reads/writes would be helpful here. As written it sounds like multiple readers must be serialised by it, which I'm not sure is intended.
>
Yes, they must be serialized. Not sure how else to explain it, I think the text is clear to me.
>> + */
>> + VkSemaphore sem[AV_NUM_DATA_POINTERS];
>> +
>> + /**
>> + * Internal data.
>> + */
>> + struct AVVkFrameInternal *internal;
>> +} AVVkFrame;
>> +
>> +/**
>> + * Returns the format of each image up to the number of planes for a given sw_format.
>> + */
>> +const VkFormat *av_vkfmt_from_pixfmt(enum AVPixelFormat p);
>> +
>> +#endif /* AVUTIL_HWCONTEXT_VULKAN_H */
>> ...
>> diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
>> index 37ecebd501..5640c9f23d 100644
>> --- a/libavutil/pixfmt.h
>> +++ b/libavutil/pixfmt.h
>> @@ -348,6 +348,13 @@ enum AVPixelFormat {
>> AV_PIX_FMT_NV24, ///< planar YUV 4:4:4, 24bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
>> AV_PIX_FMT_NV42, ///< as above, but U and V bytes are swapped
>>
>> + /**
>> + * Vulkan hardware images.
>> + *
>> + * data[0] contain an AVVkFrame
>>
>
> points to an AVVkFrame?
>
Fixed.
>> + */
>> + AV_PIX_FMT_VULKAN,
>> +
>> AV_PIX_FMT_NB ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
>> };
>>
>> --
>> 2.25.0.rc2
>>
>
> Thanks,
>
> - Mark
> _______________________________________________
> 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".
>
On Sat, 18 Jan 2020 20:27:12 +0000
Mark Thompson <sw@jkqxz.net> wrote:
> On 10/01/2020 21:05, Lynne wrote:
> > This is modelled as a transfer, as we have today, but where both
> > the src and the dst are hardware frames with hw contexts. We need
> > to be careful to ensure the contexts are compatible - particularly,
> > we cannot do transfers where one of the frames has been mapped via
> > a derived frames context - we can only do transfers for frames that
> > were directly allocated by the specified context.
>
> Why? A derived frames context should be mostly treatable as a normal
> frames context in the mapped-to device, so I'm not seeing where this
> restriction is coming from.
>
> (Is there some particular case which doesn't work that this helps to
> avoid?)
My experience was that when dealing with a mapped frame, it would chain
back to the original context to handle transfers, which let to broken
functionality in my testing. But also keep in mind that, in practice,
we don't have scenarios today where this is even interesting. In the
case of Intel/AMD and vaapi+vulkan, we can use mapping all the way
through, while on nvidia and cuda+vulkan, we use copies all the way
through.
If we actually come across a scenario where mixed mapping and copying
is useful, we can try and reason about it and see what needs to change.
--phil
On Sat, 18 Jan 2020 20:23:00 +0000
Mark Thompson <sw@jkqxz.net> wrote:
> > typedef struct AVHWDeviceInternal AVHWDeviceInternal;
> > diff --git a/libavutil/hwcontext_cuda.c b/libavutil/hwcontext_cuda.c
> > index 30611b1912..18abb87bbd 100644
> > --- a/libavutil/hwcontext_cuda.c
> > +++ b/libavutil/hwcontext_cuda.c
> > @@ -21,6 +21,9 @@
> > #include "hwcontext.h"
> > #include "hwcontext_internal.h"
> > #include "hwcontext_cuda_internal.h"
> > +#if CONFIG_VULKAN
> > +#include "hwcontext_vulkan.h"
> > +#endif
> > #include "cuda_check.h"
> > #include "mem.h"
> > #include "pixdesc.h"
> > @@ -42,6 +45,9 @@ static const enum AVPixelFormat
> > supported_formats[] = { AV_PIX_FMT_YUV444P16,
> > AV_PIX_FMT_0RGB32,
> > AV_PIX_FMT_0BGR32,
> > +#if CONFIG_VULKAN
> > + AV_PIX_FMT_VULKAN,
> > +#endif
>
> Do all devices we can do CUDA on also support Vulkan? If not, this
> should probably filter it out in get_constraints() to avoid exposing
> something which can't possibly work.
I don't have any hardware to test with, but I guess that in theory, we
do - sufficiently old hardware, with legacy driver branches will
support cuda and not vulkan, but it's unclear what we could do beyond
what we already have to handle that. If there's no vulkan support, then
we will not a vulkan device with a matching UUID and things will error
out at that stage. At the moment, the only mechanism I can think of to
detect lack of support is to do the UUID check, but somehow try and do
it early enough to affect the supported formats, which seems dubious to
me. So, it'll error out later than you really want, and possibly with a
slightly unclear message but it'll not do anything wrong.
--phil
Quoting Lynne (2020-01-10 22:05:21)
> commit d5f1bbc61fab452803443511b1241931169359b7
> Author: Lynne <dev@lynne.ee>
> Date: Wed Aug 28 21:58:10 2019 +0100
>
> lavu: add Vulkan hwcontext code
>
> This commit adds the necessary code to initialize and use a Vulkan device
> within the hwcontext libavutil framework.
> Currently direct mapping to VAAPI and DRM frames is functional, and
> transfers to CUDA and native frames are supported.
>
> Lets hope the future Vulkan video decode extension fits well within this
> framework.
>
> /*
> * This file is part of FFmpeg.
> *
> * FFmpeg is free software; you can redistribute it and/or
> * modify it under the terms of the GNU Lesser General Public
> * License as published by the Free Software Foundation; either
> * version 2.1 of the License, or (at your option) any later version.
> *
> * FFmpeg is distributed in the hope that it will be useful,
> * but WITHOUT ANY WARRANTY; without even the implied warranty of
> * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> * Lesser General Public License for more details.
> *
> * You should have received a copy of the GNU Lesser General Public
> * License along with FFmpeg; if not, write to the Free Software
> * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> */
>
> #ifndef AVUTIL_HWCONTEXT_VULKAN_H
> #define AVUTIL_HWCONTEXT_VULKAN_H
>
> #include <vulkan/vulkan.h>
>
> /**
> * @file
> * API-specific header for AV_HWDEVICE_TYPE_VULKAN.
> *
> * For user-allocated pools, AVHWFramesContext.pool must return AVBufferRefs
> * with the data pointer set to an AVVkFrame.
> */
>
> /**
> * Main Vulkan context, allocated as AVHWDeviceContext.hwctx.
> * All of these can be set before init to change what the context uses
> */
> typedef struct AVVulkanDeviceContext {
> /**
> * Custom memory allocator, else NULL
> */
> const VkAllocationCallbacks *alloc;
> /**
> * Instance
> */
> VkInstance inst;
> /**
> * Physical device
> */
> VkPhysicalDevice phys_dev;
> /**
> * Activated physical device
> */
> VkDevice act_dev;
Where is this 'activated' terminology from? From what I can see, the
spec calls this a 'logical' device. Would be nice to be consistent with
it.
> /**
> * Queue family index for graphics
> */
> int queue_family_index;
What is this for? I don't see it used anywhere.
> /**
> * Queue family index for transfer ops only. By default, the priority order
> * is dedicated transfer > dedicated compute > graphics.
> */
IIUC the second sentence talks about how the internal device
creation/derivation code works, but that isn't made very clear. Maybe
make it a
@note the av_hwdevice_create() will set those fields like this...
> int queue_family_tx_index;
> /**
> * Queue family index for compute ops. Will be equal to the graphics
> * one unless a dedicated transfer queue is found.
> */
> int queue_family_comp_index;
Same comment as above.
> /**
> * The UUID of the selected physical device.
> */
> uint8_t device_uuid[VK_UUID_SIZE];
Do we really need to export this here? It can be queried from phys_dev,
no?
> } AVVulkanDeviceContext;
>
> /**
> * Allocated as AVHWFramesContext.hwctx, used to set pool-specific options
> */
> typedef struct AVVulkanFramesContext {
> /**
> * Controls the tiling of output frames.
> */
> VkImageTiling tiling;
> /**
> * Defines extra usage of output frames. This is bitwise OR'd with the
> * standard usage flags (SAMPLED, STORAGE, TRANSFER_SRC and TRANSFER_DST).
> */
> VkImageUsageFlagBits usage;
> /**
> * Extension data for image creation. By default, if the extension is
> * available, this will be chained to a VkImageFormatListCreateInfoKHR.
> */
> void *create_pnext;
> /**
> * Extension data for memory allocation. Must have as many entries as
> * the number of planes of the sw_format.
> * This will be chained to VkExportMemoryAllocateInfo, which is used
> * to make all pool images exportable to other APIs.
> */
> void *alloc_pnext[AV_NUM_DATA_POINTERS];
> } AVVulkanFramesContext;
>
> /*
> * Frame structure, the VkFormat of the image will always match
> * the pool's sw_format.
> * All frames, imported or allocated, will be created with the
> * VK_IMAGE_CREATE_ALIAS_BIT flag set, so the memory may be aliased if needed.
> */
> typedef struct AVVkFrame {
> /**
> * Vulkan images to which the memory is bound to.
> */
> VkImage img[AV_NUM_DATA_POINTERS];
>
> /**
> * Same tiling must be used for all images.
> */
> VkImageTiling tiling;
>
> /**
> * Memory backing the images. Could be less than the amount of images
> * if importing from a DRM or VAAPI frame.
> */
> VkDeviceMemory mem[AV_NUM_DATA_POINTERS];
> size_t size[AV_NUM_DATA_POINTERS];
>
> /**
> * OR'd flags for all memory allocated
> */
> VkMemoryPropertyFlagBits flags;
>
> /**
> * Updated after every barrier
> */
> VkAccessFlagBits access[AV_NUM_DATA_POINTERS];
> VkImageLayout layout[AV_NUM_DATA_POINTERS];
>
> /**
> * Per-image semaphores. Must not be freed manually. Must be waited on
> * and signalled at every queue submission.
> */
> VkSemaphore sem[AV_NUM_DATA_POINTERS];
>
> /**
> * Internal data.
> */
> struct AVVkFrameInternal *internal;
> } AVVkFrame;
This is a pretty big and complicated struct and its size has to be
hardcoded in the ABI IIUC. Do we want a constructor for it?
Jan 21, 2020, 12:08 by anton@khirnov.net:
> Quoting Lynne (2020-01-10 22:05:21)
>
>> /**
>> * Activated physical device
>> */
>> VkDevice act_dev;
>>
>
> Where is this 'activated' terminology from? From what I can see, the
> spec calls this a 'logical' device. Would be nice to be consistent with
> it.
>
Its just the current active device. Not really wanting to change it, its pretty clear what it is from the type.
>> /**
>> * Queue family index for graphics
>> */
>> int queue_family_index;
>>
>
> What is this for? I don't see it used anywhere.
>
Its required to do anything graphics-related (like non-compute shaders, which lavfi will support in a future patch). You need to know it at init time and at runtime, and there's nothing you can call to know what its been initialized as.
>> /**
>> * Queue family index for transfer ops only. By default, the priority order
>> * is dedicated transfer > dedicated compute > graphics.
>> */
>>
>
> IIUC the second sentence talks about how the internal device
> creation/derivation code works, but that isn't made very clear. Maybe
> make it a
> @note the av_hwdevice_create() will set those fields like this...
>
Done.
>> int queue_family_tx_index;
>> /**
>> * Queue family index for compute ops. Will be equal to the graphics
>> * one unless a dedicated transfer queue is found.
>> */
>> int queue_family_comp_index;
>>
>
> Same comment as above.
>
Fixed.
>> /**
>> * The UUID of the selected physical device.
>> */
>> uint8_t device_uuid[VK_UUID_SIZE];
>>
>
> Do we really need to export this here? It can be queried from phys_dev,
> no?
>
Actually no, so removed it and changed hwcontext_cuda to use vkGetPhysicalDeviceProperties2.
>> } AVVulkanDeviceContext;
>>
>> /**
>> * Allocated as AVHWFramesContext.hwctx, used to set pool-specific options
>> */
>> typedef struct AVVulkanFramesContext {
>> /**
>> * Controls the tiling of output frames.
>> */
>> VkImageTiling tiling;
>> /**
>> * Defines extra usage of output frames. This is bitwise OR'd with the
>> * standard usage flags (SAMPLED, STORAGE, TRANSFER_SRC and TRANSFER_DST).
>> */
>> VkImageUsageFlagBits usage;
>> /**
>> * Extension data for image creation. By default, if the extension is
>> * available, this will be chained to a VkImageFormatListCreateInfoKHR.
>> */
>> void *create_pnext;
>> /**
>> * Extension data for memory allocation. Must have as many entries as
>> * the number of planes of the sw_format.
>> * This will be chained to VkExportMemoryAllocateInfo, which is used
>> * to make all pool images exportable to other APIs.
>> */
>> void *alloc_pnext[AV_NUM_DATA_POINTERS];
>> } AVVulkanFramesContext;
>>
>> /*
>> * Frame structure, the VkFormat of the image will always match
>> * the pool's sw_format.
>> * All frames, imported or allocated, will be created with the
>> * VK_IMAGE_CREATE_ALIAS_BIT flag set, so the memory may be aliased if needed.
>> */
>> typedef struct AVVkFrame {
>> /**
>> * Vulkan images to which the memory is bound to.
>> */
>> VkImage img[AV_NUM_DATA_POINTERS];
>>
>> /**
>> * Same tiling must be used for all images.
>> */
>> VkImageTiling tiling;
>>
>> /**
>> * Memory backing the images. Could be less than the amount of images
>> * if importing from a DRM or VAAPI frame.
>> */
>> VkDeviceMemory mem[AV_NUM_DATA_POINTERS];
>> size_t size[AV_NUM_DATA_POINTERS];
>>
>> /**
>> * OR'd flags for all memory allocated
>> */
>> VkMemoryPropertyFlagBits flags;
>>
>> /**
>> * Updated after every barrier
>> */
>> VkAccessFlagBits access[AV_NUM_DATA_POINTERS];
>> VkImageLayout layout[AV_NUM_DATA_POINTERS];
>>
>> /**
>> * Per-image semaphores. Must not be freed manually. Must be waited on
>> * and signalled at every queue submission.
>> */
>> VkSemaphore sem[AV_NUM_DATA_POINTERS];
>>
>> /**
>> * Internal data.
>> */
>> struct AVVkFrameInternal *internal;
>> } AVVkFrame;
>>
>
> This is a pretty big and complicated struct and its size has to be
> hardcoded in the ABI IIUC. Do we want a constructor for it?
>
Its size too? Didn't know that.
I do think its a good idea to be able to append fields to it, so I've added a av_vk_frame_alloc() function. I've followed what av_frame_alloc is called, though I'm not sure if its too close to that one's name.
Changes are in git.
Quoting Lynne (2020-01-21 18:51:22)
> Jan 21, 2020, 12:08 by anton@khirnov.net:
>
> > Quoting Lynne (2020-01-10 22:05:21)
> >
> >> /**
> >> * Activated physical device
> >> */
> >> VkDevice act_dev;
> >>
> >
> > Where is this 'activated' terminology from? From what I can see, the
> > spec calls this a 'logical' device. Would be nice to be consistent with
> > it.
> >
>
> Its just the current active device. Not really wanting to change it,
> its pretty clear what it is from the type.
Can't really force you, but I'd prefer you did change it. At least drop
'physical' from the doxy, since the spec makes a distinction between
'physical' and 'logical' devices and this is not a physical device.
>
> >> /**
> >> * Queue family index for graphics
> >> */
> >> int queue_family_index;
> >>
> >
> > What is this for? I don't see it used anywhere.
> >
>
> Its required to do anything graphics-related (like non-compute
> shaders, which lavfi will support in a future patch). You need to know
> it at init time and at runtime, and there's nothing you can call to
> know what its been initialized as.
At init time of what? The filter or the hwdevice? I'm wondering if you
can have a situation where you want to use different queue families for
different filters (on a single device).
>
>
> >> /**
> >> * Queue family index for transfer ops only. By default, the priority order
> >> * is dedicated transfer > dedicated compute > graphics.
> >> */
> >>
> >
> > IIUC the second sentence talks about how the internal device
> > creation/derivation code works, but that isn't made very clear. Maybe
> > make it a
> > @note the av_hwdevice_create() will set those fields like this...
> >
>
> Done.
>
>
>
> >> int queue_family_tx_index;
> >> /**
> >> * Queue family index for compute ops. Will be equal to the graphics
> >> * one unless a dedicated transfer queue is found.
> >> */
> >> int queue_family_comp_index;
> >>
> >
> > Same comment as above.
> >
>
> Fixed.
>
>
>
> >> /**
> >> * The UUID of the selected physical device.
> >> */
> >> uint8_t device_uuid[VK_UUID_SIZE];
> >>
> >
> > Do we really need to export this here? It can be queried from phys_dev,
> > no?
> >
>
> Actually no, so removed it and changed hwcontext_cuda to use vkGetPhysicalDeviceProperties2.
>
>
>
> >> } AVVulkanDeviceContext;
> >>
> >> /**
> >> * Allocated as AVHWFramesContext.hwctx, used to set pool-specific options
> >> */
> >> typedef struct AVVulkanFramesContext {
> >> /**
> >> * Controls the tiling of output frames.
> >> */
> >> VkImageTiling tiling;
> >> /**
> >> * Defines extra usage of output frames. This is bitwise OR'd with the
> >> * standard usage flags (SAMPLED, STORAGE, TRANSFER_SRC and TRANSFER_DST).
> >> */
> >> VkImageUsageFlagBits usage;
> >> /**
> >> * Extension data for image creation. By default, if the extension is
> >> * available, this will be chained to a VkImageFormatListCreateInfoKHR.
> >> */
> >> void *create_pnext;
> >> /**
> >> * Extension data for memory allocation. Must have as many entries as
> >> * the number of planes of the sw_format.
> >> * This will be chained to VkExportMemoryAllocateInfo, which is used
> >> * to make all pool images exportable to other APIs.
> >> */
> >> void *alloc_pnext[AV_NUM_DATA_POINTERS];
> >> } AVVulkanFramesContext;
> >>
> >> /*
> >> * Frame structure, the VkFormat of the image will always match
> >> * the pool's sw_format.
> >> * All frames, imported or allocated, will be created with the
> >> * VK_IMAGE_CREATE_ALIAS_BIT flag set, so the memory may be aliased if needed.
> >> */
> >> typedef struct AVVkFrame {
> >> /**
> >> * Vulkan images to which the memory is bound to.
> >> */
> >> VkImage img[AV_NUM_DATA_POINTERS];
> >>
> >> /**
> >> * Same tiling must be used for all images.
> >> */
> >> VkImageTiling tiling;
> >>
> >> /**
> >> * Memory backing the images. Could be less than the amount of images
> >> * if importing from a DRM or VAAPI frame.
> >> */
> >> VkDeviceMemory mem[AV_NUM_DATA_POINTERS];
> >> size_t size[AV_NUM_DATA_POINTERS];
> >>
> >> /**
> >> * OR'd flags for all memory allocated
> >> */
> >> VkMemoryPropertyFlagBits flags;
> >>
> >> /**
> >> * Updated after every barrier
> >> */
> >> VkAccessFlagBits access[AV_NUM_DATA_POINTERS];
> >> VkImageLayout layout[AV_NUM_DATA_POINTERS];
> >>
> >> /**
> >> * Per-image semaphores. Must not be freed manually. Must be waited on
> >> * and signalled at every queue submission.
> >> */
> >> VkSemaphore sem[AV_NUM_DATA_POINTERS];
> >>
> >> /**
> >> * Internal data.
> >> */
> >> struct AVVkFrameInternal *internal;
> >> } AVVkFrame;
> >>
> >
> > This is a pretty big and complicated struct and its size has to be
> > hardcoded in the ABI IIUC. Do we want a constructor for it?
> >
>
> Its size too? Didn't know that.
> I do think its a good idea to be able to append fields to it, so I've
> added a av_vk_frame_alloc() function. I've followed what
> av_frame_alloc is called, though I'm not sure if its too close to that
> one's name.
My original intent with this API was that calles are allowed to provide
their own pools. Not sure if that's still allowed or works though. But
if it is, the caller needs to be able to allocate/free AVkFrame.
Jan 21, 2020, 18:22 by anton@khirnov.net:
> Quoting Lynne (2020-01-21 18:51:22)
>
>> Jan 21, 2020, 12:08 by anton@khirnov.net:
>>
>> > Quoting Lynne (2020-01-10 22:05:21)
>> >
>> >> /**
>> >> * Activated physical device
>> >> */
>> >> VkDevice act_dev;
>> >>
>> >
>> > Where is this 'activated' terminology from? From what I can see, the
>> > spec calls this a 'logical' device. Would be nice to be consistent with
>> > it.
>> >
>>
>> Its just the current active device. Not really wanting to change it,
>> its pretty clear what it is from the type.
>>
>
> Can't really force you, but I'd prefer you did change it. At least drop
> 'physical' from the doxy, since the spec makes a distinction between
> 'physical' and 'logical' devices and this is not a physical device.
>
Done.
>> Its size too? Didn't know that.
>> I do think its a good idea to be able to append fields to it, so I've
>> added a av_vk_frame_alloc() function. I've followed what
>> av_frame_alloc is called, though I'm not sure if its too close to that
>> one's name.
>>
>
> My original intent with this API was that calles are allowed to provide
> their own pools. Not sure if that's still allowed or works though. But
> if it is, the caller needs to be able to allocate/free AVkFrame.
>
They are of course. The first wip of the cuda interop exploited that IIRC.
But I think the issue is that in order for API users to make their own pools they need to
know the size in bytes of AVVkFrame since that's what av_buffer_create() accepts.
I could make a function to return that, but I'm wondering if its somewhat too big of a mess already.
I could instead reserve some memory in the struct, a few hundred bytes would be enough since every Vulkan object has to be allocated on heap.
On 10/01/2020 21:05, Lynne wrote:
> From 04c1836f89d89dcdc892cef66ee82afbcfda9f2d Mon Sep 17 00:00:00 2001
> From: Lynne <dev@lynne.ee>
> Date: Sun, 27 Oct 2019 14:44:00 +0000
> Subject: [PATCH 4/9] lavfi: add Vulkan filtering framework
>
> This commit adds a Vulkan filtering infrastructure for libavfilter.
> It attempts to abstract as much as possible of the Vulkan API from filters.
>
> The way the hwcontext and the framework are designed permits for parallel,
> non-CPU-blocking filtering throughout, with the exception of up/downloading
> and mapping.
> ---
> configure | 3 +
> libavfilter/Makefile | 2 +
> libavfilter/glslang.cpp | 215 +++++++
> libavfilter/glslang.h | 49 ++
> libavfilter/vulkan.c | 1221 +++++++++++++++++++++++++++++++++++++++
> libavfilter/vulkan.h | 323 +++++++++++
> 6 files changed, 1813 insertions(+)
> create mode 100644 libavfilter/glslang.cpp
> create mode 100644 libavfilter/glslang.h
> create mode 100644 libavfilter/vulkan.c
> create mode 100644 libavfilter/vulkan.h
>
> diff --git a/configure b/configure
> index 3113ebfdd8..fc075f2a15 100755
> --- a/configure
> +++ b/configure
> ...
> @@ -6258,6 +6260,7 @@ enabled fontconfig && enable libfontconfig
> enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
> enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
> enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
> +enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper -lSPIRV -lSPIRV-Tools -lSPIRV-Tools-opt -lpthread -lstdc++
Using Debian-packaged glslang, the headers seem to be in slightly different places: SPIRV headers in their own directory under include, so it is just SPIRV/GlslangToSpv.h. With the paths edited, the version in testing works.
I don't whether there is a single official way which we should support, but this looks like it could be an evil source of confusion.
> enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
> require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
> enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
> ...
> diff --git a/libavfilter/glslang.cpp b/libavfilter/glslang.cpp
> new file mode 100644
> index 0000000000..cf534d8ac5
> --- /dev/null
> +++ b/libavfilter/glslang.cpp
> @@ -0,0 +1,215 @@
> +/*
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> +#include <assert.h>
> +#include <pthread.h>
> +
> +extern "C" {
> +#include "libavutil/mem.h"
> +}
> +
> +#include <glslang/Include/ResourceLimits.h>
> +#include <glslang/Include/revision.h>
> +#include <glslang/Public/ShaderLang.h>
> +#include <glslang/SPIRV/GlslangToSpv.h>
(This path too.)
> +
> +#include "glslang.h"
> +
> +using namespace glslang;
> +
> +static pthread_mutex_t glslang_mutex = PTHREAD_MUTEX_INITIALIZER;
> +static int glslang_refcount;
> +
> +int glslang_init(void)
> +{
> + int ret = 1;
> +
> + pthread_mutex_lock(&glslang_mutex);
> + if (glslang_refcount++ == 0)
> + ret = InitializeProcess();
> + pthread_mutex_unlock(&glslang_mutex);
> +
> + return ret;
Inverting the normal sense of success is weird.
> +}
> +
> +void glslang_uninit(void)
> +{
> + pthread_mutex_lock(&glslang_mutex);
> + if (--glslang_refcount == 0)
> + FinalizeProcess();
> + if (glslang_refcount < 0)
Assert? This looks like a "something has gone horribly wrong" case.
> + glslang_refcount = 0;
> + pthread_mutex_unlock(&glslang_mutex);
> +}
> +
> +#define GLSL_VERSION EShTargetVulkan_1_0
> +#define SPIRV_VERSION EShTargetSpv_1_0
> +
> +extern const TBuiltInResource DefaultTBuiltInResource;
> +
> +GLSlangResult *glslang_compile(const char *glsl, enum GLSlangStage stage)
> +{
> + GLSlangResult *res = (GLSlangResult *)av_mallocz(sizeof(*res));
> +
> + static const EShLanguage lang[] = {
> + [GLSLANG_VERTEX] = EShLangVertex,
> + [GLSLANG_FRAGMENT] = EShLangFragment,
> + [GLSLANG_COMPUTE] = EShLangCompute,
> + };
> +
> + assert(glslang_refcount);
> + TShader *shader = new TShader(lang[stage]);
Missing check?
> + shader->setEnvClient(EShClientVulkan, GLSL_VERSION);
> + shader->setEnvTarget(EShTargetSpv, SPIRV_VERSION);
> + shader->setStrings(&glsl, 1);
> + if (!shader->parse(&DefaultTBuiltInResource, GLSL_VERSION, true, EShMsgDefault)) {
> + res->error_msg = av_strdup(shader->getInfoLog());
> + delete shader;
> + return res;
> + }
> +
> + TProgram *prog = new TProgram();
And here.
> + prog->addShader(shader);
> + if (!prog->link(EShMsgDefault)) {
> + res->error_msg = av_strdup(prog->getInfoLog());
> + delete shader;
> + delete prog;
> + return res;
> + }
> +
> + std::vector<unsigned int> spirv;
> + GlslangToSpv(*prog->getIntermediate(lang[stage]), spirv);
> +
> + res->success = true;
> + res->size = spirv.size() * sizeof(unsigned int);
> + res->data = av_memdup(spirv.data(), res->size),
It doesn't look like this is meant to be a comma ^
Return value check.
> + delete shader;
> + delete prog;
> + return res;
> +}
> +
> +// Taken from glslang's examples, which apparently generally bases the choices
> +// on OpenGL specification limits
> +const TBuiltInResource DefaultTBuiltInResource = {
> + /* .MaxLights = */ 32,
> + /* .MaxClipPlanes = */ 6,
> + /* .MaxTextureUnits = */ 32,
> + /* .MaxTextureCoords = */ 32,
> + /* .MaxVertexAttribs = */ 64,
> + /* .MaxVertexUniformComponents = */ 4096,
> + /* .MaxVaryingFloats = */ 64,
> + /* .MaxVertexTextureImageUnits = */ 32,
> + /* .MaxCombinedTextureImageUnits = */ 80,
> + /* .MaxTextureImageUnits = */ 32,
> + /* .MaxFragmentUniformComponents = */ 4096,
> + /* .MaxDrawBuffers = */ 32,
> + /* .MaxVertexUniformVectors = */ 128,
> + /* .MaxVaryingVectors = */ 8,
> + /* .MaxFragmentUniformVectors = */ 16,
> + /* .MaxVertexOutputVectors = */ 16,
> + /* .MaxFragmentInputVectors = */ 15,
> + /* .MinProgramTexelOffset = */ -8,
> + /* .MaxProgramTexelOffset = */ 7,
> + /* .MaxClipDistances = */ 8,
> + /* .MaxComputeWorkGroupCountX = */ 65535,
> + /* .MaxComputeWorkGroupCountY = */ 65535,
> + /* .MaxComputeWorkGroupCountZ = */ 65535,
> + /* .MaxComputeWorkGroupSizeX = */ 1024,
> + /* .MaxComputeWorkGroupSizeY = */ 1024,
> + /* .MaxComputeWorkGroupSizeZ = */ 64,
> + /* .MaxComputeUniformComponents = */ 1024,
> + /* .MaxComputeTextureImageUnits = */ 16,
> + /* .MaxComputeImageUniforms = */ 8,
> + /* .MaxComputeAtomicCounters = */ 8,
> + /* .MaxComputeAtomicCounterBuffers = */ 1,
> + /* .MaxVaryingComponents = */ 60,
> + /* .MaxVertexOutputComponents = */ 64,
> + /* .MaxGeometryInputComponents = */ 64,
> + /* .MaxGeometryOutputComponents = */ 128,
> + /* .MaxFragmentInputComponents = */ 128,
> + /* .MaxImageUnits = */ 8,
> + /* .MaxCombinedImageUnitsAndFragmentOutputs = */ 8,
> + /* .MaxCombinedShaderOutputResources = */ 8,
> + /* .MaxImageSamples = */ 0,
> + /* .MaxVertexImageUniforms = */ 0,
> + /* .MaxTessControlImageUniforms = */ 0,
> + /* .MaxTessEvaluationImageUniforms = */ 0,
> + /* .MaxGeometryImageUniforms = */ 0,
> + /* .MaxFragmentImageUniforms = */ 8,
> + /* .MaxCombinedImageUniforms = */ 8,
> + /* .MaxGeometryTextureImageUnits = */ 16,
> + /* .MaxGeometryOutputVertices = */ 256,
> + /* .MaxGeometryTotalOutputComponents = */ 1024,
> + /* .MaxGeometryUniformComponents = */ 1024,
> + /* .MaxGeometryVaryingComponents = */ 64,
> + /* .MaxTessControlInputComponents = */ 128,
> + /* .MaxTessControlOutputComponents = */ 128,
> + /* .MaxTessControlTextureImageUnits = */ 16,
> + /* .MaxTessControlUniformComponents = */ 1024,
> + /* .MaxTessControlTotalOutputComponents = */ 4096,
> + /* .MaxTessEvaluationInputComponents = */ 128,
> + /* .MaxTessEvaluationOutputComponents = */ 128,
> + /* .MaxTessEvaluationTextureImageUnits = */ 16,
> + /* .MaxTessEvaluationUniformComponents = */ 1024,
> + /* .MaxTessPatchComponents = */ 120,
> + /* .MaxPatchVertices = */ 32,
> + /* .MaxTessGenLevel = */ 64,
> + /* .MaxViewports = */ 16,
> + /* .MaxVertexAtomicCounters = */ 0,
> + /* .MaxTessControlAtomicCounters = */ 0,
> + /* .MaxTessEvaluationAtomicCounters = */ 0,
> + /* .MaxGeometryAtomicCounters = */ 0,
> + /* .MaxFragmentAtomicCounters = */ 8,
> + /* .MaxCombinedAtomicCounters = */ 8,
> + /* .MaxAtomicCounterBindings = */ 1,
> + /* .MaxVertexAtomicCounterBuffers = */ 0,
> + /* .MaxTessControlAtomicCounterBuffers = */ 0,
> + /* .MaxTessEvaluationAtomicCounterBuffers = */ 0,
> + /* .MaxGeometryAtomicCounterBuffers = */ 0,
> + /* .MaxFragmentAtomicCounterBuffers = */ 1,
> + /* .MaxCombinedAtomicCounterBuffers = */ 1,
> + /* .MaxAtomicCounterBufferSize = */ 16384,
> + /* .MaxTransformFeedbackBuffers = */ 4,
> + /* .MaxTransformFeedbackInterleavedComponents = */ 64,
> + /* .MaxCullDistances = */ 8,
> + /* .MaxCombinedClipAndCullDistances = */ 8,
> + /* .MaxSamples = */ 4,
> +#if GLSLANG_PATCH_LEVEL >= 2892
> + /* .maxMeshOutputVerticesNV = */ 256,
> + /* .maxMeshOutputPrimitivesNV = */ 512,
> + /* .maxMeshWorkGroupSizeX_NV = */ 32,
> + /* .maxMeshWorkGroupSizeY_NV = */ 1,
> + /* .maxMeshWorkGroupSizeZ_NV = */ 1,
> + /* .maxTaskWorkGroupSizeX_NV = */ 32,
> + /* .maxTaskWorkGroupSizeY_NV = */ 1,
> + /* .maxTaskWorkGroupSizeZ_NV = */ 1,
> + /* .maxMeshViewCountNV = */ 4,
> +#endif
> +
> + .limits = {
> + /* .nonInductiveForLoops = */ 1,
> + /* .whileLoops = */ 1,
> + /* .doWhileLoops = */ 1,
> + /* .generalUniformIndexing = */ 1,
> + /* .generalAttributeMatrixVectorIndexing = */ 1,
> + /* .generalVaryingIndexing = */ 1,
> + /* .generalSamplerIndexing = */ 1,
> + /* .generalVariableIndexing = */ 1,
> + /* .generalConstantMatrixVectorIndexing = */ 1,
> + }
Why are the designators commented out? Letting the compiler check your ordering seems like a good idea.
> +};
> diff --git a/libavfilter/glslang.h b/libavfilter/glslang.h
> new file mode 100644
> index 0000000000..865af71580
> --- /dev/null
> +++ b/libavfilter/glslang.h
> @@ -0,0 +1,49 @@
> +/*
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> +#pragma once
The pragma isn't used anywhere else in the codebase.
> +
> +#include <stdlib.h>
> +
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
> +int glslang_init(void);
> +void glslang_uninit(void);
> +
> +typedef struct GLSlangResult {
> + int success;
> + const char *error_msg;
> +
> + void *data; /* Shader data or NULL */
> + size_t size;
> +} GLSlangResult;
> +
> +enum GLSlangStage {
> + GLSLANG_VERTEX,
> + GLSLANG_FRAGMENT,
> + GLSLANG_COMPUTE,
> +};
> +
> +/* Compile GLSL into a SPIRV stream, if possible */
> +GLSlangResult *glslang_compile(const char *glsl, enum GLSlangStage stage);
+1, best API ever. (Now why can't glslang or similar projects just give us this function themselves?)
> +
> +#ifdef __cplusplus
> +}
> +#endif
> diff --git a/libavfilter/vulkan.c b/libavfilter/vulkan.c
> new file mode 100644
> index 0000000000..99aaeb2ef4
> --- /dev/null
> +++ b/libavfilter/vulkan.c
> ...
> +
> +int ff_vk_filter_config_output_inplace(AVFilterLink *outlink)
> +{
> + int err;
> + AVFilterContext *avctx = outlink->src;
> + VulkanFilterContext *s = avctx->priv;
> +
> + av_buffer_unref(&outlink->hw_frames_ctx);
> +
> + if (!s->device_ref) {
> + if (!avctx->hw_device_ctx) {
> + av_log(avctx, AV_LOG_ERROR, "Vulkan filtering requires a "
> + "Vulkan device.\n");
> + return AVERROR(EINVAL);
> + }
> +
> + err = vulkan_filter_set_device(avctx, avctx->hw_device_ctx);
> + if (err < 0)
> + return err;
> + }
> +
> + outlink->hw_frames_ctx = av_buffer_ref(s->frames_ref);
Missing check.
> + outlink->w = s->output_width;
> + outlink->h = s->output_height;
> +
> + return 0;
> +}
> ...
The rest of this all looks generally sensible, though I don't have the detailed Vulkan knowledge to go through it properly. Probably fine in any case, since it's all internal and we aren't locking anything down.
> diff --git a/libavfilter/vulkan.h b/libavfilter/vulkan.h
> new file mode 100644
> index 0000000000..8d4def1a00
> --- /dev/null
> +++ b/libavfilter/vulkan.h
> @@ -0,0 +1,323 @@
> +/*
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> +#ifndef AVFILTER_VULKAN_COMMON_H
> +#define AVFILTER_VULKAN_COMMON_H
Looks like you've renamed it since then.
> +
> ...
Thanks,
- Mark
On 19/01/2020 16:51, Philip Langdale wrote:
> On Sat, 18 Jan 2020 20:23:00 +0000
> Mark Thompson <sw@jkqxz.net> wrote:
>
>>> typedef struct AVHWDeviceInternal AVHWDeviceInternal;
>>> diff --git a/libavutil/hwcontext_cuda.c b/libavutil/hwcontext_cuda.c
>>> index 30611b1912..18abb87bbd 100644
>>> --- a/libavutil/hwcontext_cuda.c
>>> +++ b/libavutil/hwcontext_cuda.c
>>> @@ -21,6 +21,9 @@
>>> #include "hwcontext.h"
>>> #include "hwcontext_internal.h"
>>> #include "hwcontext_cuda_internal.h"
>>> +#if CONFIG_VULKAN
>>> +#include "hwcontext_vulkan.h"
>>> +#endif
>>> #include "cuda_check.h"
>>> #include "mem.h"
>>> #include "pixdesc.h"
>>> @@ -42,6 +45,9 @@ static const enum AVPixelFormat
>>> supported_formats[] = { AV_PIX_FMT_YUV444P16,
>>> AV_PIX_FMT_0RGB32,
>>> AV_PIX_FMT_0BGR32,
>>> +#if CONFIG_VULKAN
>>> + AV_PIX_FMT_VULKAN,
>>> +#endif
>>
>> Do all devices we can do CUDA on also support Vulkan? If not, this
>> should probably filter it out in get_constraints() to avoid exposing
>> something which can't possibly work.
>
> I don't have any hardware to test with, but I guess that in theory, we
> do - sufficiently old hardware, with legacy driver branches will
> support cuda and not vulkan, but it's unclear what we could do beyond
> what we already have to handle that. If there's no vulkan support, then
> we will not a vulkan device with a matching UUID and things will error
> out at that stage. At the moment, the only mechanism I can think of to
> detect lack of support is to do the UUID check, but somehow try and do
> it early enough to affect the supported formats, which seems dubious to
> me. So, it'll error out later than you really want, and possibly with a
> slightly unclear message but it'll not do anything wrong.
Fair enough - I agree there isn't much value to adding a lot more code to check it earlier.
Thanks,
- Mark
On 19/01/2020 16:41, Philip Langdale wrote:
> On Sat, 18 Jan 2020 20:27:12 +0000
> Mark Thompson <sw@jkqxz.net> wrote:
>
>> On 10/01/2020 21:05, Lynne wrote:
>>> This is modelled as a transfer, as we have today, but where both
>>> the src and the dst are hardware frames with hw contexts. We need
>>> to be careful to ensure the contexts are compatible - particularly,
>>> we cannot do transfers where one of the frames has been mapped via
>>> a derived frames context - we can only do transfers for frames that
>>> were directly allocated by the specified context.
>>
>> Why? A derived frames context should be mostly treatable as a normal
>> frames context in the mapped-to device, so I'm not seeing where this
>> restriction is coming from.
>>
>> (Is there some particular case which doesn't work that this helps to
>> avoid?)
>
> My experience was that when dealing with a mapped frame, it would chain
> back to the original context to handle transfers, which let to broken
> functionality in my testing. But also keep in mind that, in practice,
> we don't have scenarios today where this is even interesting. In the
> case of Intel/AMD and vaapi+vulkan, we can use mapping all the way
> through, while on nvidia and cuda+vulkan, we use copies all the way
> through.
I'm curious what the specific case where it goes wrong actually is
> If we actually come across a scenario where mixed mapping and copying
> is useful, we can try and reason about it and see what needs to change.
Yeah, fair enough.
- Mark
On 19/01/2020 13:11, Lynne wrote:
> Jan 18, 2020, 20:23 by sw@jkqxz.net:
>
>> On 10/01/2020 21:05, Lynne wrote:
>>
>> The CUDA parts look like they could be split off into a separate commit? (It's already huge.)
>>
>
> I don't really want broken commits or commits with dead code.
Shouldn't be - you've got nice #ifdef markers surrounding exactly the right pieces to splice out :)
>>> @@ -3639,7 +3641,7 @@ avformat_deps="avcodec avutil"
>>> avformat_suggest="libm network zlib"
>>> avresample_deps="avutil"
>>> avresample_suggest="libm"
>>> -avutil_suggest="clock_gettime ffnvcodec libm libdrm libmfx opencl user32 vaapi videotoolbox corefoundation corevideo coremedia bcrypt"
>>> +avutil_suggest="clock_gettime ffnvcodec libm libdrm libmfx opencl user32 vaapi vulkan videotoolbox corefoundation corevideo coremedia bcrypt"
>>> postproc_deps="avutil gpl"
>>> postproc_suggest="libm"
>>> swresample_deps="avutil"
>>> @@ -6626,6 +6628,9 @@ enabled vdpau &&
>>>
>>> enabled crystalhd && check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd
>>>
>>> +enabled vulkan &&
>>> + require_pkg_config vulkan "vulkan >= 1.1.97" "vulkan/vulkan.h" vkCreateInstance
>>>
>>
>> Presumably you have some specific requirement in mind which wants this version - can you note it somewhere? (Either here or in the commit message.)
>>
>
> The DRM export/import and I think the semaphore import API.
> Its not a new version, its been out for a long time.
About a year, which probably isn't long enough to assume it's everywhere. I guess it doesn't really matter, though, because it will only ever increase when something extra is added.
>>> ...
>>> +static int cuda_device_derive(AVHWDeviceContext *device_ctx,
>>> + AVHWDeviceContext *src_ctx,
>>> + int flags) {
>>> + AVCUDADeviceContext *hwctx = device_ctx->hwctx;
>>> + CudaFunctions *cu;
>>> + const char *src_uuid = NULL;
>>> + CUcontext dummy;
>>> + int ret, i, device_count, dev_active = 0;
>>> + unsigned int dev_flags = 0;
>>> +
>>> + const unsigned int desired_flags = CU_CTX_SCHED_BLOCKING_SYNC;
>>> +
>>> + switch (src_ctx->type) {
>>> +#if CONFIG_VULKAN
>>> + case AV_HWDEVICE_TYPE_VULKAN: {
>>> + AVVulkanDeviceContext *vkctx = src_ctx->hwctx;
>>> + src_uuid = vkctx->device_uuid;
>>> + break;
>>> + }
>>> +#endif
>>> + default:
>>> + return AVERROR(ENOSYS);
>>> + }
>>> +
>>> + if (!src_uuid) {
>>> + av_log(device_ctx, AV_LOG_ERROR,
>>> + "Failed to get UUID of source device.\n");
>>> + goto error;
>>> + }
>>> +
>>> + if (cuda_device_init(device_ctx) < 0)
>>> + goto error;
>>> +
>>> + cu = hwctx->internal->cuda_dl;
>>> +
>>> + ret = CHECK_CU(cu->cuInit(0));
>>> + if (ret < 0)
>>> + goto error;
>>> +
>>> + ret = CHECK_CU(cu->cuDeviceGetCount(&device_count));
>>> + if (ret < 0)
>>> + goto error;
>>> +
>>> + hwctx->internal->cuda_device = -1;
>>> + for (i = 0; i < device_count; i++) {
>>> + CUdevice dev;
>>> + CUuuid uuid;
>>> +
>>> + ret = CHECK_CU(cu->cuDeviceGet(&dev, i));
>>> + if (ret < 0)
>>> + goto error;
>>> +
>>> + ret = CHECK_CU(cu->cuDeviceGetUuid(&uuid, dev));
>>> + if (ret < 0)
>>> + goto error;
>>> +
>>> + if (memcmp(src_uuid, uuid.bytes, sizeof (uuid.bytes)) == 0) {
>>> + hwctx->internal->cuda_device = dev;
>>> + break;
>>> + }
>>> + }
>>> +
>>> + if (hwctx->internal->cuda_device == -1) {
>>> + av_log(device_ctx, AV_LOG_ERROR, "Could not derive CUDA device.\n");
>>>
>>
>> This error is maybe more like "Can't find the matching CUDA device to the supplied Vulkan device".
>>
>
> Let's keep it that way, its not meant to be vulkan specific, though its only used by vulkan currently.
Good point! Fair enough.
>>> + goto error;
>>> + }
>>> +
>>> + hwctx->internal->flags = flags;
>>> +
>>> + if (flags & AV_CUDA_USE_PRIMARY_CONTEXT) {
>>> + ret = CHECK_CU(cu->cuDevicePrimaryCtxGetState(hwctx->internal->cuda_device, &dev_flags, &dev_active));
>>> + if (ret < 0)
>>> + goto error;
>>> +
>>> + if (dev_active && dev_flags != desired_flags) {
>>> + av_log(device_ctx, AV_LOG_ERROR, "Primary context already active with incompatible flags.\n");
>>> + goto error;
>>> + } else if (dev_flags != desired_flags) {
>>> + ret = CHECK_CU(cu->cuDevicePrimaryCtxSetFlags(hwctx->internal->cuda_device, desired_flags));
>>> + if (ret < 0)
>>> + goto error;
>>> + }
>>> +
>>> + ret = CHECK_CU(cu->cuDevicePrimaryCtxRetain(&hwctx->cuda_ctx, hwctx->internal->cuda_device));
>>> + if (ret < 0)
>>> + goto error;
>>> + } else {
>>> + ret = CHECK_CU(cu->cuCtxCreate(&hwctx->cuda_ctx, desired_flags, hwctx->internal->cuda_device));
>>> + if (ret < 0)
>>> + goto error;
>>> +
>>> + CHECK_CU(cu->cuCtxPopCurrent(&dummy));
>>> + }
>>> +
>>> + hwctx->internal->is_allocated = 1;
>>> +
>>> + // Setting stream to NULL will make functions automatically use the default CUstream
>>> + hwctx->stream = NULL;
>>> +
>>> + return 0;
>>> +
>>> +error:
>>> + cuda_device_uninit(device_ctx);
>>> + return AVERROR_UNKNOWN;
>>> +}
>>> +
>>> const HWContextType ff_hwcontext_type_cuda = {
>>> .type = AV_HWDEVICE_TYPE_CUDA,
>>> .name = "CUDA",
>>> @@ -397,6 +517,7 @@ const HWContextType ff_hwcontext_type_cuda = {
>>> .frames_priv_size = sizeof(CUDAFramesContext),
>>>
>>> .device_create = cuda_device_create,
>>> + .device_derive = cuda_device_derive,
>>> .device_init = cuda_device_init,
>>> .device_uninit = cuda_device_uninit,
>>> .frames_get_constraints = cuda_frames_get_constraints,
>>> ...
>>> diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
>>> new file mode 100644
>>> index 0000000000..d4eb8ffd35
>>> --- /dev/null
>>> +++ b/libavutil/hwcontext_vulkan.c
>>> @@ -0,0 +1,2804 @@
>>> ...
>>> +
>>> +static const struct {
>>> + enum AVPixelFormat pixfmt;
>>> + const VkFormat vkfmts[3];
>>> +} vk_pixfmt_map[] = {
>>> + { AV_PIX_FMT_GRAY8, { VK_FORMAT_R8_UNORM } },
>>> + { AV_PIX_FMT_GRAY16, { VK_FORMAT_R16_UNORM } },
>>> + { AV_PIX_FMT_GRAYF32, { VK_FORMAT_R32_SFLOAT } },
>>> +
>>> + { AV_PIX_FMT_NV12, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8G8_UNORM } },
>>> + { AV_PIX_FMT_P010, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16G16_UNORM } },
>>>
>>
>> Is P010 still safe when the low bits might have any value?
>>
>
> Our padding is in the top bits. Vulkan defines it in the bottom bits, hence we can't use it.
? Our padding is definitely in the bottom bits, since it's defined to be consistent with all the hardware using it.
> I can't see why it wouldn't be safe. Every code that deals with user-supplied frames must rely they're junk.
Probably close enough for government work, but still slightly off. If the only operation you can do is load it into a float as UNORM then a top value with zeroes would be slightly off-white and the colourspace-conversion nazis will hunt you down.
>>> + { AV_PIX_FMT_P016, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16G16_UNORM } },
>>> +
>>> + { AV_PIX_FMT_YUV420P, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM } },
>>> + { AV_PIX_FMT_YUV422P, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM } },
>>> + { AV_PIX_FMT_YUV444P, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM } },
>>> +
>>> + { AV_PIX_FMT_YUV420P16, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
>>> + { AV_PIX_FMT_YUV422P16, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
>>> + { AV_PIX_FMT_YUV444P16, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
>>> +
>>> + { AV_PIX_FMT_ABGR, { VK_FORMAT_A8B8G8R8_UNORM_PACK32 } },
>>> + { AV_PIX_FMT_BGRA, { VK_FORMAT_B8G8R8A8_UNORM } },
>>> + { AV_PIX_FMT_RGBA, { VK_FORMAT_R8G8B8A8_UNORM } },
>>> + { AV_PIX_FMT_RGB24, { VK_FORMAT_R8G8B8_UNORM } },
>>> + { AV_PIX_FMT_BGR24, { VK_FORMAT_B8G8R8_UNORM } },
>>> + { AV_PIX_FMT_RGB48, { VK_FORMAT_R16G16B16_UNORM } },
>>> + { AV_PIX_FMT_RGBA64, { VK_FORMAT_R16G16B16A16_UNORM } },
>>> + { AV_PIX_FMT_RGB565, { VK_FORMAT_R5G6B5_UNORM_PACK16 } },
>>> + { AV_PIX_FMT_BGR565, { VK_FORMAT_B5G6R5_UNORM_PACK16 } },
>>> + { AV_PIX_FMT_BGR0, { VK_FORMAT_B8G8R8A8_UNORM } },
>>> + { AV_PIX_FMT_0BGR, { VK_FORMAT_A8B8G8R8_UNORM_PACK32 } },
>>> + { AV_PIX_FMT_RGB0, { VK_FORMAT_R8G8B8A8_UNORM } },
>>> +
>>> + { AV_PIX_FMT_GBRPF32, { VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32_SFLOAT } },
>>> +};
>>> +
>>> ...
>>> +static int vulkan_device_create(AVHWDeviceContext *ctx, const char *device,
>>> + AVDictionary *opts, int flags)
>>> +{
>>> + VulkanDeviceSelection dev_select = { 0 };
>>> + if (device && device[0]) {
>>> + char *end = NULL;
>>> + dev_select.index = strtol(device, &end, 10);
>>> + if (end == device) {
>>> + dev_select.index = 0;
>>> + dev_select.name = device;
>>> + }
>>> + }
>>>
>>
>> Is it worth making uuid=f00 work here as well? (From opts rather than device: "-init_hw_device vulkan:,uuid=f00".)
>>
>
> Would like to, but I don't think its worth the extra dependency (libuuid, its widespread on linux but I'd rather not NIH parsing).
Ok.
>>> +
>>> + return vulkan_device_create_internal(ctx, &dev_select, opts, flags);
>>> +}
>>> ...
>>> +
>>> +static int vulkan_frames_init(AVHWFramesContext *hwfc)
>>> +{
>>> + int err;
>>> + AVVkFrame *f;
>>> + AVVulkanFramesContext *hwctx = hwfc->hwctx;
>>> + VulkanFramesPriv *fp = hwfc->internal->priv;
>>> + AVVulkanDeviceContext *dev_hwctx = hwfc->device_ctx->hwctx;
>>> + VulkanDevicePriv *p = hwfc->device_ctx->internal->priv;
>>> +
>>> + if (hwfc->pool)
>>> + return 0;
>>> +
>>> + /* Default pool flags */
>>> + hwctx->tiling = hwctx->tiling ? hwctx->tiling : p->use_linear_images ?
>>> + VK_IMAGE_TILING_LINEAR : VK_IMAGE_TILING_OPTIMAL;
>>> +
>>> + hwctx->usage |= DEFAULT_USAGE_FLAGS;
>>>
>>
>> Is it possible that this disallows some use-cases in a device where those default flags need not be not supported? For example, some sort of magic image-writer like a video decoder where the output images can only ever be used as a source by non-magic operations. Baking that into the API (as in the comment on usage in the header) seems bad if so.
>>
>
> You need to support those flags to do anything useful with the images.
> This restricts read-only images since those don't support the STORAGE flag. Such images are the planar images, which DO support the STORAGE flag but only for their subimages (e.g. individual planes). This is in spec, regardless what Intel says and disagrees with (they advise to alias memory instead). We don't use them anyway, and if a user wanted to repackage received frames as planar (or unpackage them) they still can.
I feel like devices with weird memory are still a problem here, but reading the code again I can see that the user-provided pool actually trumps the concern anyway - if anything funny is going on then the user can set it up however they want.
>>> ...
>>> +
>>> +static int vulkan_map_from_drm_frame_desc(AVHWFramesContext *hwfc, AVVkFrame **frame,
>>> + AVDRMFrameDescriptor *desc)
>>> +{
>>> + int err = 0;
>>> + VkResult ret;
>>> + AVVkFrame *f;
>>> + AVHWDeviceContext *ctx = hwfc->device_ctx;
>>> + AVVulkanDeviceContext *hwctx = ctx->hwctx;
>>> + VulkanDevicePriv *p = ctx->internal->priv;
>>> + const int planes = av_pix_fmt_count_planes(hwfc->sw_format);
>>> + const AVPixFmtDescriptor *fmt_desc = av_pix_fmt_desc_get(hwfc->sw_format);
>>> + const int has_modifiers = p->extensions & EXT_DRM_MODIFIER_FLAGS;
>>> + VkSubresourceLayout plane_data[AV_NUM_DATA_POINTERS];
>>> + VkBindImageMemoryInfo bind_info[AV_NUM_DATA_POINTERS];
>>> + VkExternalMemoryHandleTypeFlagBits htype = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT;
>>> +
>>> + VK_LOAD_PFN(hwctx->inst, vkGetMemoryFdPropertiesKHR);
>>> +
>>> + for (int i = 0; i < desc->nb_layers; i++) {
>>> + if (desc->layers[i].nb_planes > 1) {
>>> + av_log(ctx, AV_LOG_ERROR, "Cannot import DMABUFS with more than 1 "
>>> + "plane per layer!\n");
>>> + return AVERROR(EINVAL);
>>> + }
>>> +
>>> + if (drm_to_vulkan_fmt(desc->layers[i].format) == VK_FORMAT_UNDEFINED) {
>>> + av_log(ctx, AV_LOG_ERROR, "Unsupported DMABUF layer format!\n");
>>>
>>
>> Maybe say what the unsupported format is for someone reporting the message, since this is probably relatively easy to hit (e.g. YUYV).
>>
>
> Sure, I'll just use the handy DRM API/define to translate DRM FOURCC uint32_t to a string.
> Oh wait, I can't because there is no such API. I've had to manually go through every single define in the past, relying on blind luck and speculation to match those up. DRM devs want people to suffer, as if the big-endian confusion-inducing FOURCC isn't evidence enough for it.
> Not willing to NIH something to pull the chars out of it yet. Next time I have to look up a drm format id maybe.
Print it with %#08x. I just think it should appear in the log so that it's possible for someone reading to log to see the format which failed; if they have to decode it a little bit themselves that isn't a disaster.
>>> + return AVERROR(EINVAL);
>>> + }
>>> + }
>>> +
>>> + if (!(f = av_mallocz(sizeof(*f)))) {
>>> + av_log(ctx, AV_LOG_ERROR, "Unable to allocate memory for AVVkFrame!\n");
>>> + err = AVERROR(ENOMEM);
>>> + goto fail;
>>> + }
>>> +
>>> ...
>>> +
>>> +static int vulkan_map_to_drm(AVHWFramesContext *hwfc, AVFrame *dst,
>>> + const AVFrame *src, int flags)
>>> +{
>>> + int err = 0;
>>> + VkResult ret;
>>> + AVVkFrame *f = (AVVkFrame *)src->data[0];
>>> + VulkanDevicePriv *p = hwfc->device_ctx->internal->priv;
>>> + AVVulkanDeviceContext *hwctx = hwfc->device_ctx->hwctx;
>>> + const int planes = av_pix_fmt_count_planes(hwfc->sw_format);
>>> + VK_LOAD_PFN(hwctx->inst, vkGetMemoryFdKHR);
>>> + VkImageDrmFormatModifierPropertiesEXT drm_mod = {
>>> + .sType = VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT,
>>> + };
>>>
>>
>> Do you need a sync here for any writing being finished, or is it implicit somehow below?
>>
>
> There isn't. This would be where we export a semaphore to VAAPI.
> We could make a CPU sync by converting the image to read optimal and waiting on the command queue's semaphore, but that would need another exec context.
> Should we?
> I don't have a way to test this ATM, my test program is gone, so if I do touch it I'll need to write a new one, which is a lot of work. With ffmpeg I can only test raw exporting without it actually being used by anything, since everything complains about some missing contexts IIRC.
You often get away with this because some part of the next operation ends up queued on the same hardware submission ring.
I guess leave it unless you want to add the extra sync, but add a comment for the next person reading it.
>>> +
>>> + AVDRMFrameDescriptor *drm_desc = av_mallocz(sizeof(*drm_desc));
>>> + if (!drm_desc)
>>> + return AVERROR(ENOMEM);
>>> +
>>> + err = ff_hwframe_map_create(src->hw_frames_ctx, dst, src, &vulkan_unmap_to_drm, drm_desc);
>>> + if (err < 0)
>>> + goto end;
>>> +
>>> + if (p->extensions & EXT_DRM_MODIFIER_FLAGS) {
>>> + VK_LOAD_PFN(hwctx->inst, vkGetImageDrmFormatModifierPropertiesEXT);
>>> + ret = pfn_vkGetImageDrmFormatModifierPropertiesEXT(hwctx->act_dev, f->img[0],
>>> + &drm_mod);
>>> + if (ret != VK_SUCCESS) {
>>> + av_log(hwfc, AV_LOG_ERROR, "Failed to retrieve DRM format modifier!\n");
>>> + err = AVERROR_EXTERNAL;
>>> + goto end;
>>> + }
>>> + }
>>> +
>>> ...
>>> +
>>> +static int vulkan_transfer_data_to_mem(AVHWFramesContext *hwfc, AVFrame *dst,
>>> + const AVFrame *src)
>>> +{
>>> + int err = 0;
>>> + AVFrame tmp;
>>> + AVVkFrame *f = (AVVkFrame *)src->data[0];
>>> + AVHWDeviceContext *dev_ctx = hwfc->device_ctx;
>>> + ImageBuffer buf[AV_NUM_DATA_POINTERS] = { { 0 } };
>>> + const int planes = av_pix_fmt_count_planes(dst->format);
>>> + int log2_chroma = av_pix_fmt_desc_get(dst->format)->log2_chroma_h;
>>> +
>>> + if (dst->width > hwfc->width || dst->height > hwfc->height)
>>> + return AVERROR(EINVAL);
>>> +
>>> + /* For linear, host visiable images */
>>> + if (f->tiling == VK_IMAGE_TILING_LINEAR &&
>>> + f->flags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) {
>>>
>>
>> Is it generally expected that this is actually faster than the next option? (Because evil uncached memory is a thing.)
>>
>
> Could be. On Intel it was faster, but now its as fast as tiled images. On NVIDIA its slower. Its still faster on Intel for simple short filter chains. Keeping it for cheap devices.
Yep, fair enough.
>>> + AVFrame *map = av_frame_alloc();
>>> + if (!map)
>>> + return AVERROR(ENOMEM);
>>> + map->format = dst->format;
>>> +
>>> + err = vulkan_map_frame_to_mem(hwfc, map, src, AV_HWFRAME_MAP_READ);
>>> + if (err)
>>> + return err;
>>> +
>>> + err = av_frame_copy(dst, map);
>>> + av_frame_free(&map);
>>> + return err;
>>> + }
>>> ...
Thanks,
- Mark
On 10/01/2020 21:05, Lynne wrote:
> From 1e3a50fbe4399f76c0ab0f62bf6d6c65b8565db4 Mon Sep 17 00:00:00 2001
> From: Lynne <dev@lynne.ee>
> Date: Sun, 27 Oct 2019 14:47:18 +0000
> Subject: [PATCH 7/9] lavfi: add an avgblur_vulkan filter
>
> This commit adds a fast avgblur Vulkan filter.
> This will reset Intel GPUs on Windows due to a known, year-old driver bug.
> ---
> configure | 1 +
> libavfilter/Makefile | 1 +
> libavfilter/allfilters.c | 1 +
> libavfilter/vf_avgblur_vulkan.c | 406 ++++++++++++++++++++++++++++++++
> 4 files changed, 409 insertions(+)
> create mode 100644 libavfilter/vf_avgblur_vulkan.c
There is something weirdly wrong with the edges of the local blocks here.
With a pure white input:
./ffmpeg_g -v 55 -y -init_hw_device vulkan:0,debug=1 -i white.png -filter_hw_device vulkan0 -vf format=yuv420p,hwupload,avgblur_vulkan,hwdownload,format=yuv420p -frames:v 1 out.png
<http://ixia.jkqxz.net/~mrt/f242fc36ea7ed26c8809fe442e8e67df/out.png>
Looks like undefined values are leaking in to the average?
Thanks,
- Mark
Quoting Lynne (2020-01-21 21:52:52)
> Jan 21, 2020, 18:22 by anton@khirnov.net:
> >> Its size too? Didn't know that.
> >> I do think its a good idea to be able to append fields to it, so I've
> >> added a av_vk_frame_alloc() function. I've followed what
> >> av_frame_alloc is called, though I'm not sure if its too close to that
> >> one's name.
> >>
> >
> > My original intent with this API was that calles are allowed to provide
> > their own pools. Not sure if that's still allowed or works though. But
> > if it is, the caller needs to be able to allocate/free AVkFrame.
> >
>
> They are of course. The first wip of the cuda interop exploited that IIRC.
> But I think the issue is that in order for API users to make their own
> pools they need to know the size in bytes of AVVkFrame since that's
> what av_buffer_create() accepts.
> I could make a function to return that, but I'm wondering if its
> somewhat too big of a mess already.
> I could instead reserve some memory in the struct, a few hundred bytes
> would be enough since every Vulkan object has to be allocated on heap.
The requirement for av_buffer_create() is just formal here, we shouldn't
let it guide our API design (ideally we'd make a standalone refcount
type and stop abusing AVBuffer for it). You can just pass sizeof(void*)
to it. Or make av_vk_frame_alloc() write sizeof(AVVkFrame) into a
supplied pointer, if you want to be really proper about it.
On 1/22/20, Anton Khirnov <anton@khirnov.net> wrote:
> Quoting Lynne (2020-01-21 21:52:52)
>> Jan 21, 2020, 18:22 by anton@khirnov.net:
>> >> Its size too? Didn't know that.
>> >> I do think its a good idea to be able to append fields to it, so I've
>> >> added a av_vk_frame_alloc() function. I've followed what
>> >> av_frame_alloc is called, though I'm not sure if its too close to that
>> >> one's name.
>> >>
>> >
>> > My original intent with this API was that calles are allowed to provide
>> > their own pools. Not sure if that's still allowed or works though. But
>> > if it is, the caller needs to be able to allocate/free AVkFrame.
>> >
>>
>> They are of course. The first wip of the cuda interop exploited that IIRC.
>> But I think the issue is that in order for API users to make their own
>> pools they need to know the size in bytes of AVVkFrame since that's
>> what av_buffer_create() accepts.
>> I could make a function to return that, but I'm wondering if its
>> somewhat too big of a mess already.
>> I could instead reserve some memory in the struct, a few hundred bytes
>> would be enough since every Vulkan object has to be allocated on heap.
>
> The requirement for av_buffer_create() is just formal here, we shouldn't
> let it guide our API design (ideally we'd make a standalone refcount
> type and stop abusing AVBuffer for it). You can just pass sizeof(void*)
> to it. Or make av_vk_frame_alloc() write sizeof(AVVkFrame) into a
> supplied pointer, if you want to be really proper about it.
>
Are patches now ready for finally being applied to FFmpeg?
Asking because gonna write additional filters for new effects using vulkan.
> --
> Anton Khirnov
> _______________________________________________
> 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".
Jan 21, 2020, 23:03 by sw@jkqxz.net:
> On 10/01/2020 21:05, Lynne wrote:
>
>> From 04c1836f89d89dcdc892cef66ee82afbcfda9f2d Mon Sep 17 00:00:00 2001
>> From: Lynne <dev@lynne.ee>
>> Date: Sun, 27 Oct 2019 14:44:00 +0000
>> Subject: [PATCH 4/9] lavfi: add Vulkan filtering framework
>>
>> This commit adds a Vulkan filtering infrastructure for libavfilter.
>> It attempts to abstract as much as possible of the Vulkan API from filters.
>>
>> The way the hwcontext and the framework are designed permits for parallel,
>> non-CPU-blocking filtering throughout, with the exception of up/downloading
>> and mapping.
>> ---
>> configure | 3 +
>> libavfilter/Makefile | 2 +
>> libavfilter/glslang.cpp | 215 +++++++
>> libavfilter/glslang.h | 49 ++
>> libavfilter/vulkan.c | 1221 +++++++++++++++++++++++++++++++++++++++
>> libavfilter/vulkan.h | 323 +++++++++++
>> 6 files changed, 1813 insertions(+)
>> create mode 100644 libavfilter/glslang.cpp
>> create mode 100644 libavfilter/glslang.h
>> create mode 100644 libavfilter/vulkan.c
>> create mode 100644 libavfilter/vulkan.h
>>
>> diff --git a/configure b/configure
>> index 3113ebfdd8..fc075f2a15 100755
>> --- a/configure
>> +++ b/configure
>> ...
>> @@ -6258,6 +6260,7 @@ enabled fontconfig && enable libfontconfig
>> enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
>> enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
>> enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
>> +enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper -lSPIRV -lSPIRV-Tools -lSPIRV-Tools-opt -lpthread -lstdc++
>>
>
> Using Debian-packaged glslang, the headers seem to be in slightly different places: SPIRV headers in their own directory under include, so it is just SPIRV/GlslangToSpv.h. With the paths edited, the version in testing works.
>
> I don't whether there is a single official way which we should support, but this looks like it could be an evil source of confusion.
>
glslang change the headers directory from just SPIRV to glslang/SPIRV. Debian's package already contains this, and so does arch, and I'd rather not have ifdeffery and additional header checks, so I'll keep it like this.
>> enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
>> require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
>> enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
>> ...
>> diff --git a/libavfilter/glslang.cpp b/libavfilter/glslang.cpp
>> new file mode 100644
>> index 0000000000..cf534d8ac5
>> --- /dev/null
>> +++ b/libavfilter/glslang.cpp
>> @@ -0,0 +1,215 @@
>> +/*
>> + * This file is part of FFmpeg.
>> + *
>> + * FFmpeg is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU Lesser General Public
>> + * License as published by the Free Software Foundation; either
>> + * version 2.1 of the License, or (at your option) any later version.
>> + *
>> + * FFmpeg is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>> + * Lesser General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU Lesser General Public
>> + * License along with FFmpeg; if not, write to the Free Software
>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>> + */
>> +
>> +#include <assert.h>
>> +#include <pthread.h>
>> +
>> +extern "C" {
>> +#include "libavutil/mem.h"
>> +}
>> +
>> +#include <glslang/Include/ResourceLimits.h>
>> +#include <glslang/Include/revision.h>
>> +#include <glslang/Public/ShaderLang.h>
>> +#include <glslang/SPIRV/GlslangToSpv.h>
>>
>
> (This path too.)
>
>> +
>> +#include "glslang.h"
>> +
>> +using namespace glslang;
>> +
>> +static pthread_mutex_t glslang_mutex = PTHREAD_MUTEX_INITIALIZER;
>> +static int glslang_refcount;
>> +
>> +int glslang_init(void)
>> +{
>> + int ret = 1;
>> +
>> + pthread_mutex_lock(&glslang_mutex);
>> + if (glslang_refcount++ == 0)
>> + ret = InitializeProcess();
>> + pthread_mutex_unlock(&glslang_mutex);
>> +
>> + return ret;
>>
>
> Inverting the normal sense of success is weird.
>
Fixed.
>> +}
>> +
>> +void glslang_uninit(void)
>> +{
>> + pthread_mutex_lock(&glslang_mutex);
>> + if (--glslang_refcount == 0)
>> + FinalizeProcess();
>> + if (glslang_refcount < 0)
>>
>
> Assert? This looks like a "something has gone horribly wrong" case.
>
Fixed.
>> + glslang_refcount = 0;
>> + pthread_mutex_unlock(&glslang_mutex);
>> +}
>> +
>> +#define GLSL_VERSION EShTargetVulkan_1_0
>> +#define SPIRV_VERSION EShTargetSpv_1_0
>> +
>> +extern const TBuiltInResource DefaultTBuiltInResource;
>> +
>> +GLSlangResult *glslang_compile(const char *glsl, enum GLSlangStage stage)
>> +{
>> + GLSlangResult *res = (GLSlangResult *)av_mallocz(sizeof(*res));
>> +
>> + static const EShLanguage lang[] = {
>> + [GLSLANG_VERTEX] = EShLangVertex,
>> + [GLSLANG_FRAGMENT] = EShLangFragment,
>> + [GLSLANG_COMPUTE] = EShLangCompute,
>> + };
>> +
>> + assert(glslang_refcount);
>> + TShader *shader = new TShader(lang[stage]);
>>
>
> Missing check?
>
Fixed all.
>> + shader->setEnvClient(EShClientVulkan, GLSL_VERSION);
>> + shader->setEnvTarget(EShTargetSpv, SPIRV_VERSION);
>> + shader->setStrings(&glsl, 1);
>> + if (!shader->parse(&DefaultTBuiltInResource, GLSL_VERSION, true, EShMsgDefault)) {
>> + res->error_msg = av_strdup(shader->getInfoLog());
>> + delete shader;
>> + return res;
>> + }
>> +
>> + TProgram *prog = new TProgram();
>>
>
> And here.
>
>> + prog->addShader(shader);
>> + if (!prog->link(EShMsgDefault)) {
>> + res->error_msg = av_strdup(prog->getInfoLog());
>> + delete shader;
>> + delete prog;
>> + return res;
>> + }
>> +
>> + std::vector<unsigned int> spirv;
>> + GlslangToSpv(*prog->getIntermediate(lang[stage]), spirv);
>> +
>> + res->success = true;
>> + res->size = spirv.size() * sizeof(unsigned int);
>> + res->data = av_memdup(spirv.data(), res->size),
>>
>
> It doesn't look like this is meant to be a comma ^
>
> Return value check.
>
>> + delete shader;
>> + delete prog;
>> + return res;
>> +}
>> +
>> +// Taken from glslang's examples, which apparently generally bases the choices
>> +// on OpenGL specification limits
>> +const TBuiltInResource DefaultTBuiltInResource = {
>> + /* .MaxLights = */ 32,
>> + /* .MaxClipPlanes = */ 6,
>> + /* .MaxTextureUnits = */ 32,
>> + /* .MaxTextureCoords = */ 32,
>> + /* .MaxVertexAttribs = */ 64,
>> + /* .MaxVertexUniformComponents = */ 4096,
>> + /* .MaxVaryingFloats = */ 64,
>> + /* .MaxVertexTextureImageUnits = */ 32,
>> + /* .MaxCombinedTextureImageUnits = */ 80,
>> + /* .MaxTextureImageUnits = */ 32,
>> + /* .MaxFragmentUniformComponents = */ 4096,
>> + /* .MaxDrawBuffers = */ 32,
>> + /* .MaxVertexUniformVectors = */ 128,
>> + /* .MaxVaryingVectors = */ 8,
>> + /* .MaxFragmentUniformVectors = */ 16,
>> + /* .MaxVertexOutputVectors = */ 16,
>> + /* .MaxFragmentInputVectors = */ 15,
>> + /* .MinProgramTexelOffset = */ -8,
>> + /* .MaxProgramTexelOffset = */ 7,
>> + /* .MaxClipDistances = */ 8,
>> + /* .MaxComputeWorkGroupCountX = */ 65535,
>> + /* .MaxComputeWorkGroupCountY = */ 65535,
>> + /* .MaxComputeWorkGroupCountZ = */ 65535,
>> + /* .MaxComputeWorkGroupSizeX = */ 1024,
>> + /* .MaxComputeWorkGroupSizeY = */ 1024,
>> + /* .MaxComputeWorkGroupSizeZ = */ 64,
>> + /* .MaxComputeUniformComponents = */ 1024,
>> + /* .MaxComputeTextureImageUnits = */ 16,
>> + /* .MaxComputeImageUniforms = */ 8,
>> + /* .MaxComputeAtomicCounters = */ 8,
>> + /* .MaxComputeAtomicCounterBuffers = */ 1,
>> + /* .MaxVaryingComponents = */ 60,
>> + /* .MaxVertexOutputComponents = */ 64,
>> + /* .MaxGeometryInputComponents = */ 64,
>> + /* .MaxGeometryOutputComponents = */ 128,
>> + /* .MaxFragmentInputComponents = */ 128,
>> + /* .MaxImageUnits = */ 8,
>> + /* .MaxCombinedImageUnitsAndFragmentOutputs = */ 8,
>> + /* .MaxCombinedShaderOutputResources = */ 8,
>> + /* .MaxImageSamples = */ 0,
>> + /* .MaxVertexImageUniforms = */ 0,
>> + /* .MaxTessControlImageUniforms = */ 0,
>> + /* .MaxTessEvaluationImageUniforms = */ 0,
>> + /* .MaxGeometryImageUniforms = */ 0,
>> + /* .MaxFragmentImageUniforms = */ 8,
>> + /* .MaxCombinedImageUniforms = */ 8,
>> + /* .MaxGeometryTextureImageUnits = */ 16,
>> + /* .MaxGeometryOutputVertices = */ 256,
>> + /* .MaxGeometryTotalOutputComponents = */ 1024,
>> + /* .MaxGeometryUniformComponents = */ 1024,
>> + /* .MaxGeometryVaryingComponents = */ 64,
>> + /* .MaxTessControlInputComponents = */ 128,
>> + /* .MaxTessControlOutputComponents = */ 128,
>> + /* .MaxTessControlTextureImageUnits = */ 16,
>> + /* .MaxTessControlUniformComponents = */ 1024,
>> + /* .MaxTessControlTotalOutputComponents = */ 4096,
>> + /* .MaxTessEvaluationInputComponents = */ 128,
>> + /* .MaxTessEvaluationOutputComponents = */ 128,
>> + /* .MaxTessEvaluationTextureImageUnits = */ 16,
>> + /* .MaxTessEvaluationUniformComponents = */ 1024,
>> + /* .MaxTessPatchComponents = */ 120,
>> + /* .MaxPatchVertices = */ 32,
>> + /* .MaxTessGenLevel = */ 64,
>> + /* .MaxViewports = */ 16,
>> + /* .MaxVertexAtomicCounters = */ 0,
>> + /* .MaxTessControlAtomicCounters = */ 0,
>> + /* .MaxTessEvaluationAtomicCounters = */ 0,
>> + /* .MaxGeometryAtomicCounters = */ 0,
>> + /* .MaxFragmentAtomicCounters = */ 8,
>> + /* .MaxCombinedAtomicCounters = */ 8,
>> + /* .MaxAtomicCounterBindings = */ 1,
>> + /* .MaxVertexAtomicCounterBuffers = */ 0,
>> + /* .MaxTessControlAtomicCounterBuffers = */ 0,
>> + /* .MaxTessEvaluationAtomicCounterBuffers = */ 0,
>> + /* .MaxGeometryAtomicCounterBuffers = */ 0,
>> + /* .MaxFragmentAtomicCounterBuffers = */ 1,
>> + /* .MaxCombinedAtomicCounterBuffers = */ 1,
>> + /* .MaxAtomicCounterBufferSize = */ 16384,
>> + /* .MaxTransformFeedbackBuffers = */ 4,
>> + /* .MaxTransformFeedbackInterleavedComponents = */ 64,
>> + /* .MaxCullDistances = */ 8,
>> + /* .MaxCombinedClipAndCullDistances = */ 8,
>> + /* .MaxSamples = */ 4,
>> +#if GLSLANG_PATCH_LEVEL >= 2892
>> + /* .maxMeshOutputVerticesNV = */ 256,
>> + /* .maxMeshOutputPrimitivesNV = */ 512,
>> + /* .maxMeshWorkGroupSizeX_NV = */ 32,
>> + /* .maxMeshWorkGroupSizeY_NV = */ 1,
>> + /* .maxMeshWorkGroupSizeZ_NV = */ 1,
>> + /* .maxTaskWorkGroupSizeX_NV = */ 32,
>> + /* .maxTaskWorkGroupSizeY_NV = */ 1,
>> + /* .maxTaskWorkGroupSizeZ_NV = */ 1,
>> + /* .maxMeshViewCountNV = */ 4,
>> +#endif
>> +
>> + .limits = {
>> + /* .nonInductiveForLoops = */ 1,
>> + /* .whileLoops = */ 1,
>> + /* .doWhileLoops = */ 1,
>> + /* .generalUniformIndexing = */ 1,
>> + /* .generalAttributeMatrixVectorIndexing = */ 1,
>> + /* .generalVaryingIndexing = */ 1,
>> + /* .generalSamplerIndexing = */ 1,
>> + /* .generalVariableIndexing = */ 1,
>> + /* .generalConstantMatrixVectorIndexing = */ 1,
>> + }
>>
>
> Why are the designators commented out? Letting the compiler check your ordering seems like a good idea.
>
glslang's nice API doesn't allow this:
error: ‘const TBuiltInResource’ has no non-static data member named ‘MaxLights’
>> +};
>> diff --git a/libavfilter/glslang.h b/libavfilter/glslang.h
>> new file mode 100644
>> index 0000000000..865af71580
>> --- /dev/null
>> +++ b/libavfilter/glslang.h
>> @@ -0,0 +1,49 @@
>> +/*
>> + * This file is part of FFmpeg.
>> + *
>> + * FFmpeg is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU Lesser General Public
>> + * License as published by the Free Software Foundation; either
>> + * version 2.1 of the License, or (at your option) any later version.
>> + *
>> + * FFmpeg is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>> + * Lesser General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU Lesser General Public
>> + * License along with FFmpeg; if not, write to the Free Software
>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>> + */
>> +
>> +#pragma once
>>
>
> The pragma isn't used anywhere else in the codebase.
>
Fixed.
>> +
>> +#include <stdlib.h>
>> +
>> +#ifdef __cplusplus
>> +extern "C" {
>> +#endif
>> +
>> +int glslang_init(void);
>> +void glslang_uninit(void);
>> +
>> +typedef struct GLSlangResult {
>> + int success;
>> + const char *error_msg;
>> +
>> + void *data; /* Shader data or NULL */
>> + size_t size;
>> +} GLSlangResult;
>> +
>> +enum GLSlangStage {
>> + GLSLANG_VERTEX,
>> + GLSLANG_FRAGMENT,
>> + GLSLANG_COMPUTE,
>> +};
>> +
>> +/* Compile GLSL into a SPIRV stream, if possible */
>> +GLSlangResult *glslang_compile(const char *glsl, enum GLSlangStage stage);
>>
>
> +1, best API ever. (Now why can't glslang or similar projects just give us this function themselves?)
>
>> +
>> +#ifdef __cplusplus
>> +}
>> +#endif
>> diff --git a/libavfilter/vulkan.c b/libavfilter/vulkan.c
>> new file mode 100644
>> index 0000000000..99aaeb2ef4
>> --- /dev/null
>> +++ b/libavfilter/vulkan.c
>> ...
>> +
>> +int ff_vk_filter_config_output_inplace(AVFilterLink *outlink)
>> +{
>> + int err;
>> + AVFilterContext *avctx = outlink->src;
>> + VulkanFilterContext *s = avctx->priv;
>> +
>> + av_buffer_unref(&outlink->hw_frames_ctx);
>> +
>> + if (!s->device_ref) {
>> + if (!avctx->hw_device_ctx) {
>> + av_log(avctx, AV_LOG_ERROR, "Vulkan filtering requires a "
>> + "Vulkan device.\n");
>> + return AVERROR(EINVAL);
>> + }
>> +
>> + err = vulkan_filter_set_device(avctx, avctx->hw_device_ctx);
>> + if (err < 0)
>> + return err;
>> + }
>> +
>> + outlink->hw_frames_ctx = av_buffer_ref(s->frames_ref);
>>
>
> Missing check.
>
>> + outlink->w = s->output_width;
>> + outlink->h = s->output_height;
>> +
>> + return 0;
>> +}
>> ...
>>
>
> The rest of this all looks generally sensible, though I don't have the detailed Vulkan knowledge to go through it properly. Probably fine in any case, since it's all internal and we aren't locking anything down.
>
>> diff --git a/libavfilter/vulkan.h b/libavfilter/vulkan.h
>> new file mode 100644
>> index 0000000000..8d4def1a00
>> --- /dev/null
>> +++ b/libavfilter/vulkan.h
>> @@ -0,0 +1,323 @@
>> +/*
>> + * This file is part of FFmpeg.
>> + *
>> + * FFmpeg is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU Lesser General Public
>> + * License as published by the Free Software Foundation; either
>> + * version 2.1 of the License, or (at your option) any later version.
>> + *
>> + * FFmpeg is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>> + * Lesser General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU Lesser General Public
>> + * License along with FFmpeg; if not, write to the Free Software
>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>> + */
>> +
>> +#ifndef AVFILTER_VULKAN_COMMON_H
>> +#define AVFILTER_VULKAN_COMMON_H
>>
>
> Looks like you've renamed it since then.
>
>> +
>> ...
>>
>
> Thanks,
>
> - Mark
> _______________________________________________
> 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".
>
Updated code is in the git repo.
Jan 22, 2020, 16:44 by anton@khirnov.net:
> Quoting Lynne (2020-01-21 21:52:52)
>
>> Jan 21, 2020, 18:22 by anton@khirnov.net:
>> >> Its size too? Didn't know that.
>> >> I do think its a good idea to be able to append fields to it, so I've
>> >> added a av_vk_frame_alloc() function. I've followed what
>> >> av_frame_alloc is called, though I'm not sure if its too close to that
>> >> one's name.
>> >>
>> >
>> > My original intent with this API was that calles are allowed to provide
>> > their own pools. Not sure if that's still allowed or works though. But
>> > if it is, the caller needs to be able to allocate/free AVkFrame.
>> >
>>
>> They are of course. The first wip of the cuda interop exploited that IIRC.
>> But I think the issue is that in order for API users to make their own
>> pools they need to know the size in bytes of AVVkFrame since that's
>> what av_buffer_create() accepts.
>> I could make a function to return that, but I'm wondering if its
>> somewhat too big of a mess already.
>> I could instead reserve some memory in the struct, a few hundred bytes
>> would be enough since every Vulkan object has to be allocated on heap.
>>
>
> The requirement for av_buffer_create() is just formal here, we shouldn't
> let it guide our API design (ideally we'd make a standalone refcount
> type and stop abusing AVBuffer for it). You can just pass sizeof(void*)
> to it. Or make av_vk_frame_alloc() write sizeof(AVVkFrame) into a
> supplied pointer, if you want to be really proper about it.
>
So is the API good now?
Quoting Lynne (2020-02-02 18:23:43)
> Jan 22, 2020, 16:44 by anton@khirnov.net:
>
> > Quoting Lynne (2020-01-21 21:52:52)
> >
> >> Jan 21, 2020, 18:22 by anton@khirnov.net:
> >> >> Its size too? Didn't know that.
> >> >> I do think its a good idea to be able to append fields to it, so I've
> >> >> added a av_vk_frame_alloc() function. I've followed what
> >> >> av_frame_alloc is called, though I'm not sure if its too close to that
> >> >> one's name.
> >> >>
> >> >
> >> > My original intent with this API was that calles are allowed to provide
> >> > their own pools. Not sure if that's still allowed or works though. But
> >> > if it is, the caller needs to be able to allocate/free AVkFrame.
> >> >
> >>
> >> They are of course. The first wip of the cuda interop exploited that IIRC.
> >> But I think the issue is that in order for API users to make their own
> >> pools they need to know the size in bytes of AVVkFrame since that's
> >> what av_buffer_create() accepts.
> >> I could make a function to return that, but I'm wondering if its
> >> somewhat too big of a mess already.
> >> I could instead reserve some memory in the struct, a few hundred bytes
> >> would be enough since every Vulkan object has to be allocated on heap.
> >>
> >
> > The requirement for av_buffer_create() is just formal here, we shouldn't
> > let it guide our API design (ideally we'd make a standalone refcount
> > type and stop abusing AVBuffer for it). You can just pass sizeof(void*)
> > to it. Or make av_vk_frame_alloc() write sizeof(AVVkFrame) into a
> > supplied pointer, if you want to be really proper about it.
> >
>
> So is the API good now?
Mention how it's to be freed in the doxy, otherwise ok.
From aa9f0ea2cf210234ed26df349d3a1562b7de1110 Mon Sep 17 00:00:00 2001
From: Philip Langdale <philipl@overt.org>
Date: Tue, 31 Dec 2019 09:41:57 -0800
Subject: [PATCH 9/9] lavu/hwcontext_cuda: refactor context initialisation
There's enough going on here now that it should not be duplicated
between cuda_device_create and cuda_device_derive.
---
libavutil/hwcontext_cuda.c | 114 ++++++++++++++++---------------------
1 file changed, 50 insertions(+), 64 deletions(-)
@@ -336,57 +336,44 @@ error:
return ret;
}
-static int cuda_device_create(AVHWDeviceContext *device_ctx,
- const char *device,
- AVDictionary *opts, int flags)
-{
+static int cuda_context_init(AVHWDeviceContext *device_ctx, int flags) {
AVCUDADeviceContext *hwctx = device_ctx->hwctx;
CudaFunctions *cu;
CUcontext dummy;
- int ret, dev_active = 0, device_idx = 0;
+ int ret, dev_active = 0;
unsigned int dev_flags = 0;
const unsigned int desired_flags = CU_CTX_SCHED_BLOCKING_SYNC;
- if (device)
- device_idx = strtol(device, NULL, 0);
-
- if (cuda_device_init(device_ctx) < 0)
- goto error;
-
cu = hwctx->internal->cuda_dl;
- ret = CHECK_CU(cu->cuInit(0));
- if (ret < 0)
- goto error;
-
- ret = CHECK_CU(cu->cuDeviceGet(&hwctx->internal->cuda_device, device_idx));
- if (ret < 0)
- goto error;
-
hwctx->internal->flags = flags;
if (flags & AV_CUDA_USE_PRIMARY_CONTEXT) {
- ret = CHECK_CU(cu->cuDevicePrimaryCtxGetState(hwctx->internal->cuda_device, &dev_flags, &dev_active));
+ ret = CHECK_CU(cu->cuDevicePrimaryCtxGetState(hwctx->internal->cuda_device,
+ &dev_flags, &dev_active));
if (ret < 0)
- goto error;
+ return ret;
if (dev_active && dev_flags != desired_flags) {
av_log(device_ctx, AV_LOG_ERROR, "Primary context already active with incompatible flags.\n");
- goto error;
+ return AVERROR(ENOTSUP);
} else if (dev_flags != desired_flags) {
- ret = CHECK_CU(cu->cuDevicePrimaryCtxSetFlags(hwctx->internal->cuda_device, desired_flags));
+ ret = CHECK_CU(cu->cuDevicePrimaryCtxSetFlags(hwctx->internal->cuda_device,
+ desired_flags));
if (ret < 0)
- goto error;
+ return ret;
}
- ret = CHECK_CU(cu->cuDevicePrimaryCtxRetain(&hwctx->cuda_ctx, hwctx->internal->cuda_device));
+ ret = CHECK_CU(cu->cuDevicePrimaryCtxRetain(&hwctx->cuda_ctx,
+ hwctx->internal->cuda_device));
if (ret < 0)
- goto error;
+ return ret;
} else {
- ret = CHECK_CU(cu->cuCtxCreate(&hwctx->cuda_ctx, desired_flags, hwctx->internal->cuda_device));
+ ret = CHECK_CU(cu->cuCtxCreate(&hwctx->cuda_ctx, desired_flags,
+ hwctx->internal->cuda_device));
if (ret < 0)
- goto error;
+ return ret;
CHECK_CU(cu->cuCtxPopCurrent(&dummy));
}
@@ -397,6 +384,37 @@ static int cuda_device_create(AVHWDeviceContext *device_ctx,
hwctx->stream = NULL;
return 0;
+}
+
+static int cuda_device_create(AVHWDeviceContext *device_ctx,
+ const char *device,
+ AVDictionary *opts, int flags)
+{
+ AVCUDADeviceContext *hwctx = device_ctx->hwctx;
+ CudaFunctions *cu;
+ int ret, device_idx = 0;
+
+ if (device)
+ device_idx = strtol(device, NULL, 0);
+
+ if (cuda_device_init(device_ctx) < 0)
+ goto error;
+
+ cu = hwctx->internal->cuda_dl;
+
+ ret = CHECK_CU(cu->cuInit(0));
+ if (ret < 0)
+ goto error;
+
+ ret = CHECK_CU(cu->cuDeviceGet(&hwctx->internal->cuda_device, device_idx));
+ if (ret < 0)
+ goto error;
+
+ ret = cuda_context_init(device_ctx, flags);
+ if (ret < 0)
+ goto error;
+
+ return 0;
error:
cuda_device_uninit(device_ctx);
@@ -409,11 +427,7 @@ static int cuda_device_derive(AVHWDeviceContext *device_ctx,
AVCUDADeviceContext *hwctx = device_ctx->hwctx;
CudaFunctions *cu;
const char *src_uuid = NULL;
- CUcontext dummy;
- int ret, i, device_count, dev_active = 0;
- unsigned int dev_flags = 0;
-
- const unsigned int desired_flags = CU_CTX_SCHED_BLOCKING_SYNC;
+ int ret, i, device_count;
switch (src_ctx->type) {
#if CONFIG_VULKAN
@@ -470,37 +484,9 @@ static int cuda_device_derive(AVHWDeviceContext *device_ctx,
goto error;
}
- hwctx->internal->flags = flags;
-
- if (flags & AV_CUDA_USE_PRIMARY_CONTEXT) {
- ret = CHECK_CU(cu->cuDevicePrimaryCtxGetState(hwctx->internal->cuda_device, &dev_flags, &dev_active));
- if (ret < 0)
- goto error;
-
- if (dev_active && dev_flags != desired_flags) {
- av_log(device_ctx, AV_LOG_ERROR, "Primary context already active with incompatible flags.\n");
- goto error;
- } else if (dev_flags != desired_flags) {
- ret = CHECK_CU(cu->cuDevicePrimaryCtxSetFlags(hwctx->internal->cuda_device, desired_flags));
- if (ret < 0)
- goto error;
- }
-
- ret = CHECK_CU(cu->cuDevicePrimaryCtxRetain(&hwctx->cuda_ctx, hwctx->internal->cuda_device));
- if (ret < 0)
- goto error;
- } else {
- ret = CHECK_CU(cu->cuCtxCreate(&hwctx->cuda_ctx, desired_flags, hwctx->internal->cuda_device));
- if (ret < 0)
- goto error;
-
- CHECK_CU(cu->cuCtxPopCurrent(&dummy));
- }
-
- hwctx->internal->is_allocated = 1;
-
- // Setting stream to NULL will make functions automatically use the default CUstream
- hwctx->stream = NULL;
+ ret = cuda_context_init(device_ctx, flags);
+ if (ret < 0)
+ goto error;
return 0;
--
2.25.0.rc2