FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

d3d12decoder: Release decoder and heap on stop

Browse Source 
Sometimes driver crash happens if ID3D12VideoDevice got closed first,
and then ID3D12VideoDecoderHeap/ID3D12VideoDecoder are released.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5895>
This commit is contained in:
Seungha Yang 2024-01-09 22:40:55 +09:00 committed by GStreamer Marge Bot
parent 6ffed9b3dc
commit a242b93f33
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
subprojects/gst-plugins-bad/sys/d3d12/gstd3d12decoder.cpp
View File

@ -216,9 +216,6 @@ struct DecoderCmdData
~DecoderCmdData () ~DecoderCmdData ()
{ {
if (queue)
gst_d3d12_command_queue_fence_wait (queue, G_MAXUINT64, event_handle);
CloseHandle (event_handle); CloseHandle (event_handle);
gst_clear_object (&ca_pool); gst_clear_object (&ca_pool);
gst_clear_object (&queue); gst_clear_object (&queue);
@ -503,6 +500,14 @@ gst_d3d12_decoder_close (GstD3D12Decoder * decoder)
{ {
auto priv = decoder->priv; auto priv = decoder->priv;
GST_DEBUG_OBJECT (decoder, "Close");
if (priv->cmd) {
gst_d3d12_command_queue_fence_wait (priv->cmd->queue, priv->cmd->fence_val,
priv->cmd->event_handle);
}
priv->session = nullptr;
priv->cmd = nullptr; priv->cmd = nullptr;
gst_clear_object (&decoder->device); gst_clear_object (&decoder->device);
@ -775,6 +780,8 @@ gst_d3d12_decoder_stop (GstD3D12Decoder * decoder)
{ {
auto priv = decoder->priv; auto priv = decoder->priv;
GST_DEBUG_OBJECT (decoder, "Stop");
priv->flushing = true; priv->flushing = true;
if (priv->cmd) { if (priv->cmd) {
gst_d3d12_command_queue_fence_wait (priv->cmd->queue, priv->cmd->fence_val, gst_d3d12_command_queue_fence_wait (priv->cmd->queue, priv->cmd->fence_val,
@ -791,6 +798,8 @@ gst_d3d12_decoder_stop (GstD3D12Decoder * decoder)
g_clear_pointer (&priv->output_thread, g_thread_join); g_clear_pointer (&priv->output_thread, g_thread_join);
priv->flushing = false; priv->flushing = false;
priv->session = nullptr;
return TRUE; return TRUE;
} }
@ -1565,7 +1574,8 @@ gst_d3d12_decoder_output_loop (GstD3D12Decoder * self)
output_data.decoder, output_data.frame, output_data.picture, output_data.decoder, output_data.frame, output_data.picture,
output_data.buffer_flags, output_data.width, output_data.height); output_data.buffer_flags, output_data.width, output_data.height);
if (priv->last_flow != GST_FLOW_OK) { if (priv->last_flow != GST_FLOW_FLUSHING &&
priv->last_flow != GST_FLOW_OK) {
GST_WARNING_OBJECT (self, "Last flow was %s", GST_WARNING_OBJECT (self, "Last flow was %s",
gst_flow_get_name (priv->last_flow)); gst_flow_get_name (priv->last_flow));
} }