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

mediafoundation: Only wait on pSyncObjectQueue for stats completion if any stat was enabled

Browse source 
Reviewed-by: Pohsiang (John) Hsu <pohhsu@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37982>
This commit is contained in:
Silvio Vilerino 2025-10-20 19:33:50 -04:00 • committed by Pohsiang (John) Hsu
parent 4f7aa40222
commit d2cbbccaaa
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/frontends/mediafoundation/hmft_entrypoints.h
View file

@ -624,8 +624,7 @@ class __declspec( uuid( HMFT_GUID ) ) CDX12EncHMFT : CMFD3DManager,
void ProcessSliceBitstreamZeroCopy( LPDX12EncodeContext pDX12EncodeContext, void ProcessSliceBitstreamZeroCopy( LPDX12EncodeContext pDX12EncodeContext,
uint32_t slice_idx, uint32_t slice_idx,
ComPtr<IMFMediaBuffer> &spMediaBuffer, ComPtr<IMFMediaBuffer> &spMediaBuffer,
std::vector<struct codec_unit_location_t> &mfsample_codec_unit_metadata, std::vector<struct codec_unit_location_t> &mfsample_codec_unit_metadata );
ID3D12CommandQueue *pSyncObjectQueue );
void FinalizeAndEmitOutputSample( LPDX12EncodeContext pDX12EncodeContext, void FinalizeAndEmitOutputSample( LPDX12EncodeContext pDX12EncodeContext,
ComPtr<IMFMediaBuffer> &spMediaBuffer, ComPtr<IMFMediaBuffer> &spMediaBuffer,
ComPtr<IMFSample> &spOutputSample, ComPtr<IMFSample> &spOutputSample,

17
src/gallium/frontends/mediafoundation/mftransform.cpp
View file

@ -1214,7 +1214,14 @@ CDX12EncHMFT::ConfigureAsyncStatsMetadataOutputSampleAttributes( IMFSample *pSam
HRESULT hr = S_OK; HRESULT hr = S_OK;
// Enqueue completion of Resolve step for readiness of the DXGIBuffers attached below // Enqueue completion of Resolve step for readiness of the DXGIBuffers attached below
// if any of the stats outputs are enabled
if( (m_bVideoEnableFramePsnrYuv && pPipeResourcePSNRStats != nullptr ) ||
(m_uiVideoOutputQPMapBlockSize && pPipeResourceQPMapStats != nullptr ) ||
(m_uiVideoOutputBitsUsedMapBlockSize && pPipeResourceRCBitAllocMapStats != nullptr ) ||
(m_uiVideoSatdMapBlockSize && pPipeResourceSATDMapStats != nullptr ))
{
pSyncObjectQueue->Wait( pResolveStatsCompletionFence.Get(), ResolveStatsCompletionFenceValue ); pSyncObjectQueue->Wait( pResolveStatsCompletionFence.Get(), ResolveStatsCompletionFenceValue );
}
// Conditionally attach frame PSNR // Conditionally attach frame PSNR
if( m_bVideoEnableFramePsnrYuv && pPipeResourcePSNRStats != nullptr ) if( m_bVideoEnableFramePsnrYuv && pPipeResourcePSNRStats != nullptr )
@ -1264,8 +1271,7 @@ void
CDX12EncHMFT::ProcessSliceBitstreamZeroCopy( LPDX12EncodeContext pDX12EncodeContext, CDX12EncHMFT::ProcessSliceBitstreamZeroCopy( LPDX12EncodeContext pDX12EncodeContext,
uint32_t slice_idx, uint32_t slice_idx,
ComPtr<IMFMediaBuffer> &spMediaBuffer, ComPtr<IMFMediaBuffer> &spMediaBuffer,
std::vector<struct codec_unit_location_t> &mfsample_codec_unit_metadata, std::vector<struct codec_unit_location_t> &mfsample_codec_unit_metadata )
ID3D12CommandQueue *pSyncObjectQueue )
{ {
std::vector<struct codec_unit_location_t> codec_unit_metadata; std::vector<struct codec_unit_location_t> codec_unit_metadata;
GetSliceBitstreamMetadata( pDX12EncodeContext, slice_idx, codec_unit_metadata ); GetSliceBitstreamMetadata( pDX12EncodeContext, slice_idx, codec_unit_metadata );
@ -1469,9 +1475,8 @@ CDX12EncHMFT::xThreadProc( void *pCtx )
if( WaitForFence( pDX12EncodeContext->pSliceFences[slice_idx], OS_TIMEOUT_INFINITE ) ) if( WaitForFence( pDX12EncodeContext->pSliceFences[slice_idx], OS_TIMEOUT_INFINITE ) )
{ {
/* we are waiting for offset/size completion anyways so we are ok with pSyncObjectQueue gating the buffer access */
pThis->ProcessSliceBitstreamZeroCopy( pDX12EncodeContext, slice_idx, spMediaBuffer, pThis->ProcessSliceBitstreamZeroCopy( pDX12EncodeContext, slice_idx, spMediaBuffer,
codec_unit_metadata, pDX12EncodeContext->pSyncObjectQueue ); codec_unit_metadata );
pThis->FinalizeAndEmitOutputSample( pDX12EncodeContext, spMediaBuffer, pThis->FinalizeAndEmitOutputSample( pDX12EncodeContext, spMediaBuffer,
spOutputSample, codec_unit_metadata.data(), spOutputSample, codec_unit_metadata.data(),
@ -1526,8 +1531,6 @@ CDX12EncHMFT::xThreadProc( void *pCtx )
// The current slice_idx fence is completed - process this slice // The current slice_idx fence is completed - process this slice
// //
// we are waiting for offset/size completion with pSliceFences[slice_idx] so we are
// ok with pSyncObjectQueue gating the buffer access
ComPtr<IMFSample> spOutputSample; ComPtr<IMFSample> spOutputSample;
MFCreateSample( &spOutputSample ); MFCreateSample( &spOutputSample );
spOutputSamples.push_back( spOutputSample ); spOutputSamples.push_back( spOutputSample );
@ -1535,7 +1538,7 @@ CDX12EncHMFT::xThreadProc( void *pCtx )
// Reset codec unit metadata for this slice as it will be wrapped on its own IMFSample // Reset codec unit metadata for this slice as it will be wrapped on its own IMFSample
pThis->ProcessSliceBitstreamZeroCopy( pDX12EncodeContext, slice_idx, spMediaBuffer, pThis->ProcessSliceBitstreamZeroCopy( pDX12EncodeContext, slice_idx, spMediaBuffer,
cur_slice_codec_unit_metadata, pDX12EncodeContext->pSyncObjectQueue ); cur_slice_codec_unit_metadata );
spMediaBuffers.push_back( spMediaBuffer ); spMediaBuffers.push_back( spMediaBuffer );
codec_unit_metadatas.push_back( cur_slice_codec_unit_metadata ); codec_unit_metadatas.push_back( cur_slice_codec_unit_metadata );