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

d3d12decoder: Lock DPB while building command

Browse source 
Since DPB resource can be modified in output thread, protect
it when building command list.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6709>
This commit is contained in:
Seungha Yang 2024-04-23 01:40:44 +09:00 committed by GStreamer Marge Bot
parent 27c02a0b80
commit cecb0f2148
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -138,7 +138,6 @@ public:
subresources_[id] = 0; subresources_[id] = 0;
heaps_[id] = nullptr; heaps_[id] = nullptr;
cond_.notify_one (); cond_.notify_one ();
} }
@ -150,24 +149,14 @@ public:
frames.ppHeaps = heaps_.data (); frames.ppHeaps = heaps_.data ();
} }
guint8 GetSize () void Lock ()
{ {
return size_; lock_.lock ();
} }
ID3D12Resource ** GetTextures () void Unlock ()
{ {
return &textures_[0]; lock_.unlock ();
}
UINT * GetSubresources ()
{
return &subresources_[0];
}
ID3D12VideoDecoderHeap ** GetHeaps ()
{
return &heaps_[0];
} }
private: private:
@ -1281,6 +1270,7 @@ gst_d3d12_decoder_end_picture (GstD3D12Decoder * decoder,
in_args.CompressedBitstream.Size = args->bitstream_size; in_args.CompressedBitstream.Size = args->bitstream_size;
in_args.pHeap = decoder_pic->heap.Get (); in_args.pHeap = decoder_pic->heap.Get ();
priv->session->dpb->Lock ();
priv->session->dpb->GetReferenceFrames (in_args.ReferenceFrames); priv->session->dpb->GetReferenceFrames (in_args.ReferenceFrames);
priv->cmd->cl->DecodeFrame (priv->session->decoder.Get (), priv->cmd->cl->DecodeFrame (priv->session->decoder.Get (),
@ -1290,6 +1280,8 @@ gst_d3d12_decoder_end_picture (GstD3D12Decoder * decoder,
priv->cmd->cl->ResourceBarrier (post_barriers.size (), &post_barriers[0]); priv->cmd->cl->ResourceBarrier (post_barriers.size (), &post_barriers[0]);
hr = priv->cmd->cl->Close (); hr = priv->cmd->cl->Close ();
priv->session->dpb->Unlock ();
if (!gst_d3d12_result (hr, decoder->device)) { if (!gst_d3d12_result (hr, decoder->device)) {
GST_ERROR_OBJECT (decoder, "Couldn't record decoding command"); GST_ERROR_OBJECT (decoder, "Couldn't record decoding command");
gst_d3d12_command_allocator_unref (gst_ca); gst_d3d12_command_allocator_unref (gst_ca);