OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

d3d12: Allow video processing for formats other than NV12

Browse Source 
Reviewed-by: Giancarlo Devich <gdevich@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18328>
This commit is contained in:
Sil Vilerino
2022-09-12 11:03:46 -04:00
parent 07bb5951fc
commit 0325a2a1a3
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gallium/drivers/d3d12/d3d12_video_proc.cpp
View File

@@ -28,6 +28,7 @@
#include "d3d12_util.h" #include "d3d12_util.h"
#include "d3d12_resource.h" #include "d3d12_resource.h"
#include "d3d12_video_buffer.h" #include "d3d12_video_buffer.h"
#include "d3d12_format.h"
void void
d3d12_video_processor_begin_frame(struct pipe_video_codec * codec, d3d12_video_processor_begin_frame(struct pipe_video_codec * codec,
@@ -97,19 +98,28 @@ d3d12_video_processor_end_frame(struct pipe_video_codec * codec,
debug_printf("[d3d12_video_processor] d3d12_video_processor_end_frame - Attempting to re-create ID3D12VideoProcessor " debug_printf("[d3d12_video_processor] d3d12_video_processor_end_frame - Attempting to re-create ID3D12VideoProcessor "
"input count matches %d inputFmtsMatch: %d outputFmtsMatch %d \n", inputCountMatches, inputFmtsMatch, outputFmtMatches); "input count matches %d inputFmtsMatch: %d outputFmtsMatch %d \n", inputCountMatches, inputFmtsMatch, outputFmtMatches);
DXGI_COLOR_SPACE_TYPE InputColorSpace = DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P709; DXGI_COLOR_SPACE_TYPE OutputColorSpace = d3d12_convert_from_legacy_color_space(
DXGI_FORMAT OutputFormat = curOutputTexFmt; !util_format_is_yuv(d3d12_get_pipe_format(curOutputTexFmt)),
DXGI_COLOR_SPACE_TYPE OutputColorSpace = DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P709; util_format_get_blocksize(d3d12_get_pipe_format(curOutputTexFmt)) * 8 /*bytes to bits conversion*/,
/* StudioRGB= */ false,
/* P709= */ true,
/* StudioYUV= */ true);
std::vector<DXGI_FORMAT> InputFormats; std::vector<DXGI_FORMAT> InputFormats;
for(D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1 curInput : pD3D12Proc->m_ProcessInputs) for(D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1 curInput : pD3D12Proc->m_ProcessInputs)
{ {
InputFormats.push_back(GetDesc(curInput.InputStream[0].pTexture2D).Format); InputFormats.push_back(GetDesc(curInput.InputStream[0].pTexture2D).Format);
} }
DXGI_COLOR_SPACE_TYPE InputColorSpace = d3d12_convert_from_legacy_color_space(
!util_format_is_yuv(d3d12_get_pipe_format(InputFormats[0])),
util_format_get_blocksize(d3d12_get_pipe_format(InputFormats[0])) * 8 /*bytes to bits conversion*/,
/* StudioRGB= */ false,
/* P709= */ true,
/* StudioYUV= */ true);
// Release previous allocation // Release previous allocation
pD3D12Proc->m_spVideoProcessor.Reset(); pD3D12Proc->m_spVideoProcessor.Reset();
if(!d3d12_video_processor_check_caps_and_create_processor(pD3D12Proc, InputFormats, InputColorSpace, OutputFormat, OutputColorSpace)) if(!d3d12_video_processor_check_caps_and_create_processor(pD3D12Proc, InputFormats, InputColorSpace, curOutputTexFmt, OutputColorSpace))
{ {
debug_printf("[d3d12_video_processor] d3d12_video_processor_end_frame - Failure when " debug_printf("[d3d12_video_processor] d3d12_video_processor_end_frame - Failure when "
" trying to re-create the ID3D12VideoProcessor for current batch streams configuration\n"); " trying to re-create the ID3D12VideoProcessor for current batch streams configuration\n");