fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 22:49:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

d3d12: Fix reporting for PIPE_VIDEO_CAP_ENC_MAX_DPB_CAPACITY

Browse source 
Reviewed-By: Pohsiang Hsu <pohhsu@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34844>
This commit is contained in:
Sil Vilerino 2025-01-23 10:27:51 -05:00 • committed by Marge Bot
parent 0577c77a4c
commit 2465dcf4cc
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gallium/drivers/d3d12/d3d12_video_screen.cpp
View file

@ -312,10 +312,18 @@ d3d12_video_encode_supported_references_per_frame_structures(const D3D12_VIDEO_E
uint32_t maxRefForL0 = std::min(capPictureControlData.PictureSupport.pH264Support->MaxL0ReferencesForP,
MaxL0ReferencesForB ? MaxL0ReferencesForB : UINT_MAX);
uint32_t maxRefForL1 = capPictureControlData.PictureSupport.pH264Support->MaxL1ReferencesForB;
supportedMaxRefFrames = (maxRefForL0 & 0xffff) | ((maxRefForL1 & 0xffff) << 16);
maxLongTermReferences = capPictureControlData.PictureSupport.pH264Support->MaxLongTermReferences;
maxDPBCapacity = capPictureControlData.PictureSupport.pH264Support->MaxDPBCapacity;
//
// Workaround for D3D12 Runtime validation that counts MaxDPBCapacity without the current reconpic
//
maxDPBCapacity = std::min(15u, capPictureControlData.PictureSupport.pH264Support->MaxDPBCapacity);
maxRefForL0 = std::min(maxDPBCapacity, maxRefForL0);
maxRefForL1 = std::min(maxDPBCapacity, maxRefForL1);
maxLongTermReferences = std::min(maxDPBCapacity, maxLongTermReferences);
supportedMaxRefFrames = (maxRefForL0 & 0xffff) | ((maxRefForL1 & 0xffff) << 16);
}
} else if(codec == D3D12_VIDEO_ENCODER_CODEC_HEVC) {
D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_HEVC hevcPictureControl = {};
@ -341,10 +349,18 @@ d3d12_video_encode_supported_references_per_frame_structures(const D3D12_VIDEO_E
uint32_t maxRefForL0 = std::min(capPictureControlData.PictureSupport.pHEVCSupport->MaxL0ReferencesForP,
MaxL0ReferencesForB ? MaxL0ReferencesForB : UINT_MAX);
uint32_t maxRefForL1 = capPictureControlData.PictureSupport.pHEVCSupport->MaxL1ReferencesForB;
supportedMaxRefFrames = (maxRefForL0 & 0xffff) | ((maxRefForL1 & 0xffff) << 16);
maxLongTermReferences = capPictureControlData.PictureSupport.pHEVCSupport->MaxLongTermReferences;
maxDPBCapacity = capPictureControlData.PictureSupport.pHEVCSupport->MaxDPBCapacity;
//
// Workaround for D3D12 Runtime validation that counts MaxDPBCapacity without the current reconpic
//
maxDPBCapacity = std::min(14u, capPictureControlData.PictureSupport.pH264Support->MaxDPBCapacity);
maxRefForL0 = std::min(maxDPBCapacity, maxRefForL0);
maxRefForL1 = std::min(maxDPBCapacity, maxRefForL1);
maxLongTermReferences = std::min(maxDPBCapacity, maxLongTermReferences);
supportedMaxRefFrames = (maxRefForL0 & 0xffff) | ((maxRefForL1 & 0xffff) << 16);
}
}
else if(codec == D3D12_VIDEO_ENCODER_CODEC_AV1){