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

d3d12memory: Don't use persistent staging buffer map

Browse Source 
Persistent map is not recommended in case of readback

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5919>
This commit is contained in:
Seungha Yang 2024-01-14 21:22:39 +09:00 committed by GStreamer Marge Bot
parent 077470913d
commit 0cceb6f68f
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
subprojects/gst-plugins-bad/sys/d3d12/gstd3d12memory.cpp
View File

@ -227,6 +227,7 @@ struct _GstD3D12MemoryPrivate
DXGI_FORMAT resource_formats[GST_VIDEO_MAX_PLANES]; DXGI_FORMAT resource_formats[GST_VIDEO_MAX_PLANES];
guint srv_inc_size; guint srv_inc_size;
guint rtv_inc_size; guint rtv_inc_size;
guint64 cpu_map_count = 0;
std::mutex lock; std::mutex lock;
}; };
@ -262,13 +263,6 @@ gst_d3d12_memory_ensure_staging_resource (GstD3D12Memory * dmem)
return FALSE; return FALSE;
} }
/* And map persistently */
hr = staging->Map (0, nullptr, &priv->staging_ptr);
if (!gst_d3d12_result (hr, dmem->device)) {
GST_ERROR_OBJECT (dmem->device, "Couldn't map readback resource");
return FALSE;
}
priv->staging = staging; priv->staging = staging;
GST_MINI_OBJECT_FLAG_SET (dmem, GST_D3D12_MEMORY_TRANSFER_NEED_DOWNLOAD); GST_MINI_OBJECT_FLAG_SET (dmem, GST_D3D12_MEMORY_TRANSFER_NEED_DOWNLOAD);
@ -387,6 +381,7 @@ gst_d3d12_memory_map_full (GstMemory * mem, GstMapInfo * info, gsize maxsize)
return priv->resource.Get (); return priv->resource.Get ();
} }
if (priv->cpu_map_count == 0) {
if (!gst_d3d12_memory_ensure_staging_resource (dmem)) { if (!gst_d3d12_memory_ensure_staging_resource (dmem)) {
GST_ERROR_OBJECT (mem->allocator, GST_ERROR_OBJECT (mem->allocator,
"Couldn't create readback_staging resource"); "Couldn't create readback_staging resource");
@ -398,16 +393,36 @@ gst_d3d12_memory_map_full (GstMemory * mem, GstMapInfo * info, gsize maxsize)
return nullptr; return nullptr;
} }
auto hr = priv->staging->Map (0, nullptr, &priv->staging_ptr);
if (!gst_d3d12_result (hr, dmem->device)) {
GST_ERROR_OBJECT (dmem->device, "Couldn't map readback resource");
return nullptr;
}
}
if ((flags & GST_MAP_WRITE) != 0) if ((flags & GST_MAP_WRITE) != 0)
GST_MINI_OBJECT_FLAG_SET (mem, GST_D3D12_MEMORY_TRANSFER_NEED_UPLOAD); GST_MINI_OBJECT_FLAG_SET (mem, GST_D3D12_MEMORY_TRANSFER_NEED_UPLOAD);
priv->cpu_map_count++;
return priv->staging_ptr; return priv->staging_ptr;
} }
static void static void
gst_d3d12_memory_unmap_full (GstMemory * mem, GstMapInfo * info) gst_d3d12_memory_unmap_full (GstMemory * mem, GstMapInfo * info)
{ {
/* Nothing to do here */ auto dmem = GST_D3D12_MEMORY_CAST (mem);
auto priv = dmem->priv;
GstMapFlags flags = info->flags;
if ((flags & GST_MAP_D3D12) == 0) {
std::lock_guard < std::mutex > lk (priv->lock);
g_assert (priv->cpu_map_count != 0);
priv->cpu_map_count--;
if (priv->cpu_map_count == 0)
priv->staging->Unmap (0, nullptr);
}
} }
static GstMemory * static GstMemory *