From 79d8e0249a021eb5f65637fa8a676ea23c79e462 Mon Sep 17 00:00:00 2001 From: wang-bin Date: Thu, 8 Jun 2023 09:31:27 +0800 Subject: [PATCH] vulkan: fix msvc, arm32 build --- libavcodec/vulkan_av1.c | 2 +- libavcodec/vulkan_decode.c | 6 +++--- libavcodec/vulkan_h264.c | 2 +- libavcodec/vulkan_hevc.c | 2 +- libavcodec/vulkan_video.c | 2 +- libavutil/hwcontext_vulkan.c | 2 ++ 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/libavcodec/vulkan_av1.c b/libavcodec/vulkan_av1.c index 5447398612..ba296f6918 100644 --- a/libavcodec/vulkan_av1.c +++ b/libavcodec/vulkan_av1.c @@ -186,7 +186,7 @@ static int vk_av1_create_params(AVCodecContext *avctx, AVBufferRef **buf) .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR, .pNext = &av1_params, .videoSession = ctx->common.session, - .videoSessionParametersTemplate = NULL, + .videoSessionParametersTemplate = VK_NULL_HANDLE, }; /* Create session parameters */ diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c index 35e265a5b1..bfd6a71a4b 100644 --- a/libavcodec/vulkan_decode.c +++ b/libavcodec/vulkan_decode.c @@ -145,9 +145,9 @@ int ff_vk_decode_prepare_frame(FFVulkanDecodeContext *dec, AVFrame *pic, return 0; vkpic->dpb_frame = NULL; - vkpic->img_view_ref = NULL; - vkpic->img_view_out = NULL; - vkpic->img_view_dest = NULL; + vkpic->img_view_ref = VK_NULL_HANDLE; + vkpic->img_view_out = VK_NULL_HANDLE; + vkpic->img_view_dest = VK_NULL_HANDLE; if (dec->layered_dpb && alloc_dpb) { vkpic->img_view_ref = ctx->layered_view; diff --git a/libavcodec/vulkan_h264.c b/libavcodec/vulkan_h264.c index 0548232971..74f9c1b4c9 100644 --- a/libavcodec/vulkan_h264.c +++ b/libavcodec/vulkan_h264.c @@ -305,7 +305,7 @@ static int vk_h264_create_params(AVCodecContext *avctx, AVBufferRef **buf) .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR, .pNext = &h264_params, .videoSession = ctx->common.session, - .videoSessionParametersTemplate = NULL, + .videoSessionParametersTemplate = VK_NULL_HANDLE, }; AVBufferRef *tmp; diff --git a/libavcodec/vulkan_hevc.c b/libavcodec/vulkan_hevc.c index 5ddfd0daf3..415b9d6b68 100644 --- a/libavcodec/vulkan_hevc.c +++ b/libavcodec/vulkan_hevc.c @@ -672,7 +672,7 @@ static int vk_hevc_create_params(AVCodecContext *avctx, AVBufferRef **buf) .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR, .pNext = &h265_params, .videoSession = ctx->common.session, - .videoSessionParametersTemplate = NULL, + .videoSessionParametersTemplate = VK_NULL_HANDLE, }; int nb_vps = 0; diff --git a/libavcodec/vulkan_video.c b/libavcodec/vulkan_video.c index 9a363aab02..460ccf6ca8 100644 --- a/libavcodec/vulkan_video.c +++ b/libavcodec/vulkan_video.c @@ -242,7 +242,7 @@ av_cold void ff_vk_video_common_uninit(FFVulkanContext *s, if (common->session) { vk->DestroyVideoSessionKHR(s->hwctx->act_dev, common->session, s->hwctx->alloc); - common->session = NULL; + common->session = VK_NULL_HANDLE; } if (common->nb_mem && common->mem) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 1132a61390..a1c3406716 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -30,7 +30,9 @@ #endif #include "thread.h" +#if HAVE_UNISTD_H #include +#endif #include "config.h" #include "pixdesc.h" -- 2.39.2 (Apple Git-143)