mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 05:59:10 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d12decoder: Use global copy queue and fence value

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5345>
This commit is contained in:
Seungha Yang 2023-09-18 20:27:27 +09:00 committed by GStreamer Marge Bot
parent 1a7390c85c
commit 884f4122b5
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
subprojects/gst-plugins-bad/sys/d3d12/gstd3d12decoder.cpp
View file

@ -36,7 +36,6 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <memory> #include <memory>
#include <atomic>
#include <algorithm> #include <algorithm>
GST_DEBUG_CATEGORY_EXTERN (gst_d3d12_decoder_debug); GST_DEBUG_CATEGORY_EXTERN (gst_d3d12_decoder_debug);
@ -185,11 +184,6 @@ GST_DEFINE_MINI_OBJECT_TYPE (GstD3D12DecoderPicture, gst_d3d12_decoder_picture);
struct GstD3D12DecoderPrivate struct GstD3D12DecoderPrivate
{ {
GstD3D12DecoderPrivate ()
{
fence_value = 1;
}
~GstD3D12DecoderPrivate() ~GstD3D12DecoderPrivate()
{ {
if (input_state) if (input_state)
@ -267,12 +261,10 @@ struct GstD3D12DecoderPrivate
/* Used for download decoded picture to staging */ /* Used for download decoded picture to staging */
ComPtr<ID3D12CommandAllocator> copy_ca; ComPtr<ID3D12CommandAllocator> copy_ca;
ComPtr<ID3D12GraphicsCommandList> copy_cl; ComPtr<ID3D12GraphicsCommandList> copy_cl;
ComPtr<ID3D12CommandQueue> copy_cq;
ComPtr<ID3D12Resource> staging; ComPtr<ID3D12Resource> staging;
GstD3D12Fence *fence = nullptr; GstD3D12Fence *fence = nullptr;
std::atomic<UINT64> fence_value;
gint64 luid; gint64 luid;
@ -363,7 +355,6 @@ gst_d3d12_decoder_new (GstD3D12Device * device, GstDxvaCodec codec)
ComPtr < ID3D12VideoDevice > video_device; ComPtr < ID3D12VideoDevice > video_device;
ComPtr < ID3D12CommandAllocator > copy_ca; ComPtr < ID3D12CommandAllocator > copy_ca;
ComPtr < ID3D12GraphicsCommandList > copy_cl; ComPtr < ID3D12GraphicsCommandList > copy_cl;
ComPtr < ID3D12CommandQueue > copy_cq;
ComPtr < ID3D12CommandAllocator > ca; ComPtr < ID3D12CommandAllocator > ca;
ComPtr < ID3D12VideoDecodeCommandList > cl; ComPtr < ID3D12VideoDecodeCommandList > cl;
ComPtr < ID3D12CommandQueue > cq; ComPtr < ID3D12CommandQueue > cq;
@ -394,12 +385,6 @@ gst_d3d12_decoder_new (GstD3D12Device * device, GstDxvaCodec codec)
if (!gst_d3d12_result (hr, device)) if (!gst_d3d12_result (hr, device))
return nullptr; return nullptr;
desc.Type = D3D12_COMMAND_LIST_TYPE_COPY;
desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE;
hr = device_handle->CreateCommandQueue (&desc, IID_PPV_ARGS (&copy_cq));
if (!gst_d3d12_result (hr, device))
return nullptr;
hr = device_handle->CreateCommandAllocator hr = device_handle->CreateCommandAllocator
(D3D12_COMMAND_LIST_TYPE_VIDEO_DECODE, IID_PPV_ARGS (&ca)); (D3D12_COMMAND_LIST_TYPE_VIDEO_DECODE, IID_PPV_ARGS (&ca));
if (!gst_d3d12_result (hr, device)) if (!gst_d3d12_result (hr, device))
@ -429,7 +414,6 @@ gst_d3d12_decoder_new (GstD3D12Device * device, GstDxvaCodec codec)
priv->video_device = video_device; priv->video_device = video_device;
priv->copy_ca = copy_ca; priv->copy_ca = copy_ca;
priv->copy_cl = copy_cl; priv->copy_cl = copy_cl;
priv->copy_cq = copy_cq;
priv->ca = ca; priv->ca = ca;
priv->cl = cl; priv->cl = cl;
priv->cq = cq; priv->cq = cq;
@ -939,7 +923,7 @@ gst_d3d12_decoder_end_picture (GstD3D12Decoder * decoder,
priv->cq->ExecuteCommandLists (1, cl); priv->cq->ExecuteCommandLists (1, cl);
fence_handle = gst_d3d12_fence_get_handle (priv->fence); fence_handle = gst_d3d12_fence_get_handle (priv->fence);
fence_value = priv->fence_value.fetch_add (1); fence_value = gst_d3d12_device_get_fence_value (priv->device);
hr = priv->cq->Signal (fence_handle, fence_value); hr = priv->cq->Signal (fence_handle, fence_value);
if (!gst_d3d12_result (hr, priv->device)) { if (!gst_d3d12_result (hr, priv->device)) {
GST_DEBUG_OBJECT (decoder, "Couldn't signal fence value"); GST_DEBUG_OBJECT (decoder, "Couldn't signal fence value");
@ -1004,6 +988,7 @@ gst_d3d12_decoder_output_picture (GstD3D12Decoder * decoder,
void *map_data; void *map_data;
HRESULT hr; HRESULT hr;
GstVideoFrame vframe; GstVideoFrame vframe;
ID3D12CommandQueue *copy_queue;
g_return_val_if_fail (GST_IS_D3D12_DECODER (decoder), GST_FLOW_ERROR); g_return_val_if_fail (GST_IS_D3D12_DECODER (decoder), GST_FLOW_ERROR);
g_return_val_if_fail (GST_IS_VIDEO_DECODER (videodec), GST_FLOW_ERROR); g_return_val_if_fail (GST_IS_VIDEO_DECODER (videodec), GST_FLOW_ERROR);
@ -1011,6 +996,12 @@ gst_d3d12_decoder_output_picture (GstD3D12Decoder * decoder,
priv = decoder->priv; priv = decoder->priv;
copy_queue = gst_d3d12_device_get_copy_queue (priv->device);
if (!copy_queue) {
ret = GST_FLOW_ERROR;
goto error;
}
decoder_pic = (GstD3D12DecoderPicture *) decoder_pic = (GstD3D12DecoderPicture *)
gst_codec_picture_get_user_data (picture); gst_codec_picture_get_user_data (picture);
if (!decoder_pic) { if (!decoder_pic) {
@ -1120,10 +1111,10 @@ gst_d3d12_decoder_output_picture (GstD3D12Decoder * decoder,
} }
list[0] = priv->copy_cl.Get (); list[0] = priv->copy_cl.Get ();
priv->copy_cq->ExecuteCommandLists (1, list); copy_queue->ExecuteCommandLists (1, list);
fence_value = priv->fence_value.fetch_add (1); fence_value = gst_d3d12_device_get_fence_value (priv->device);
hr = priv->copy_cq->Signal (gst_d3d12_fence_get_handle (priv->fence), hr = copy_queue->Signal (gst_d3d12_fence_get_handle (priv->fence),
fence_value); fence_value);
if (!gst_d3d12_result (hr, priv->device)) { if (!gst_d3d12_result (hr, priv->device)) {
ret = GST_FLOW_ERROR; ret = GST_FLOW_ERROR;