fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 21:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vulkan/video: add AV1 decode support to common code

Browse source 
This adds the av1 decode parameters handling.

Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27423>
This commit is contained in:
Dave Airlie 2024-01-16 12:29:34 +10:00 • committed by Marge Bot
parent 68da9e4dff
commit 60d2ea83e8
2 changed files with 53 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/vulkan/runtime/vk_video.c
View file

@ -59,6 +59,14 @@ vk_video_session_init(struct vk_device *device,
vid->h265.profile_idc = h265_profile->stdProfileIdc;
break;
}
case VK_VIDEO_CODEC_OPERATION_DECODE_AV1_BIT_KHR: {
const struct VkVideoDecodeAV1ProfileInfoKHR *av1_profile =
vk_find_struct_const(create_info->pVideoProfile->pNext,
VIDEO_DECODE_AV1_PROFILE_INFO_KHR);
vid->av1.profile = av1_profile->stdProfile;
vid->av1.film_grain_support = av1_profile->filmGrainSupport;
break;
};
case VK_VIDEO_CODEC_OPERATION_ENCODE_H264_BIT_KHR: {
const struct VkVideoEncodeH264ProfileInfoKHR *h264_profile =
vk_find_struct_const(create_info->pVideoProfile->pNext, VIDEO_ENCODE_H264_PROFILE_INFO_KHR);
@ -411,6 +419,21 @@ init_add_h265_enc_session_parameters(struct vk_video_session_parameters *params,
}
}
static void
vk_video_deep_copy_av1_seq_hdr(struct vk_video_av1_seq_hdr *dst,
const StdVideoAV1SequenceHeader *src)
{
memcpy(&dst->base, src, sizeof(StdVideoAV1SequenceHeader));
if (src->pColorConfig) {
memcpy(&dst->color_config, src->pColorConfig, sizeof(StdVideoAV1ColorConfig));
dst->base.pColorConfig = &dst->color_config;
}
if (src->pTimingInfo) {
memcpy(&dst->timing_info, src->pTimingInfo, sizeof(StdVideoAV1TimingInfo));
dst->base.pTimingInfo = &dst->timing_info;
}
}
VkResult
vk_video_session_parameters_init(struct vk_device *device,
struct vk_video_session_parameters *params,
@ -470,6 +493,15 @@ vk_video_session_parameters_init(struct vk_device *device,
init_add_h265_dec_session_parameters(params, h265_create->pParametersAddInfo, templ);
break;
}
case VK_VIDEO_CODEC_OPERATION_DECODE_AV1_BIT_KHR: {
const struct VkVideoDecodeAV1SessionParametersCreateInfoKHR *av1_create =
vk_find_struct_const(create_info->pNext, VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR);
if (av1_create && av1_create->pStdSequenceHeader) {
vk_video_deep_copy_av1_seq_hdr(&params->av1_dec.seq_hdr,
av1_create->pStdSequenceHeader);
}
break;
}
case VK_VIDEO_CODEC_OPERATION_ENCODE_H264_BIT_KHR: {
const struct VkVideoEncodeH264SessionParametersCreateInfoKHR *h264_create =
vk_find_struct_const(create_info->pNext, VIDEO_ENCODE_H264_SESSION_PARAMETERS_CREATE_INFO_KHR);
@ -1339,6 +1371,10 @@ vk_video_get_profile_alignments(const VkVideoProfileListInfoKHR *profile_list,
width_align = MAX2(width_align, VK_VIDEO_H265_CTU_MAX_WIDTH);
height_align = MAX2(height_align, VK_VIDEO_H265_CTU_MAX_HEIGHT);
}
if (profile_list->pProfiles[i].videoCodecOperation == VK_VIDEO_CODEC_OPERATION_DECODE_AV1_BIT_KHR) {
width_align = MAX2(width_align, VK_VIDEO_AV1_BLOCK_WIDTH);
height_align = MAX2(height_align, VK_VIDEO_AV1_BLOCK_HEIGHT);
}
}
*width_align_out = width_align;
*height_align_out = height_align;

17
src/vulkan/runtime/vk_video.h
View file

@ -71,6 +71,12 @@ struct vk_video_h265_pps {
StdVideoH265PredictorPaletteEntries palette_entries;
};
struct vk_video_av1_seq_hdr {
StdVideoAV1SequenceHeader base;
StdVideoAV1ColorConfig color_config;
StdVideoAV1TimingInfo timing_info;
};
struct vk_video_session {
struct vk_object_base base;
VkVideoSessionCreateFlagsKHR flags;
@ -93,6 +99,10 @@ struct vk_video_session {
struct {
StdVideoH265ProfileIdc profile_idc;
} h265;
struct {
StdVideoAV1Profile profile;
int film_grain_support;
} av1;
};
};
@ -123,6 +133,10 @@ struct vk_video_session_parameters {
struct vk_video_h265_pps *h265_pps;
} h265_dec;
struct {
struct vk_video_av1_seq_hdr seq_hdr;
} av1_dec;
struct {
uint32_t max_h264_sps_count;
uint32_t max_h264_pps_count;
@ -266,6 +280,9 @@ void vk_fill_video_h265_reference_info(const VkVideoDecodeInfoKHR *frame_info,
#define VK_VIDEO_H265_CTU_MAX_WIDTH 64
#define VK_VIDEO_H265_CTU_MAX_HEIGHT 64
#define VK_VIDEO_AV1_BLOCK_WIDTH 128
#define VK_VIDEO_AV1_BLOCK_HEIGHT 128
void
vk_video_get_profile_alignments(const VkVideoProfileListInfoKHR *profile_list,
uint32_t *width_align_out, uint32_t *height_align_out);