diff --git a/src/gallium/frontends/mediafoundation/encode.cpp b/src/gallium/frontends/mediafoundation/encode.cpp index 9766f735ed1..7ae24621d3a 100644 --- a/src/gallium/frontends/mediafoundation/encode.cpp +++ b/src/gallium/frontends/mediafoundation/encode.cpp @@ -591,7 +591,7 @@ CDX12EncHMFT::PrepareForEncode( IMFSample *pSample, LPDX12EncodeContext *ppDX12E std::max( 1u, pDX12EncodeContext->encoderPicInfo.av1enc.tile_rows * pDX12EncodeContext->encoderPicInfo.av1enc.tile_cols ); #endif - if (m_bSliceGenerationModeSet && pDX12EncodeContext->IsSliceAutoModeEnabled()) + if( m_bSliceGenerationModeSet && pDX12EncodeContext->IsSliceAutoModeEnabled() ) { num_output_buffers = m_EncoderCapabilities.m_uiMaxHWSupportedMaxSlices; } @@ -600,7 +600,7 @@ CDX12EncHMFT::PrepareForEncode( IMFSample *pSample, LPDX12EncodeContext *ppDX12E // This is especially important in PIPE_SLICE_MODE_AUTO where num_output_buffers // can be set to the maximum possible slices, leading to very small per-slice // buffer sizes that may be insufficient for actual bitstream data. - const uint32_t min_slice_buffer_size = 256 * 1024; // 256KB + const uint32_t min_slice_buffer_size = 256 * 1024; // 256KB pDX12EncodeContext->sliceNotificationMode = D3D12_VIDEO_ENCODER_COMPRESSED_BITSTREAM_NOTIFICATION_MODE_FULL_FRAME; if( m_bSliceGenerationModeSet && ( m_uiSliceGenerationMode > 0 ) && diff --git a/src/gallium/frontends/mediafoundation/mftransform.cpp b/src/gallium/frontends/mediafoundation/mftransform.cpp index f7120c6f66b..ea491bdc7f5 100644 --- a/src/gallium/frontends/mediafoundation/mftransform.cpp +++ b/src/gallium/frontends/mediafoundation/mftransform.cpp @@ -1308,7 +1308,7 @@ CDX12EncHMFT::ProcessSliceBitstreamZeroCopy( LPDX12EncodeContext pDX12EncodeCont std::vector &mfsample_codec_unit_metadata ) { std::vector codec_unit_metadata; - if (!GetSliceBitstreamMetadata( pDX12EncodeContext, slice_idx, codec_unit_metadata )) + if( !GetSliceBitstreamMetadata( pDX12EncodeContext, slice_idx, codec_unit_metadata ) ) { debug_printf( "[dx12 hmft 0x%p] Failed to get slice %u bitstream metadata\n", this, slice_idx ); return false; @@ -1370,7 +1370,10 @@ CDX12EncHMFT::GetSliceBitstreamMetadata( LPDX12EncodeContext pDX12EncodeContext, this, slice_idx, unit_idx ); - MFE_ERROR( "[dx12 hmft 0x%p] Slice %u unit %u has size overflow flag set - check the output bitstream buffer size", this, slice_idx, unit_idx ); + MFE_ERROR( "[dx12 hmft 0x%p] Slice %u unit %u has size overflow flag set - check the output bitstream buffer size", + this, + slice_idx, + unit_idx ); HMFT_ETW_EVENT_STOP( "GPUIndividualSliceStatsRead", this ); return false; } @@ -1557,7 +1560,10 @@ CDX12EncHMFT::xThreadProc( void *pCtx ) if( WaitForFence( pDX12EncodeContext->pSliceFences[slice_idx], OS_TIMEOUT_INFINITE ) ) { - if (!pThis->ProcessSliceBitstreamZeroCopy( pDX12EncodeContext, slice_idx, spMediaBuffer, codec_unit_metadata )) + if( !pThis->ProcessSliceBitstreamZeroCopy( pDX12EncodeContext, + slice_idx, + spMediaBuffer, + codec_unit_metadata ) ) { debug_printf( "[dx12 hmft 0x%p] Failed to process slice %u bitstream\n", pThis, slice_idx ); MFE_ERROR( "[dx12 hmft 0x%p] Failed to process slice %u bitstream", pThis, slice_idx ); @@ -1636,10 +1642,10 @@ CDX12EncHMFT::xThreadProc( void *pCtx ) ComPtr spMediaBuffer; // Reset codec unit metadata for this slice as it will be wrapped on its own IMFSample - if (!pThis->ProcessSliceBitstreamZeroCopy( pDX12EncodeContext, - slice_idx, - spMediaBuffer, - cur_slice_codec_unit_metadata )) + if( !pThis->ProcessSliceBitstreamZeroCopy( pDX12EncodeContext, + slice_idx, + spMediaBuffer, + cur_slice_codec_unit_metadata ) ) { debug_printf( "[dx12 hmft 0x%p] Failed to process slice %u bitstream\n", pThis, slice_idx ); MFE_ERROR( "[dx12 hmft 0x%p] Failed to process slice %u bitstream", pThis, slice_idx );