mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-12 09:15:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d12screencapturesrc: Release and flush d3d11 objects before d3d12

Browse source 
Fixing device-removed error when closing pipeline

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6749>
This commit is contained in:
Seungha Yang 2024-04-27 20:23:32 +09:00 committed by GStreamer Marge Bot
parent 3e08cdeebe
commit e29655e9ca
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
subprojects/gst-plugins-bad/sys/d3d12/gstd3d12dxgicapture.cpp
View file

@ -264,6 +264,14 @@ class DesktopDupCtx
public: public:
DesktopDupCtx () {} DesktopDupCtx () {}
~DesktopDupCtx ()
{
if (context_) {
context_->ClearState ();
context_->Flush ();
}
}
GstFlowReturn Init (HMONITOR monitor, HANDLE fence_handle) GstFlowReturn Init (HMONITOR monitor, HANDLE fence_handle)
{ {
ComPtr<IDXGIAdapter1> adapter; ComPtr<IDXGIAdapter1> adapter;
@ -894,6 +902,7 @@ struct GstD3D12DxgiCapturePrivate
~GstD3D12DxgiCapturePrivate () ~GstD3D12DxgiCapturePrivate ()
{ {
WaitGPU (); WaitGPU ();
ctx = nullptr;
CloseHandle (event_handle); CloseHandle (event_handle);
if (shared_fence_handle) if (shared_fence_handle)
CloseHandle (shared_fence_handle); CloseHandle (shared_fence_handle);
@ -1469,7 +1478,6 @@ gst_d3d12_dxgi_capture_do_capture (GstD3D12DxgiCapture * capture,
ret = priv->ctx->Execute (texture, (D3D11_BOX *) crop_box, priv->fence_val); ret = priv->ctx->Execute (texture, (D3D11_BOX *) crop_box, priv->fence_val);
if (ret != GST_FLOW_OK) { if (ret != GST_FLOW_OK) {
priv->WaitGPU (); priv->WaitGPU ();
priv->ctx = nullptr; priv->ctx = nullptr;
if (ret == GST_D3D12_SCREEN_CAPTURE_FLOW_EXPECTED_ERROR) { if (ret == GST_D3D12_SCREEN_CAPTURE_FLOW_EXPECTED_ERROR) {
GST_WARNING_OBJECT (self, "Couldn't capture frame, but expected failure"); GST_WARNING_OBJECT (self, "Couldn't capture frame, but expected failure");
@ -1485,6 +1493,7 @@ gst_d3d12_dxgi_capture_do_capture (GstD3D12DxgiCapture * capture,
if (draw_mouse && !gst_d3d12_dxgi_capture_draw_mouse (self, buffer, crop_box)) { if (draw_mouse && !gst_d3d12_dxgi_capture_draw_mouse (self, buffer, crop_box)) {
priv->WaitGPU (); priv->WaitGPU ();
priv->ctx = nullptr;
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }