mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-13 04:41:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d12converter: Fix Y410 conversion

Browse source 
Adding format conversion helper and use compute shader in case that
output format does not support RTV.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7088>
This commit is contained in:
Seungha Yang 2024-06-23 00:34:53 +09:00 committed by GStreamer Marge Bot
parent f432e61bdc
commit dd4d85272e
6 changed files with 514 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

364
subprojects/gst-plugins-bad/gst-libs/gst/d3d12/gstd3d12converter-pack.cpp Normal file
View file

@ -0,0 +1,364 @@
/* GStreamer
* Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gstd3d12.h"
#include "gstd3d12-private.h"
#include <gst/d3dshader/gstd3dshader.h>
#include "gstd3d12converter-pack.h"
#include <directx/d3dx12.h>
#include <wrl.h>
#include <math.h>
GST_DEBUG_CATEGORY_EXTERN (gst_d3d12_converter_debug);
#define GST_CAT_DEFAULT gst_d3d12_converter_debug
/* *INDENT-OFF* */
using namespace Microsoft::WRL;
/* *INDENT-ON* */
struct GstD3D12PackPrivate
{
~GstD3D12PackPrivate ()
{
if (render_target_pool)
gst_buffer_pool_set_active (render_target_pool, FALSE);
gst_clear_object (&render_target_pool);
gst_clear_object (&desc_pool);
gst_clear_object (&device);
}
GstD3D12Device *device = nullptr;
GstVideoInfo in_info;
GstVideoInfo out_info;
ComPtr < ID3D12RootSignature > rs_typed;
ComPtr < ID3D12PipelineState > pso_typed;
guint tg_x = 0;
guint tg_y = 0;
GstD3D12DescriptorPool *desc_pool = nullptr;
GstBufferPool *render_target_pool = nullptr;
bool need_process = false;
guint heap_inc_size;
};
struct _GstD3D12Pack
{
GstObject parent;
GstD3D12Device *device;
GstD3D12PackPrivate *priv;
};
static void gst_d3d12_pack_finalize (GObject * object);
#define gst_d3d12_pack_parent_class parent_class
G_DEFINE_TYPE (GstD3D12Pack, gst_d3d12_pack, GST_TYPE_OBJECT);
static void
gst_d3d12_pack_class_init (GstD3D12PackClass * klass)
{
auto object_class = G_OBJECT_CLASS (klass);
object_class->finalize = gst_d3d12_pack_finalize;
}
static void
gst_d3d12_pack_init (GstD3D12Pack * self)
{
self->priv = new GstD3D12PackPrivate ();
}
static void
gst_d3d12_pack_finalize (GObject * object)
{
auto self = GST_D3D12_PACK (object);
delete self->priv;
gst_clear_object (&self->device);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
static GstBufferPool *
gst_d3d12_unpacker_create_pool (GstD3D12Pack * self,
const GstVideoInfo * info, D3D12_RESOURCE_FLAGS resource_flags)
{
auto priv = self->priv;
auto pool = gst_d3d12_buffer_pool_new (priv->device);
auto caps = gst_video_info_to_caps (info);
auto config = gst_buffer_pool_get_config (pool);
auto params = gst_d3d12_allocation_params_new (priv->device, info,
GST_D3D12_ALLOCATION_FLAG_DEFAULT, resource_flags, D3D12_HEAP_FLAG_NONE);
gst_buffer_pool_config_set_d3d12_allocation_params (config, params);
gst_d3d12_allocation_params_free (params);
gst_buffer_pool_config_set_params (config, caps, priv->out_info.size, 0, 0);
gst_caps_unref (caps);
if (!gst_buffer_pool_set_config (pool, config)) {
GST_ERROR_OBJECT (self, "Couldn't set pool config");
gst_object_unref (pool);
return nullptr;
}
if (!gst_buffer_pool_set_active (pool, TRUE)) {
GST_ERROR_OBJECT (self, "Couldn't set active");
gst_object_unref (pool);
return nullptr;
}
return pool;
}
GstD3D12Pack *
gst_d3d12_pack_new (GstD3D12Device * device,
const GstVideoInfo * converter_output_info)
{
g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
g_return_val_if_fail (converter_output_info, nullptr);
auto self = (GstD3D12Pack *) g_object_new (GST_TYPE_D3D12_PACK, nullptr);
gst_object_ref_sink (self);
auto priv = self->priv;
priv->device = (GstD3D12Device *) gst_object_ref (device);
priv->in_info = *converter_output_info;
priv->out_info = *converter_output_info;
switch (GST_VIDEO_INFO_FORMAT (converter_output_info)) {
case GST_VIDEO_FORMAT_Y410:
priv->need_process = true;
gst_video_info_set_format (&priv->in_info, GST_VIDEO_FORMAT_AYUV64,
converter_output_info->width, converter_output_info->height);
priv->in_info.colorimetry = converter_output_info->colorimetry;
priv->in_info.chroma_site = converter_output_info->chroma_site;
break;
default:
return self;
}
auto dev_handle = gst_d3d12_device_get_device_handle (device);
priv->heap_inc_size = dev_handle->GetDescriptorHandleIncrementSize
(D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
D3D12_DESCRIPTOR_HEAP_DESC heap_desc = { };
heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
heap_desc.NumDescriptors = 2;
priv->desc_pool = gst_d3d12_descriptor_pool_new (dev_handle, &heap_desc);
D3D12_ROOT_SIGNATURE_FLAGS rs_flags =
D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS |
D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS |
D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS |
D3D12_ROOT_SIGNATURE_FLAG_DENY_AMPLIFICATION_SHADER_ROOT_ACCESS |
D3D12_ROOT_SIGNATURE_FLAG_DENY_MESH_SHADER_ROOT_ACCESS;
D3D_ROOT_SIGNATURE_VERSION rs_version = D3D_ROOT_SIGNATURE_VERSION_1_0;
CD3DX12_ROOT_PARAMETER param;
CD3DX12_DESCRIPTOR_RANGE range[2];
range[0].Init (D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 0, 0);
range[1].Init (D3D12_DESCRIPTOR_RANGE_TYPE_UAV, 1, 0, 0);
param.InitAsDescriptorTable (2, range);
D3D12_VERSIONED_ROOT_SIGNATURE_DESC rs_desc = { };
ComPtr < ID3DBlob > rs_blob;
ComPtr < ID3DBlob > error_blob;
CD3DX12_VERSIONED_ROOT_SIGNATURE_DESC::Init_1_0 (rs_desc, 1, &param,
0, nullptr, rs_flags);
auto hr = D3DX12SerializeVersionedRootSignature (&rs_desc,
rs_version, &rs_blob, &error_blob);
if (!gst_d3d12_result (hr, device)) {
const gchar *error_msg = nullptr;
if (error_blob)
error_msg = (const gchar *) error_blob->GetBufferPointer ();
GST_ERROR_OBJECT (self,
"Couldn't serialize root signature, hr: 0x%x, error detail: %s",
(guint) hr, GST_STR_NULL (error_msg));
gst_object_unref (self);
return nullptr;
}
hr = dev_handle->CreateRootSignature (0, rs_blob->GetBufferPointer (),
rs_blob->GetBufferSize (), IID_PPV_ARGS (&priv->rs_typed));
if (!gst_d3d12_result (hr, device)) {
GST_ERROR_OBJECT (device, "Couldn't create root signature");
gst_object_unref (self);
return nullptr;
}
GstD3DConverterCSByteCode bytecode;
if (!gst_d3d_converter_shader_get_cs_blob (GST_VIDEO_INFO_FORMAT
(&priv->in_info), GST_VIDEO_INFO_FORMAT (&priv->out_info),
GST_D3D_SM_5_0, &bytecode)) {
GST_ERROR_OBJECT (device, "Couldn't get shader blob");
gst_object_unref (self);
return nullptr;
}
priv->tg_x = (guint) ceil (priv->in_info.width / (float) bytecode.x_unit);
priv->tg_y = (guint) ceil (priv->in_info.height / (float) bytecode.y_unit);
D3D12_COMPUTE_PIPELINE_STATE_DESC pso_desc = { };
pso_desc.pRootSignature = priv->rs_typed.Get ();
pso_desc.CS.pShaderBytecode = bytecode.byte_code.byte_code;
pso_desc.CS.BytecodeLength = bytecode.byte_code.byte_code_len;
hr = dev_handle->CreateComputePipelineState (&pso_desc,
IID_PPV_ARGS (&priv->pso_typed));
if (!gst_d3d12_result (hr, device)) {
GST_ERROR_OBJECT (self, "Couldn't create pso");
gst_object_unref (self);
return nullptr;
}
priv->render_target_pool = gst_d3d12_unpacker_create_pool (self,
&priv->in_info, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET |
D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
if (!priv->render_target_pool) {
gst_object_unref (self);
return nullptr;
}
return self;
}
gboolean
gst_d3d12_pack_get_video_info (GstD3D12Pack * pack,
GstVideoInfo * pack_input_info)
{
g_return_val_if_fail (GST_IS_D3D12_PACK (pack), FALSE);
g_return_val_if_fail (pack_input_info, FALSE);
auto priv = pack->priv;
*pack_input_info = priv->in_info;
return TRUE;
}
GstBuffer *
gst_d3d12_pack_acquire_render_target (GstD3D12Pack * pack, GstBuffer * buffer)
{
g_return_val_if_fail (GST_IS_D3D12_PACK (pack), nullptr);
g_return_val_if_fail (GST_IS_BUFFER (buffer), nullptr);
auto priv = pack->priv;
GstD3D12Frame out_frame;
if (!gst_d3d12_frame_map (&out_frame, &priv->out_info, buffer,
GST_MAP_D3D12, priv->need_process ? GST_D3D12_FRAME_MAP_FLAG_UAV :
GST_D3D12_FRAME_MAP_FLAG_RTV)) {
GST_ERROR_OBJECT (pack, "Couldn't map output buffer");
return nullptr;
}
gst_d3d12_frame_unmap (&out_frame);
if (!priv->need_process)
return gst_buffer_ref (buffer);
GstBuffer *outbuf = nullptr;
gst_buffer_pool_acquire_buffer (priv->render_target_pool, &outbuf, nullptr);
return outbuf;
}
gboolean
gst_d3d12_pack_execute (GstD3D12Pack * pack, GstBuffer * in_buf,
GstBuffer * out_buf, GstD3D12FenceData * fence_data,
ID3D12GraphicsCommandList * cl)
{
g_return_val_if_fail (GST_IS_D3D12_PACK (pack), FALSE);
g_return_val_if_fail (GST_IS_BUFFER (in_buf), FALSE);
g_return_val_if_fail (GST_IS_BUFFER (out_buf), FALSE);
g_return_val_if_fail (fence_data, FALSE);
g_return_val_if_fail (cl, FALSE);
auto priv = pack->priv;
if (!priv->need_process)
return TRUE;
g_assert (in_buf != out_buf);
GstD3D12Frame in_frame;
GstD3D12Frame out_frame;
if (!gst_d3d12_frame_map (&in_frame, &priv->in_info, in_buf,
GST_MAP_D3D12, GST_D3D12_FRAME_MAP_FLAG_SRV)) {
GST_ERROR_OBJECT (pack, "Couldn't map input frame");
return FALSE;
}
if (!gst_d3d12_frame_map (&out_frame, &priv->out_info, out_buf,
GST_MAP_D3D12, GST_D3D12_FRAME_MAP_FLAG_UAV)) {
GST_ERROR_OBJECT (pack, "Couldn't map output frame");
gst_d3d12_frame_unmap (&in_frame);
return FALSE;
}
GstD3D12Descriptor *descriptor;
if (!gst_d3d12_descriptor_pool_acquire (priv->desc_pool, &descriptor)) {
GST_ERROR_OBJECT (pack, "Couldn't acquire descriptor heap");
gst_d3d12_frame_unmap (&in_frame);
gst_d3d12_frame_unmap (&out_frame);
return FALSE;
}
gst_d3d12_fence_data_push (fence_data, FENCE_NOTIFY_MINI_OBJECT (descriptor));
auto device = gst_d3d12_device_get_device_handle (priv->device);
auto in_resource = in_frame.data[0];
auto desc_handle = gst_d3d12_descriptor_get_handle (descriptor);
auto desc_cpu_handle = CD3DX12_CPU_DESCRIPTOR_HANDLE
(GetCPUDescriptorHandleForHeapStart (desc_handle));
device->CopyDescriptorsSimple (1, desc_cpu_handle,
in_frame.srv_desc_handle[0], D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
desc_cpu_handle.Offset (priv->heap_inc_size);
device->CopyDescriptorsSimple (1, desc_cpu_handle,
out_frame.uav_desc_handle[0], D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
D3D12_RESOURCE_BARRIER barrier =
CD3DX12_RESOURCE_BARRIER::Transition (in_resource,
D3D12_RESOURCE_STATE_RENDER_TARGET,
D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE);
cl->ResourceBarrier (1, &barrier);
cl->SetComputeRootSignature (priv->rs_typed.Get ());
cl->SetPipelineState (priv->pso_typed.Get ());
ID3D12DescriptorHeap *heaps[] = { desc_handle };
cl->SetDescriptorHeaps (1, heaps);
cl->SetComputeRootDescriptorTable (0,
GetGPUDescriptorHandleForHeapStart (desc_handle));
cl->Dispatch (priv->tg_x, priv->tg_y, 1);
gst_d3d12_frame_unmap (&in_frame);
gst_d3d12_frame_unmap (&out_frame);
gst_d3d12_fence_data_push (fence_data,
FENCE_NOTIFY_MINI_OBJECT (gst_buffer_ref (in_buf)));
return TRUE;
}

47
subprojects/gst-plugins-bad/gst-libs/gst/d3d12/gstd3d12converter-pack.h Normal file
View file

@ -0,0 +1,47 @@
/* GStreamer
* Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#pragma once
#include <gst/gst.h>
#include <gst/video/video.h>
#include <gst/d3d12/gstd3d12_fwd.h>
G_BEGIN_DECLS
#define GST_TYPE_D3D12_PACK (gst_d3d12_pack_get_type())
G_DECLARE_FINAL_TYPE (GstD3D12Pack, gst_d3d12_pack,
GST, D3D12_PACK, GstObject);
GstD3D12Pack * gst_d3d12_pack_new (GstD3D12Device * device,
const GstVideoInfo * converter_output_info);
gboolean gst_d3d12_pack_get_video_info (GstD3D12Pack * pack,
GstVideoInfo * pack_input_info);
GstBuffer * gst_d3d12_pack_acquire_render_target (GstD3D12Pack * pack,
GstBuffer * buffer);
gboolean gst_d3d12_pack_execute (GstD3D12Pack * pack,
GstBuffer * in_buffer,
GstBuffer * out_buffer,
GstD3D12FenceData * fence_data,
ID3D12GraphicsCommandList * cl);
G_END_DECLS

75
subprojects/gst-plugins-bad/gst-libs/gst/d3d12/gstd3d12converter.cpp
View file

@ -25,6 +25,7 @@
#include "gstd3d12-private.h"
#include "gstd3d12converter-builder.h"
#include "gstd3d12converter-private.h"
#include "gstd3d12converter-pack.h"
#include <directx/d3dx12.h>
#include <wrl.h>
#include <string.h>
@ -243,16 +244,15 @@ struct _GstD3D12ConverterPrivate
}
gst_clear_object (&srv_heap_pool);
gst_clear_object (&cq);
gst_clear_object (&pack);
}
GstD3D12CommandQueue *cq = nullptr;
GstD3D12Pack *pack = nullptr;
GstVideoInfo in_info;
GstVideoInfo out_info;
GstD3D12Format in_d3d12_format;
GstD3D12Format out_d3d12_format;
CONVERT_TYPE convert_type = CONVERT_TYPE::IDENTITY;
D3D12_VIEWPORT viewport[GST_VIDEO_MAX_PLANES];
@ -609,6 +609,7 @@ gst_d3d12_converter_get_gamma_enc_table (GstVideoTransferFunction func)
static gboolean
gst_d3d12_converter_setup_resource (GstD3D12Converter * self,
const GstVideoInfo * in_info, const GstVideoInfo * out_info,
const GstD3D12Format * in_format, const GstD3D12Format * out_format,
D3D12_FILTER sampler_filter)
{
auto priv = self->priv;
@ -663,7 +664,7 @@ gst_d3d12_converter_setup_resource (GstD3D12Converter * self,
std::queue < DXGI_FORMAT > rtv_formats;
for (guint i = 0; i < 4; i++) {
auto format = priv->out_d3d12_format.resource_format[i];
auto format = out_format->resource_format[i];
if (format == DXGI_FORMAT_UNKNOWN)
break;
@ -1673,9 +1674,15 @@ gst_d3d12_converter_new (GstD3D12Device * device, GstD3D12CommandQueue * queue,
priv->cq = gst_d3d12_device_get_command_queue (device,
D3D12_COMMAND_LIST_TYPE_DIRECT);
}
gst_object_ref (priv->cq);
priv->pack = gst_d3d12_pack_new (device, out_info);
if (!priv->pack) {
GST_ERROR_OBJECT (self, "Couldn't create pack object");
gst_object_unref (self);
return nullptr;
}
if (blend_desc)
priv->blend_desc = *blend_desc;
@ -1716,27 +1723,25 @@ gst_d3d12_converter_new (GstD3D12Device * device, GstD3D12CommandQueue * queue,
gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (out_info)),
allow_gamma, allow_primaries);
if (!gst_d3d12_device_get_format (device, GST_VIDEO_INFO_FORMAT (in_info),
&in_d3d12_format)) {
GST_ERROR_OBJECT (self, "%s couldn't be converted to d3d12 format",
gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (in_info)));
gst_object_unref (self);
return nullptr;
}
if (!gst_d3d12_device_get_format (device, GST_VIDEO_INFO_FORMAT (out_info),
&out_d3d12_format)) {
GST_ERROR_OBJECT (self, "%s couldn't be converted to d3d12 format",
gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (in_info)));
gst_object_unref (self);
return nullptr;
}
self->device = (GstD3D12Device *) gst_object_ref (device);
priv->in_info = *in_info;
priv->out_info = *out_info;
priv->in_d3d12_format = in_d3d12_format;
priv->out_d3d12_format = out_d3d12_format;
gst_d3d12_pack_get_video_info (priv->pack, &priv->out_info);
auto in_format = GST_VIDEO_INFO_FORMAT (&priv->in_info);
auto out_format = GST_VIDEO_INFO_FORMAT (&priv->out_info);
if (!gst_d3d12_device_get_format (device, in_format, &in_d3d12_format)) {
GST_ERROR_OBJECT (self, "%s couldn't be converted to d3d12 format",
gst_video_format_to_string (in_format));
gst_object_unref (self);
return nullptr;
}
if (!gst_d3d12_device_get_format (device, out_format, &out_d3d12_format)) {
GST_ERROR_OBJECT (self, "%s couldn't be converted to d3d12 format",
gst_video_format_to_string (out_format));
gst_object_unref (self);
return nullptr;
}
/* Init properties */
priv->src_width = GST_VIDEO_INFO_WIDTH (in_info);
@ -1831,7 +1836,8 @@ gst_d3d12_converter_new (GstD3D12Device * device, GstD3D12CommandQueue * queue,
}
if (!gst_d3d12_converter_setup_resource (self, &priv->in_info,
&priv->out_info, sampler_filter)) {
&priv->out_info, &in_d3d12_format, &out_d3d12_format,
sampler_filter)) {
gst_object_unref (self);
return nullptr;
}
@ -2161,10 +2167,18 @@ gst_d3d12_converter_convert_buffer (GstD3D12Converter * converter,
auto priv = converter->priv;
auto render_target =
gst_d3d12_pack_acquire_render_target (priv->pack, out_buf);
if (!render_target) {
GST_ERROR_OBJECT (converter, "Couldn't get render target buffer");
return FALSE;
}
/* Don't map output memory, we don't actually update output memory here */
if (!gst_d3d12_frame_map (&out_frame, &priv->out_info, out_buf,
if (!gst_d3d12_frame_map (&out_frame, &priv->out_info, render_target,
(GstMapFlags) GST_MAP_D3D12, GST_D3D12_FRAME_MAP_FLAG_RTV)) {
GST_ERROR_OBJECT (converter, "Couldn't map output buffer");
gst_buffer_unref (render_target);
return FALSE;
}
@ -2174,6 +2188,7 @@ gst_d3d12_converter_convert_buffer (GstD3D12Converter * converter,
in_buf = gst_d3d12_converter_upload_buffer (converter, in_buf);
if (!in_buf) {
gst_d3d12_frame_unmap (&out_frame);
gst_buffer_unref (render_target);
return FALSE;
}
}
@ -2184,12 +2199,18 @@ gst_d3d12_converter_convert_buffer (GstD3D12Converter * converter,
if (need_upload)
gst_buffer_unref (in_buf);
gst_d3d12_frame_unmap (&out_frame);
gst_buffer_unref (render_target);
return FALSE;
}
auto ret = gst_d3d12_converter_execute (converter,
&in_frame, &out_frame, fence_data, command_list);
if (ret) {
ret = gst_d3d12_pack_execute (priv->pack, render_target, out_buf,
fence_data, command_list);
}
if (ret && execute_gpu_wait) {
gst_d3d12_frame_fence_gpu_wait (&in_frame, priv->cq);
gst_d3d12_frame_fence_gpu_wait (&out_frame, priv->cq);
@ -2202,6 +2223,8 @@ gst_d3d12_converter_convert_buffer (GstD3D12Converter * converter,
if (need_upload)
gst_buffer_unref (in_buf);
gst_buffer_unref (render_target);
return ret;
}

1
subprojects/gst-plugins-bad/gst-libs/gst/d3d12/meson.build
View file

@ -4,6 +4,7 @@ d3d12_sources = [
'gstd3d12commandlistpool.cpp',
'gstd3d12commandqueue.cpp',
'gstd3d12converter-builder.cpp',
'gstd3d12converter-pack.cpp',
'gstd3d12converter.cpp',
'gstd3d12descriptorpool.cpp',
'gstd3d12device.cpp',

24
subprojects/gst-plugins-bad/sys/d3d12/gstd3d12convert.cpp
View file

@ -1535,6 +1535,13 @@ gst_d3d12_convert_decide_allocation (GstBaseTransform * trans, GstQuery * query)
return FALSE;
}
GstD3D12Format device_format;
if (!gst_d3d12_device_get_format (filter->device,
GST_VIDEO_INFO_FORMAT (&info), &device_format)) {
GST_ERROR_OBJECT (self, "Couldn't get device foramt");
return FALSE;
}
priv->downstream_supports_crop_meta = gst_query_find_allocation_meta (query,
GST_VIDEO_CROP_META_API_TYPE, nullptr);
GST_DEBUG_OBJECT (self, "Downstream crop meta support: %d",
@ -1562,17 +1569,24 @@ gst_d3d12_convert_decide_allocation (GstBaseTransform * trans, GstQuery * query)
config = gst_buffer_pool_get_config (pool);
gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
D3D12_RESOURCE_FLAGS resource_flags =
D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS;
if ((device_format.format_flags & GST_D3D12_FORMAT_FLAG_OUTPUT_UAV)
== GST_D3D12_FORMAT_FLAG_OUTPUT_UAV) {
resource_flags |= D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
} else {
resource_flags |= D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
}
auto d3d12_params =
gst_buffer_pool_config_get_d3d12_allocation_params (config);
if (!d3d12_params) {
d3d12_params = gst_d3d12_allocation_params_new (filter->device, &info,
GST_D3D12_ALLOCATION_FLAG_DEFAULT,
D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET |
D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS, D3D12_HEAP_FLAG_NONE);
GST_D3D12_ALLOCATION_FLAG_DEFAULT, resource_flags,
D3D12_HEAP_FLAG_NONE);
} else {
gst_d3d12_allocation_params_set_resource_flags (d3d12_params,
D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET |
D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
resource_flags);
}
gst_buffer_pool_config_set_d3d12_allocation_params (config, d3d12_params);

39
subprojects/gst-plugins-bad/sys/d3d12/gstd3d12testsrc.cpp
View file

@ -1585,6 +1585,13 @@ gst_d3d12_test_src_setup_context (GstD3D12TestSrc * self, GstCaps * caps)
return FALSE;
}
GstD3D12Format device_format;
if (!gst_d3d12_device_get_format (self->device,
GST_VIDEO_INFO_FORMAT (&priv->info), &device_format)) {
GST_ERROR_OBJECT (self, "Couldn't get device foramt");
return FALSE;
}
auto device = gst_d3d12_device_get_device_handle (self->device);
D3D12_HEAP_PROPERTIES heap_prop =
CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_DEFAULT);
@ -1656,10 +1663,20 @@ gst_d3d12_test_src_setup_context (GstD3D12TestSrc * self, GstCaps * caps)
ctx->convert_pool = gst_d3d12_buffer_pool_new (self->device);
config = gst_buffer_pool_get_config (ctx->convert_pool);
gst_buffer_pool_config_set_params (config, caps, priv->info.size, 0, 0);
D3D12_RESOURCE_FLAGS resource_flags =
D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS;
if ((device_format.format_flags & GST_D3D12_FORMAT_FLAG_OUTPUT_UAV)
== GST_D3D12_FORMAT_FLAG_OUTPUT_UAV) {
resource_flags |= D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
} else {
resource_flags |= D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
}
auto params = gst_d3d12_allocation_params_new (self->device, &priv->info,
GST_D3D12_ALLOCATION_FLAG_DEFAULT,
D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET |
D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS, D3D12_HEAP_FLAG_NONE);
GST_D3D12_ALLOCATION_FLAG_DEFAULT, resource_flags,
D3D12_HEAP_FLAG_NONE);
gst_buffer_pool_config_set_d3d12_allocation_params (config, params);
gst_d3d12_allocation_params_free (params);
@ -1810,6 +1827,13 @@ gst_d3d12_test_src_decide_allocation (GstBaseSrc * bsrc, GstQuery * query)
gst_video_info_from_caps (&vinfo, caps);
GstD3D12Format device_format;
if (!gst_d3d12_device_get_format (self->device,
GST_VIDEO_INFO_FORMAT (&vinfo), &device_format)) {
GST_ERROR_OBJECT (self, "Couldn't get device foramt");
return FALSE;
}
if (gst_query_get_n_allocation_pools (query) > 0) {
gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
update_pool = TRUE;
@ -1844,8 +1868,13 @@ gst_d3d12_test_src_decide_allocation (GstBaseSrc * bsrc, GstQuery * query)
if (priv->downstream_supports_d3d12) {
D3D12_RESOURCE_FLAGS resource_flags =
D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS |
D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS;
if ((device_format.format_flags & GST_D3D12_FORMAT_FLAG_OUTPUT_UAV)
== GST_D3D12_FORMAT_FLAG_OUTPUT_UAV) {
resource_flags |= D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
} else {
resource_flags |= D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
}
auto params = gst_buffer_pool_config_get_d3d12_allocation_params (config);
if (!params) {