From d166bb5dd116fcb41bfbf4be724021e21b926f5e Mon Sep 17 00:00:00 2001 From: David Rosca Date: Tue, 22 Oct 2024 13:33:01 +0200 Subject: [PATCH] radv/video: Use 64x16 alignment for HEVC encode Reviewed-by: Dave Airlie Part-of: --- src/amd/vulkan/radv_video.c | 1 - src/amd/vulkan/radv_video_enc.c | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/amd/vulkan/radv_video.c b/src/amd/vulkan/radv_video.c index b6c56f9fb5b..6e5ed0b1fbf 100644 --- a/src/amd/vulkan/radv_video.c +++ b/src/amd/vulkan/radv_video.c @@ -749,7 +749,6 @@ radv_GetPhysicalDeviceVideoCapabilitiesKHR(VkPhysicalDevice physicalDevice, cons return VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR; pCapabilities->pictureAccessGranularity.width = VK_VIDEO_H265_CTU_MAX_WIDTH; - pCapabilities->pictureAccessGranularity.height = VK_VIDEO_H265_CTU_MAX_HEIGHT; if (enc_caps) enc_caps->encodeInputPictureGranularity = pCapabilities->pictureAccessGranularity; diff --git a/src/amd/vulkan/radv_video_enc.c b/src/amd/vulkan/radv_video_enc.c index 83fa1474284..1d196b0cfac 100644 --- a/src/amd/vulkan/radv_video_enc.c +++ b/src/amd/vulkan/radv_video_enc.c @@ -458,15 +458,16 @@ radv_enc_session_init(struct radv_cmd_buffer *cmd_buffer, const struct VkVideoEn const struct radv_physical_device *pdev = radv_device_physical(device); struct radv_video_session *vid = cmd_buffer->video.vid; struct radeon_cmdbuf *cs = cmd_buffer->cs; - unsigned alignment = 16; + unsigned alignment_w = 16; + unsigned alignment_h = 16; if (vid->vk.op == VK_VIDEO_CODEC_OPERATION_ENCODE_H265_BIT_KHR) { - alignment = 64; + alignment_w = 64; } uint32_t w = enc_info->srcPictureResource.codedExtent.width; uint32_t h = enc_info->srcPictureResource.codedExtent.height; - uint32_t aligned_picture_width = align(w, alignment); - uint32_t aligned_picture_height = align(h, alignment); + uint32_t aligned_picture_width = align(w, alignment_w); + uint32_t aligned_picture_height = align(h, alignment_h); uint32_t padding_width = aligned_picture_width - w; uint32_t padding_height = aligned_picture_height - h;