Browse Source

hwcontext_vulkan: correctly access the p->extensions bitmask

Its a 64-bit bitfield being put directly into an int.
tags/n4.4
Lynne 5 years ago
parent
commit
ff29ca2f1f
No known key found for this signature in database GPG Key ID: A2FEA5F03F034464
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavutil/hwcontext_vulkan.c

+ 2
- 2
libavutil/hwcontext_vulkan.c View File

@@ -1965,7 +1965,7 @@ static int vulkan_map_from_drm_frame_desc(AVHWFramesContext *hwfc, AVVkFrame **f
VulkanFramesPriv *fp = hwfc->internal->priv;
AVVulkanFramesContext *frames_hwctx = hwfc->hwctx;
const AVPixFmtDescriptor *fmt_desc = av_pix_fmt_desc_get(hwfc->sw_format);
const int has_modifiers = p->extensions & EXT_DRM_MODIFIER_FLAGS;
const int has_modifiers = !!(p->extensions & EXT_DRM_MODIFIER_FLAGS);
VkSubresourceLayout plane_data[AV_NUM_DATA_POINTERS] = { 0 };
VkBindImageMemoryInfo bind_info[AV_NUM_DATA_POINTERS] = { 0 };
VkBindImagePlaneMemoryInfo plane_info[AV_NUM_DATA_POINTERS] = { 0 };
@@ -2997,7 +2997,7 @@ static int vulkan_transfer_data(AVHWFramesContext *hwfc, const AVFrame *vkf,
int log2_chroma = av_pix_fmt_desc_get(swf->format)->log2_chroma_h;

int host_mapped[AV_NUM_DATA_POINTERS] = { 0 };
const int map_host = p->extensions & EXT_EXTERNAL_HOST_MEMORY;
const int map_host = !!(p->extensions & EXT_EXTERNAL_HOST_MEMORY);

if ((swf->format != AV_PIX_FMT_NONE && !av_vkfmt_from_pixfmt(swf->format))) {
av_log(hwfc, AV_LOG_ERROR, "Unsupported software frame pixel format!\n");


Loading…
Cancel
Save