AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv/video: Set maxActiveReferencePictures to 16 for H264/5

Browse Source 
H265 supports 16 reference frames too.

Fixes validation errors when decoding H265 stream with more than 8 reference
frames.

Cc: mesa-stable

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27541>
This commit is contained in:
David Rosca
2024-02-09 07:48:14 +01:00
committed by Marge Bot
parent 99f0449987
commit 4b7b185711
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/vulkan/radv_video.c
+5 -6
View File
@@ -40,8 +40,7 @@
#include "radv_cs.h"
#include "radv_debug.h"
#define NUM_H264_REFS 17
#define NUM_H265_REFS 8
#define NUM_H2645_REFS 16
#define FB_BUFFER_OFFSET 0x1000
#define FB_BUFFER_SIZE 2048
#define FB_BUFFER_SIZE_TONGA (2048 * 64)
@@ -499,8 +498,8 @@ radv_GetPhysicalDeviceVideoCapabilitiesKHR(VkPhysicalDevice physicalDevice, cons
if (pVideoProfile->lumaBitDepth != VK_VIDEO_COMPONENT_BIT_DEPTH_8_BIT_KHR)
return VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR;
pCapabilities->maxDpbSlots = NUM_H264_REFS;
pCapabilities->maxActiveReferencePictures = NUM_H264_REFS;
pCapabilities->maxDpbSlots = NUM_H2645_REFS + 1;
pCapabilities->maxActiveReferencePictures = NUM_H2645_REFS;
/* for h264 on navi21+ separate dpb images should work */
if (radv_enable_tier2(pdevice))
@@ -532,8 +531,8 @@ radv_GetPhysicalDeviceVideoCapabilitiesKHR(VkPhysicalDevice physicalDevice, cons
pVideoProfile->lumaBitDepth != VK_VIDEO_COMPONENT_BIT_DEPTH_10_BIT_KHR)
return VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR;
pCapabilities->maxDpbSlots = NUM_H264_REFS;
pCapabilities->maxActiveReferencePictures = NUM_H265_REFS;
pCapabilities->maxDpbSlots = NUM_H2645_REFS + 1;
pCapabilities->maxActiveReferencePictures = NUM_H2645_REFS;
/* for h265 on navi21+ separate dpb images should work */
if (radv_enable_tier2(pdevice))
pCapabilities->flags |= VK_VIDEO_CAPABILITY_SEPARATE_REFERENCE_IMAGES_BIT_KHR;